@things-factory/worksheet-base 3.7.12 → 3.8.0
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/putaway-worksheet-controller.js +24 -5
- package/dist-server/controllers/inbound/putaway-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +22 -6
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +1 -3
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +1 -0
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +6 -5
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js +0 -4
- package/dist-server/graphql/resolvers/worksheet/picking/activate-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +7 -4
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js +2 -2
- package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js +6 -1
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js.map +1 -1
- package/package.json +16 -16
- package/server/controllers/inbound/putaway-worksheet-controller.ts +29 -8
- package/server/controllers/inbound/unloading-worksheet-controller.ts +33 -16
- package/server/controllers/outbound/packing-worksheet-controller.ts +3 -5
- package/server/controllers/worksheet-controller.ts +2 -1
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +10 -8
- package/server/graphql/resolvers/worksheet/picking/activate-picking.ts +1 -6
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +10 -11
- package/server/graphql/resolvers/worksheet/recommend-putway-location.ts +4 -2
- package/server/graphql/resolvers/worksheet/unloaded-inventories.ts +10 -1
|
@@ -26,10 +26,6 @@ async function activatePicking(tx, domain, user, worksheetNo) {
|
|
|
26
26
|
const sellercraft = await tx
|
|
27
27
|
.getRepository(integration_sellercraft_1.Sellercraft)
|
|
28
28
|
.findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
29
|
-
if (sellercraft) {
|
|
30
|
-
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
31
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
32
|
-
}
|
|
33
29
|
if ((marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) && !sellercraft) {
|
|
34
30
|
if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
35
31
|
const worksheetDetails = worksheet.worksheetDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;AAGA,qFAA0E;AAC1E,qFAAwF;AACxF,uEAAmE;AACnE,2DAAsE;AAGtE,
|
|
1
|
+
{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,12 +7,12 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
|
|
|
7
7
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
8
8
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
|
+
const setting_base_1 = require("@things-factory/setting-base");
|
|
10
11
|
const constants_1 = require("../../../../constants");
|
|
11
12
|
const controllers_1 = require("../../../../controllers/");
|
|
12
13
|
const ecommerce_1 = require("../../../../controllers/ecommerce");
|
|
13
14
|
const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
|
|
14
15
|
const entities_1 = require("../../../../entities");
|
|
15
|
-
const setting_base_1 = require("@things-factory/setting-base");
|
|
16
16
|
exports.completePickingResolver = {
|
|
17
17
|
async completePicking(_, { releaseGoodNo }, context) {
|
|
18
18
|
const { tx, domain, user } = context.state;
|
|
@@ -61,6 +61,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
61
61
|
.findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
|
|
62
62
|
if (sellercraft) {
|
|
63
63
|
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
64
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
|
|
64
65
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
|
|
65
66
|
}
|
|
66
67
|
else {
|
|
@@ -160,13 +161,15 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
160
161
|
const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
|
|
161
162
|
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
162
163
|
});
|
|
163
|
-
const partnerDirectActivatePackingWorksheetSetting = await tx
|
|
164
|
+
const partnerDirectActivatePackingWorksheetSetting = await tx
|
|
165
|
+
.getRepository(setting_base_1.PartnerSetting)
|
|
166
|
+
.findOne({
|
|
164
167
|
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
|
|
165
168
|
});
|
|
166
169
|
let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
|
|
167
|
-
if (directActivatePackingWorksheet != undefined &&
|
|
170
|
+
if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
168
171
|
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
169
|
-
if (
|
|
172
|
+
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
170
173
|
await packingWSCtrl.activatePacking(packingWorksheet.name);
|
|
171
174
|
}
|
|
172
175
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAAmH;AACnH,2DAA8G;
|
|
1
|
+
{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.recommendLocationLevel1 = exports.recommendPutawayLocationResolver = void 0;
|
|
4
|
+
const typeorm_1 = require("typeorm");
|
|
4
5
|
const setting_base_1 = require("@things-factory/setting-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
|
exports.recommendPutawayLocationResolver = {
|
|
@@ -54,7 +54,7 @@ async function recommendLocationLevel1(domain, warehouse, optCnt) {
|
|
|
54
54
|
domain,
|
|
55
55
|
warehouse,
|
|
56
56
|
status: warehouse_base_1.LOCATION_STATUS.EMPTY,
|
|
57
|
-
type: (0, typeorm_1.
|
|
57
|
+
type: (0, typeorm_1.In)([warehouse_base_1.LOCATION_TYPE.SHELF, warehouse_base_1.LOCATION_TYPE.FLOOR]) // should only recommend these types
|
|
58
58
|
},
|
|
59
59
|
order,
|
|
60
60
|
take: optCnt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommend-putway-location.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/recommend-putway-location.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"recommend-putway-location.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/recommend-putway-location.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,7 @@ exports.unloadedInventories = {
|
|
|
31
31
|
const returnOrder = foundWorksheetDetails[0].worksheet.returnOrder;
|
|
32
32
|
const customerBizplace = foundWorksheetDetails[0].bizplace;
|
|
33
33
|
if (arrivalNotice) {
|
|
34
|
-
|
|
34
|
+
let foundInv = await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({
|
|
35
35
|
where: {
|
|
36
36
|
domain,
|
|
37
37
|
bizplace: customerBizplace,
|
|
@@ -43,6 +43,11 @@ exports.unloadedInventories = {
|
|
|
43
43
|
},
|
|
44
44
|
relations: ['reusablePallet', 'product', 'bizplace']
|
|
45
45
|
});
|
|
46
|
+
const items = foundInv.map((inv) => {
|
|
47
|
+
const expirationDate = inv.expirationDate ? new Date(inv.expirationDate) : null;
|
|
48
|
+
return Object.assign(Object.assign({}, inv), { expirationDate: expirationDate });
|
|
49
|
+
});
|
|
50
|
+
return items;
|
|
46
51
|
}
|
|
47
52
|
if (returnOrder) {
|
|
48
53
|
return await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unloaded-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloaded-inventories.ts"],"names":[],"mappings":";;;AAEA,mEAA4E;AAC5E,qCAA2C;AAC3C,kDAAqE;AACrE,gDAAmD;AAEtC,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,oBAAoB,EAAE,EAAE,OAAY;QACtE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,qBAAqB,GAAsB,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;YACzF,KAAK,EAAE;gBACL,MAAM;gBACN,IAAI,EAAE,IAAA,YAAE,EAAC,oBAAoB,CAAC;gBAC9B,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,0BAAc,CAAC,SAAS,EAAE,0BAAc,CAAC,gBAAgB,CAAC,CAAC;gBACrE,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,4BAAgB,CAAC,SAAS,EAAE,4BAAgB,CAAC,kBAAkB,CAAC,CAAC;aAC9E;YACD,SAAS,EAAE;gBACT,UAAU;gBACV,eAAe;gBACf,iBAAiB;gBACjB,WAAW;gBACX,yBAAyB;gBACzB,uBAAuB;gBACvB,0BAA0B;aAC3B;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,CAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,MAAM,CAAA;YAAE,OAAO,EAAE,CAAA;QAE7C,MAAM,aAAa,GAAkB,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,aAAa,CAAA;QACrF,MAAM,WAAW,GAAgB,qBAAqB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,WAAW,CAAA;QAC/E,MAAM,gBAAgB,GAAa,qBAAqB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAA;QACpE,IAAI,aAAa,EAAE;YACjB,
|
|
1
|
+
{"version":3,"file":"unloaded-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloaded-inventories.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": "3.
|
|
3
|
+
"version": "3.8.0",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,20 +24,20 @@
|
|
|
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": "^3.
|
|
28
|
-
"@things-factory/biz-base": "^3.
|
|
29
|
-
"@things-factory/document-template-base": "^3.
|
|
30
|
-
"@things-factory/id-rule-base": "^3.
|
|
31
|
-
"@things-factory/integration-lmd": "^3.
|
|
32
|
-
"@things-factory/integration-marketplace": "^3.
|
|
33
|
-
"@things-factory/integration-sellercraft": "^3.
|
|
34
|
-
"@things-factory/marketplace-base": "^3.
|
|
35
|
-
"@things-factory/notification": "^3.
|
|
36
|
-
"@things-factory/sales-base": "^3.
|
|
37
|
-
"@things-factory/setting-base": "^3.
|
|
38
|
-
"@things-factory/shell": "^3.
|
|
39
|
-
"@things-factory/transport-base": "^3.
|
|
40
|
-
"@things-factory/warehouse-base": "^3.
|
|
27
|
+
"@things-factory/auth-base": "^3.8.0",
|
|
28
|
+
"@things-factory/biz-base": "^3.8.0",
|
|
29
|
+
"@things-factory/document-template-base": "^3.8.0",
|
|
30
|
+
"@things-factory/id-rule-base": "^3.8.0",
|
|
31
|
+
"@things-factory/integration-lmd": "^3.8.0",
|
|
32
|
+
"@things-factory/integration-marketplace": "^3.8.0",
|
|
33
|
+
"@things-factory/integration-sellercraft": "^3.8.0",
|
|
34
|
+
"@things-factory/marketplace-base": "^3.8.0",
|
|
35
|
+
"@things-factory/notification": "^3.8.0",
|
|
36
|
+
"@things-factory/sales-base": "^3.8.0",
|
|
37
|
+
"@things-factory/setting-base": "^3.8.0",
|
|
38
|
+
"@things-factory/shell": "^3.8.0",
|
|
39
|
+
"@things-factory/transport-base": "^3.8.0",
|
|
40
|
+
"@things-factory/warehouse-base": "^3.8.0"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "d3a61edb1a77732db20185aedc47b2cce6dd1f82"
|
|
43
43
|
}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
|
+
import { Equal, In, Not } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
2
4
|
import {
|
|
3
5
|
ArrivalNotice,
|
|
4
|
-
OrderInventory,
|
|
5
|
-
OrderNoGenerator,
|
|
6
6
|
ORDER_INVENTORY_STATUS,
|
|
7
7
|
ORDER_PRODUCT_STATUS,
|
|
8
8
|
ORDER_STATUS,
|
|
9
|
-
ORDER_TYPES
|
|
9
|
+
ORDER_TYPES,
|
|
10
|
+
OrderInventory,
|
|
11
|
+
OrderNoGenerator
|
|
10
12
|
} from '@things-factory/sales-base'
|
|
11
13
|
import {
|
|
12
14
|
Inventory,
|
|
@@ -17,7 +19,7 @@ import {
|
|
|
17
19
|
Pallet,
|
|
18
20
|
Warehouse
|
|
19
21
|
} from '@things-factory/warehouse-base'
|
|
20
|
-
|
|
22
|
+
|
|
21
23
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
|
|
22
24
|
import { Worksheet, WorksheetDetail } from '../../entities'
|
|
23
25
|
import { switchLocationStatus } from '../../utils'
|
|
@@ -204,7 +206,13 @@ export class PutawayWorksheetController extends VasWorksheetController {
|
|
|
204
206
|
where: {
|
|
205
207
|
domain: this.domain,
|
|
206
208
|
name: locationName,
|
|
207
|
-
type: In([
|
|
209
|
+
type: In([
|
|
210
|
+
LOCATION_TYPE.SHELF,
|
|
211
|
+
LOCATION_TYPE.BUFFER,
|
|
212
|
+
LOCATION_TYPE.FLOOR,
|
|
213
|
+
LOCATION_TYPE.QUARANTINE,
|
|
214
|
+
LOCATION_TYPE.RESERVE
|
|
215
|
+
])
|
|
208
216
|
},
|
|
209
217
|
relations: ['warehouse']
|
|
210
218
|
})
|
|
@@ -250,7 +258,14 @@ export class PutawayWorksheetController extends VasWorksheetController {
|
|
|
250
258
|
where: {
|
|
251
259
|
domain: this.domain,
|
|
252
260
|
name: locationName,
|
|
253
|
-
type: In([
|
|
261
|
+
type: In([
|
|
262
|
+
LOCATION_TYPE.SHELF,
|
|
263
|
+
LOCATION_TYPE.BUFFER,
|
|
264
|
+
LOCATION_TYPE.FLOOR,
|
|
265
|
+
LOCATION_TYPE.BIN,
|
|
266
|
+
LOCATION_TYPE.QUARANTINE,
|
|
267
|
+
LOCATION_TYPE.RESERVE
|
|
268
|
+
])
|
|
254
269
|
},
|
|
255
270
|
relations: ['warehouse']
|
|
256
271
|
})
|
|
@@ -288,14 +303,20 @@ export class PutawayWorksheetController extends VasWorksheetController {
|
|
|
288
303
|
let inventory: Inventory = targetInventory.inventory
|
|
289
304
|
|
|
290
305
|
if (inventory.palletId !== palletId) {
|
|
291
|
-
throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('
|
|
306
|
+
throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('lot ID', palletId, inventory.palletId))
|
|
292
307
|
}
|
|
293
308
|
|
|
294
309
|
const location: Location = await this.trxMgr.getRepository(Location).findOne({
|
|
295
310
|
where: {
|
|
296
311
|
domain: this.domain,
|
|
297
312
|
name: locationName,
|
|
298
|
-
type: In([
|
|
313
|
+
type: In([
|
|
314
|
+
LOCATION_TYPE.SHELF,
|
|
315
|
+
LOCATION_TYPE.BUFFER,
|
|
316
|
+
LOCATION_TYPE.FLOOR,
|
|
317
|
+
LOCATION_TYPE.QUARANTINE,
|
|
318
|
+
LOCATION_TYPE.RESERVE
|
|
319
|
+
])
|
|
299
320
|
},
|
|
300
321
|
relations: ['warehouse']
|
|
301
322
|
})
|
|
@@ -91,6 +91,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
91
91
|
'targetProduct.product.productDetails',
|
|
92
92
|
'targetProduct.product.productDetails.childProductDetail',
|
|
93
93
|
'targetInventory',
|
|
94
|
+
'targetInventory.inventory',
|
|
94
95
|
'targetInventory.product',
|
|
95
96
|
'targetInventory.product.productDetails',
|
|
96
97
|
'targetInventory.product.productDetails.childProductDetail'
|
|
@@ -122,8 +123,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
122
123
|
const unitCost: number = Boolean(arrivalNotice)
|
|
123
124
|
? targetProduct?.unitPrice
|
|
124
125
|
? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
(1 + targetProduct.taxRate / 100)) /
|
|
127
|
+
targetProduct.packQty
|
|
127
128
|
: 0
|
|
128
129
|
: null
|
|
129
130
|
|
|
@@ -173,9 +174,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
173
174
|
}
|
|
174
175
|
}
|
|
175
176
|
|
|
176
|
-
const uomValue: number =
|
|
177
|
-
|
|
178
|
-
|
|
177
|
+
const uomValue: number =
|
|
178
|
+
Math.round(
|
|
179
|
+
qty *
|
|
180
|
+
(Boolean(arrivalNotice)
|
|
181
|
+
? targetProduct.uomValue
|
|
182
|
+
: targetInventory.returnUomValue / targetInventory.returnQty) *
|
|
183
|
+
100
|
|
184
|
+
) / 100
|
|
179
185
|
|
|
180
186
|
let newInventory: Partial<Inventory> = new Inventory()
|
|
181
187
|
newInventory.bizplace = bizplace
|
|
@@ -198,10 +204,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
198
204
|
if (arrivalNotice) {
|
|
199
205
|
newInventory.manufactureYear = manufactureYear
|
|
200
206
|
newInventory.batchIdRef = batchIdRef
|
|
201
|
-
newInventory.orderProductId = targetProduct
|
|
207
|
+
newInventory.orderProductId = targetProduct?.id
|
|
202
208
|
} else if (returnOrder) {
|
|
203
|
-
newInventory.orderInventoryId = targetInventory
|
|
204
|
-
newInventory.refInventory = inventory
|
|
209
|
+
newInventory.orderInventoryId = targetInventory?.id
|
|
210
|
+
newInventory.refInventory = targetInventory?.inventory
|
|
205
211
|
}
|
|
206
212
|
newInventory.warehouse = warehouse
|
|
207
213
|
newInventory.location = location
|
|
@@ -352,8 +358,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
352
358
|
const unitCost: number = Boolean(arrivalNotice)
|
|
353
359
|
? targetProduct?.unitPrice
|
|
354
360
|
? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
|
|
355
|
-
|
|
356
|
-
|
|
361
|
+
(1 + targetProduct.taxRate / 100)) /
|
|
362
|
+
targetProduct.packQty
|
|
357
363
|
: 0
|
|
358
364
|
: null
|
|
359
365
|
|
|
@@ -372,9 +378,14 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
372
378
|
newInventory.uom = uom
|
|
373
379
|
newInventory.remark = remark
|
|
374
380
|
newInventory.qty = qty
|
|
375
|
-
newInventory.uomValue =
|
|
376
|
-
|
|
377
|
-
|
|
381
|
+
newInventory.uomValue =
|
|
382
|
+
Math.round(
|
|
383
|
+
qty *
|
|
384
|
+
(Boolean(arrivalNotice)
|
|
385
|
+
? targetProduct.uomValue
|
|
386
|
+
: targetInventory.returnUomValue / targetInventory.returnQty) *
|
|
387
|
+
100
|
|
388
|
+
) / 100
|
|
378
389
|
newInventory.manufactureYear = manufactureYear
|
|
379
390
|
newInventory.refOrderId = orderId
|
|
380
391
|
newInventory.unitCost = unitCost
|
|
@@ -405,10 +416,16 @@ export class UnloadingWorksheetController extends VasWorksheetController {
|
|
|
405
416
|
await this.trxMgr.getRepository(Inventory).save(newInventory)
|
|
406
417
|
} else {
|
|
407
418
|
const updatedQty: number = foundInventory.qty + qty
|
|
419
|
+
foundInventory.expirationDate = new Date(foundInventory.expirationDate)
|
|
408
420
|
foundInventory.qty = updatedQty
|
|
409
|
-
foundInventory.uomValue +=
|
|
410
|
-
|
|
411
|
-
|
|
421
|
+
foundInventory.uomValue +=
|
|
422
|
+
Math.round(
|
|
423
|
+
qty *
|
|
424
|
+
(Boolean(arrivalNotice)
|
|
425
|
+
? targetProduct.uomValue
|
|
426
|
+
: targetInventory.returnUomValue / targetInventory.returnQty) *
|
|
427
|
+
100
|
|
428
|
+
) / 100
|
|
412
429
|
if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
|
|
413
430
|
else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
|
|
414
431
|
await this.trxMgr.getRepository(Inventory).save(foundInventory)
|
|
@@ -19,11 +19,9 @@ export class PackingWorksheetController extends VasWorksheetController {
|
|
|
19
19
|
)
|
|
20
20
|
const orderInventories: OrderInventory[] = releaseGood.orderInventories
|
|
21
21
|
|
|
22
|
-
const existingPackingWorksheet: Worksheet = await this.trxMgr
|
|
23
|
-
.
|
|
24
|
-
|
|
25
|
-
where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
|
|
26
|
-
})
|
|
22
|
+
const existingPackingWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
|
|
23
|
+
where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
|
|
24
|
+
})
|
|
27
25
|
|
|
28
26
|
if (existingPackingWorksheet) throw new Error('There is existing packing worksheet that has been generated')
|
|
29
27
|
let worksheet: Worksheet = await this.createWorksheet(releaseGood, WORKSHEET_TYPE.PACKING)
|
|
@@ -562,7 +562,7 @@ export class WorksheetController {
|
|
|
562
562
|
worksheet: Worksheet,
|
|
563
563
|
orderTargets: OrderTargetTypes[],
|
|
564
564
|
refOrderStatus: string,
|
|
565
|
-
orderTargetStatus: string
|
|
565
|
+
orderTargetStatus: string
|
|
566
566
|
): Promise<Worksheet> {
|
|
567
567
|
let newOrderTarget = []
|
|
568
568
|
|
|
@@ -707,6 +707,7 @@ export class WorksheetController {
|
|
|
707
707
|
} else if (
|
|
708
708
|
worksheetType === WORKSHEET_TYPE.PUTAWAY ||
|
|
709
709
|
worksheetType === WORKSHEET_TYPE.PICKING ||
|
|
710
|
+
worksheetType === WORKSHEET_TYPE.PACKING ||
|
|
710
711
|
worksheetType === WORKSHEET_TYPE.LOADING ||
|
|
711
712
|
worksheetType === WORKSHEET_TYPE.WAREHOUSE_RETURN ||
|
|
712
713
|
worksheetType === WORKSHEET_TYPE.UNLOADING_RETURN
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
import {
|
|
1
|
+
import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
|
|
2
|
+
|
|
3
|
+
import { User } from '@things-factory/auth-base'
|
|
4
4
|
import { getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
5
|
-
import { Inventory } from '@things-factory/warehouse-base'
|
|
6
5
|
import { ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
|
|
7
|
-
import {
|
|
6
|
+
import { buildCondition, buildQuery, Domain } from '@things-factory/shell'
|
|
7
|
+
import { Inventory, LOCATION_TYPE } from '@things-factory/warehouse-base'
|
|
8
8
|
|
|
9
9
|
export const inventoriesByPalletResolver = {
|
|
10
10
|
async inventoriesByPallet(_: any, { filters, pagination, sortings, locationSortingRules }, context: any) {
|
|
@@ -41,10 +41,11 @@ export const inventoriesByPalletResolver = {
|
|
|
41
41
|
.andWhere('iv.qty > 0')
|
|
42
42
|
.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
|
|
43
43
|
.andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0')
|
|
44
|
+
.andWhere(`location.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')`)
|
|
44
45
|
.andWhere(
|
|
45
|
-
`(iv.batch_id, product.name, iv.packing_type) NOT IN (
|
|
46
|
+
`(iv.batch_id, product.name, iv.packing_type, product.brand) NOT IN (
|
|
46
47
|
SELECT
|
|
47
|
-
oi.batch_id, p2.name, oi.packing_type
|
|
48
|
+
oi.batch_id, p2.name, oi.packing_type, p2.brand
|
|
48
49
|
FROM
|
|
49
50
|
order_inventories oi
|
|
50
51
|
LEFT JOIN
|
|
@@ -112,7 +113,8 @@ export const inventoriesByPalletResolver = {
|
|
|
112
113
|
remainUomValueWithUom: remainUomValue + ' ' + item.uom,
|
|
113
114
|
// product: item.product,
|
|
114
115
|
productName: item.product.name,
|
|
115
|
-
productSKU: item.product.sku
|
|
116
|
+
productSKU: item.product.sku,
|
|
117
|
+
productBrand: item.product.brand
|
|
116
118
|
}
|
|
117
119
|
})
|
|
118
120
|
)
|
|
@@ -7,7 +7,7 @@ import { MarketplaceOrder } from '@things-factory/marketplace-base'
|
|
|
7
7
|
import { ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
|
|
8
8
|
import { Domain } from '@things-factory/shell'
|
|
9
9
|
|
|
10
|
-
import { EcommerceController, PickingWorksheetController
|
|
10
|
+
import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
|
|
11
11
|
import { Worksheet } from '../../../../entities'
|
|
12
12
|
|
|
13
13
|
export const activatePickingResolver = {
|
|
@@ -40,11 +40,6 @@ export async function activatePicking(
|
|
|
40
40
|
.getRepository(Sellercraft)
|
|
41
41
|
.findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
|
|
42
42
|
|
|
43
|
-
if (sellercraft) {
|
|
44
|
-
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
45
|
-
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
46
|
-
}
|
|
47
|
-
|
|
48
43
|
if (marketplaceStores?.length && !sellercraft) {
|
|
49
44
|
if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
|
|
50
45
|
const worksheetDetails = worksheet.worksheetDetails
|
|
@@ -7,6 +7,7 @@ import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integr
|
|
|
7
7
|
import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
8
8
|
import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
|
|
9
9
|
import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
|
|
10
|
+
import { PartnerSetting, Setting } from '@things-factory/setting-base'
|
|
10
11
|
import { Domain } from '@things-factory/shell'
|
|
11
12
|
|
|
12
13
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
|
|
@@ -19,7 +20,6 @@ import {
|
|
|
19
20
|
import { EcommerceController } from '../../../../controllers/ecommerce'
|
|
20
21
|
import { WorksheetController } from '../../../../controllers/worksheet-controller'
|
|
21
22
|
import { Worksheet, WorksheetDetail } from '../../../../entities'
|
|
22
|
-
import { Setting, PartnerSetting } from '@things-factory/setting-base'
|
|
23
23
|
|
|
24
24
|
export const completePickingResolver = {
|
|
25
25
|
async completePicking(_: any, { releaseGoodNo }, context: any) {
|
|
@@ -84,6 +84,7 @@ export async function completePicking(
|
|
|
84
84
|
|
|
85
85
|
if (sellercraft) {
|
|
86
86
|
const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
|
|
87
|
+
await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
|
|
87
88
|
await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
|
|
88
89
|
} else {
|
|
89
90
|
const companyDomain: Domain = releaseGood.bizplace.company.domain
|
|
@@ -192,23 +193,22 @@ export async function completePicking(
|
|
|
192
193
|
const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
|
|
193
194
|
where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
|
|
194
195
|
})
|
|
195
|
-
const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx
|
|
196
|
-
|
|
197
|
-
|
|
196
|
+
const partnerDirectActivatePackingWorksheetSetting: PartnerSetting = await tx
|
|
197
|
+
.getRepository(PartnerSetting)
|
|
198
|
+
.findOne({
|
|
199
|
+
where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: releaseGood.bizplace?.domain }
|
|
200
|
+
})
|
|
198
201
|
|
|
199
202
|
let packingWorksheet: Worksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)
|
|
200
203
|
|
|
201
|
-
if (
|
|
202
|
-
directActivatePackingWorksheet != undefined && (directActivatePackingWorksheet.value).toLowerCase() == 'true'
|
|
203
|
-
) {
|
|
204
|
+
if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
|
|
204
205
|
if (partnerDirectActivatePackingWorksheetSetting != undefined) {
|
|
205
|
-
if (
|
|
206
|
+
if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
|
|
206
207
|
await packingWSCtrl.activatePacking(packingWorksheet.name)
|
|
207
208
|
} else {
|
|
208
209
|
await packingWSCtrl.activatePacking(packingWorksheet.name)
|
|
209
210
|
}
|
|
210
211
|
}
|
|
211
|
-
|
|
212
212
|
} else {
|
|
213
213
|
// Find Existing Loading Worksheet if any
|
|
214
214
|
let existLoadingWorksheet: Worksheet = await tx.getRepository(Worksheet).findOne({
|
|
@@ -232,8 +232,7 @@ export async function completePicking(
|
|
|
232
232
|
|
|
233
233
|
const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
|
|
234
234
|
await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
|
|
235
|
-
}
|
|
236
|
-
else {
|
|
235
|
+
} else {
|
|
237
236
|
const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
|
|
238
237
|
let loadingWorksheet: Worksheet = await loadingWSCtrl.updateLoadingWorksheet(
|
|
239
238
|
releaseGoodNo,
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { getRepository, In } from 'typeorm'
|
|
2
|
+
|
|
1
3
|
import { ArrivalNotice, ReturnOrder } from '@things-factory/sales-base'
|
|
2
4
|
import { Setting } from '@things-factory/setting-base'
|
|
3
5
|
import { Domain } from '@things-factory/shell'
|
|
4
6
|
import { Location, LOCATION_STATUS, LOCATION_TYPE, Warehouse } from '@things-factory/warehouse-base'
|
|
5
|
-
|
|
7
|
+
|
|
6
8
|
import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
|
|
7
9
|
import { Worksheet, WorksheetDetail } from '../../../entities'
|
|
8
10
|
|
|
@@ -69,7 +71,7 @@ export async function recommendLocationLevel1(
|
|
|
69
71
|
domain,
|
|
70
72
|
warehouse,
|
|
71
73
|
status: LOCATION_STATUS.EMPTY,
|
|
72
|
-
type:
|
|
74
|
+
type: In([LOCATION_TYPE.SHELF, LOCATION_TYPE.FLOOR]) // should only recommend these types
|
|
73
75
|
},
|
|
74
76
|
order,
|
|
75
77
|
take: optCnt
|
|
@@ -32,7 +32,7 @@ export const unloadedInventories = {
|
|
|
32
32
|
const returnOrder: ReturnOrder = foundWorksheetDetails[0].worksheet.returnOrder
|
|
33
33
|
const customerBizplace: Bizplace = foundWorksheetDetails[0].bizplace
|
|
34
34
|
if (arrivalNotice) {
|
|
35
|
-
|
|
35
|
+
let foundInv = await getRepository(Inventory).find({
|
|
36
36
|
where: {
|
|
37
37
|
domain,
|
|
38
38
|
bizplace: customerBizplace,
|
|
@@ -44,6 +44,15 @@ export const unloadedInventories = {
|
|
|
44
44
|
},
|
|
45
45
|
relations: ['reusablePallet', 'product', 'bizplace']
|
|
46
46
|
})
|
|
47
|
+
const items = foundInv.map((inv: Inventory) => {
|
|
48
|
+
const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null
|
|
49
|
+
return {
|
|
50
|
+
...inv,
|
|
51
|
+
expirationDate: expirationDate
|
|
52
|
+
}
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
return items
|
|
47
56
|
}
|
|
48
57
|
|
|
49
58
|
if (returnOrder) {
|