@things-factory/worksheet-base 4.0.45 → 4.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +6 -2
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/package.json +17 -17
- package/server/controllers/inbound/unloading-worksheet-controller.ts +1 -1
- package/server/controllers/outbound/loading-worksheet-controller.ts +15 -7
|
@@ -69,7 +69,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
|
|
|
69
69
|
const remark = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark;
|
|
70
70
|
const manufactureYear = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null;
|
|
71
71
|
let qty = inventory.qty;
|
|
72
|
-
let uom = Boolean(arrivalNotice) ? targetProduct.uom :
|
|
72
|
+
let uom = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom;
|
|
73
73
|
const location = worksheet.bufferLocation;
|
|
74
74
|
const warehouse = location.warehouse;
|
|
75
75
|
const zone = location.zone;
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LoadingWorksheetController = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
5
6
|
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
6
|
-
const typeorm_1 = require("typeorm");
|
|
7
7
|
const constants_1 = require("../../constants");
|
|
8
8
|
const entities_1 = require("../../entities");
|
|
9
9
|
const utils_1 = require("../../utils");
|
|
@@ -58,7 +58,8 @@ class LoadingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
58
58
|
worksheetDetail = await this.findExecutableWorksheetDetailByName(worksheetDetail.name, constants_1.WORKSHEET_TYPE.LOADING, [
|
|
59
59
|
'worksheet',
|
|
60
60
|
'targetInventory',
|
|
61
|
-
'targetInventory.inventory'
|
|
61
|
+
'targetInventory.inventory',
|
|
62
|
+
'targetInventory.product'
|
|
62
63
|
]);
|
|
63
64
|
const worksheet = worksheetDetail.worksheet;
|
|
64
65
|
let targetInventory = worksheetDetail.targetInventory;
|
|
@@ -100,6 +101,9 @@ class LoadingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
|
|
|
100
101
|
newTargetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.LOADING;
|
|
101
102
|
newTargetInventory.releaseQty = remainQty;
|
|
102
103
|
newTargetInventory.releaseUomValue = remainUomValue;
|
|
104
|
+
newTargetInventory.product = targetInventory.product;
|
|
105
|
+
newTargetInventory.packingType = targetInventory.packingType;
|
|
106
|
+
newTargetInventory.batchId = targetInventory.batchId;
|
|
103
107
|
newTargetInventory.creator = this.user;
|
|
104
108
|
newTargetInventory.updater = this.user;
|
|
105
109
|
newTargetInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(newTargetInventory);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loading-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/loading-worksheet-controller.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"loading-worksheet-controller.js","sourceRoot":"","sources":["../../../server/controllers/outbound/loading-worksheet-controller.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/worksheet-base",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.1.3",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,21 +24,21 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/auth-base": "^4.
|
|
28
|
-
"@things-factory/biz-base": "^4.
|
|
29
|
-
"@things-factory/document-template-base": "^4.
|
|
30
|
-
"@things-factory/id-rule-base": "^4.
|
|
31
|
-
"@things-factory/integration-lmd": "^4.
|
|
32
|
-
"@things-factory/integration-marketplace": "^4.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^4.
|
|
34
|
-
"@things-factory/integration-sftp": "^4.
|
|
35
|
-
"@things-factory/marketplace-base": "^4.
|
|
36
|
-
"@things-factory/notification": "^4.
|
|
37
|
-
"@things-factory/sales-base": "^4.
|
|
38
|
-
"@things-factory/setting-base": "^4.
|
|
39
|
-
"@things-factory/shell": "^4.
|
|
40
|
-
"@things-factory/transport-base": "^4.
|
|
41
|
-
"@things-factory/warehouse-base": "^4.
|
|
27
|
+
"@things-factory/auth-base": "^4.1.2",
|
|
28
|
+
"@things-factory/biz-base": "^4.1.2",
|
|
29
|
+
"@things-factory/document-template-base": "^4.1.2",
|
|
30
|
+
"@things-factory/id-rule-base": "^4.1.2",
|
|
31
|
+
"@things-factory/integration-lmd": "^4.1.3",
|
|
32
|
+
"@things-factory/integration-marketplace": "^4.1.3",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^4.1.3",
|
|
34
|
+
"@things-factory/integration-sftp": "^4.1.3",
|
|
35
|
+
"@things-factory/marketplace-base": "^4.1.3",
|
|
36
|
+
"@things-factory/notification": "^4.1.2",
|
|
37
|
+
"@things-factory/sales-base": "^4.1.3",
|
|
38
|
+
"@things-factory/setting-base": "^4.1.2",
|
|
39
|
+
"@things-factory/shell": "^4.1.2",
|
|
40
|
+
"@things-factory/transport-base": "^4.1.2",
|
|
41
|
+
"@things-factory/warehouse-base": "^4.1.3"
|
|
42
42
|
},
|
|
43
|
-
"gitHead": "
|
|
43
|
+
"gitHead": "08102cf42a7bcb6bb9de90e64201ffa1a0ea6308"
|
|
44
44
|
}
|
|
@@ -116,7 +116,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
116
116
|
const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
|
|
117
117
|
const manufactureYear: number = Boolean(arrivalNotice) ? targetProduct.manufactureYear : null
|
|
118
118
|
let qty: number = inventory.qty
|
|
119
|
-
let uom: string = Boolean(arrivalNotice) ? targetProduct.uom :
|
|
119
|
+
let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
|
|
120
120
|
const location: Location = worksheet.bufferLocation
|
|
121
121
|
const warehouse: Warehouse = location.warehouse
|
|
122
122
|
const zone: string = location.zone
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
+
import { Equal, Not } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
2
4
|
import {
|
|
3
5
|
DeliveryOrder,
|
|
4
|
-
OrderInventory,
|
|
5
|
-
OrderNoGenerator,
|
|
6
6
|
ORDER_INVENTORY_STATUS,
|
|
7
|
-
ORDER_TYPES,
|
|
8
7
|
ORDER_STATUS,
|
|
8
|
+
ORDER_TYPES,
|
|
9
|
+
OrderInventory,
|
|
10
|
+
OrderNoGenerator,
|
|
9
11
|
ReleaseGood
|
|
10
12
|
} from '@things-factory/sales-base'
|
|
11
13
|
import { Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
|
|
12
|
-
|
|
14
|
+
|
|
13
15
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
|
|
14
16
|
import { Worksheet, WorksheetDetail } from '../../entities'
|
|
15
17
|
import { generateInventoryHistory } from '../../utils'
|
|
@@ -107,7 +109,8 @@ export class LoadingWorksheetController extends VasWorksheetController {
|
|
|
107
109
|
worksheetDetail = await this.findExecutableWorksheetDetailByName(worksheetDetail.name, WORKSHEET_TYPE.LOADING, [
|
|
108
110
|
'worksheet',
|
|
109
111
|
'targetInventory',
|
|
110
|
-
'targetInventory.inventory'
|
|
112
|
+
'targetInventory.inventory',
|
|
113
|
+
'targetInventory.product'
|
|
111
114
|
])
|
|
112
115
|
|
|
113
116
|
const worksheet: Worksheet = worksheetDetail.worksheet
|
|
@@ -129,7 +132,9 @@ export class LoadingWorksheetController extends VasWorksheetController {
|
|
|
129
132
|
await this.updateOrderTargets([targetInventory])
|
|
130
133
|
} else if (loadedQty < pickedQty) {
|
|
131
134
|
const remainQty: number = pickedQty - loadedQty
|
|
132
|
-
const loadedUomValue: number = parseFloat(
|
|
135
|
+
const loadedUomValue: number = parseFloat(
|
|
136
|
+
((targetInventory.releaseUomValue / pickedQty) * loadedQty).toFixed(2)
|
|
137
|
+
)
|
|
133
138
|
const remainUomValue: number = parseFloat((targetInventory.releaseUomValue - loadedUomValue).toFixed(2))
|
|
134
139
|
|
|
135
140
|
targetInventory.status = ORDER_INVENTORY_STATUS.LOADED
|
|
@@ -143,7 +148,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
|
|
|
143
148
|
worksheetDetail = await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
|
|
144
149
|
|
|
145
150
|
// Create order inventory for remaining item
|
|
146
|
-
let newTargetInventory: OrderInventory = new OrderInventory()
|
|
151
|
+
let newTargetInventory: OrderInventory = new OrderInventory()
|
|
147
152
|
newTargetInventory.domain = this.domain
|
|
148
153
|
newTargetInventory.bizplace = bizplace
|
|
149
154
|
newTargetInventory.name = OrderNoGenerator.orderInventory()
|
|
@@ -153,6 +158,9 @@ export class LoadingWorksheetController extends VasWorksheetController {
|
|
|
153
158
|
newTargetInventory.status = ORDER_INVENTORY_STATUS.LOADING
|
|
154
159
|
newTargetInventory.releaseQty = remainQty
|
|
155
160
|
newTargetInventory.releaseUomValue = remainUomValue
|
|
161
|
+
newTargetInventory.product = targetInventory.product
|
|
162
|
+
newTargetInventory.packingType = targetInventory.packingType
|
|
163
|
+
newTargetInventory.batchId = targetInventory.batchId
|
|
156
164
|
newTargetInventory.creator = this.user
|
|
157
165
|
newTargetInventory.updater = this.user
|
|
158
166
|
newTargetInventory = await this.trxMgr.getRepository(OrderInventory).save(newTargetInventory)
|