@things-factory/worksheet-base 5.0.0-alpha.4 → 5.0.0-alpha.40
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/constants/template.js +1 -0
- package/dist-server/constants/template.js.map +1 -1
- package/dist-server/controllers/ecommerce/sellercraft-controller.js +9 -3
- package/dist-server/controllers/ecommerce/sellercraft-controller.js.map +1 -1
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js +309 -4
- package/dist-server/controllers/inbound/unloading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/index.js +2 -0
- package/dist-server/controllers/index.js.map +1 -1
- package/dist-server/controllers/outbound/loading-worksheet-controller.js +10 -0
- package/dist-server/controllers/outbound/loading-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/packing-worksheet-controller.js +172 -7
- package/dist-server/controllers/outbound/packing-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/picking-worksheet-controller.js +352 -11
- package/dist-server/controllers/outbound/picking-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js +11 -1
- package/dist-server/controllers/outbound/returning-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js +110 -3
- package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map +1 -1
- package/dist-server/controllers/render-fm-grn.js +229 -0
- package/dist-server/controllers/render-fm-grn.js.map +1 -0
- package/dist-server/controllers/render-grn.js +45 -21
- package/dist-server/controllers/render-grn.js.map +1 -1
- package/dist-server/controllers/render-invoices.js +103 -65
- package/dist-server/controllers/render-invoices.js.map +1 -1
- package/dist-server/controllers/render-orientage-do.js.map +1 -1
- package/dist-server/controllers/render-orientage-grn.js +1 -0
- package/dist-server/controllers/render-orientage-grn.js.map +1 -1
- package/dist-server/controllers/render-po.js +147 -0
- package/dist-server/controllers/render-po.js.map +1 -0
- package/dist-server/controllers/render-ro-do.js +65 -1
- package/dist-server/controllers/render-ro-do.js.map +1 -1
- package/dist-server/controllers/worksheet-controller.js +15 -0
- package/dist-server/controllers/worksheet-controller.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js +10 -3
- package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js +30 -1
- package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js +27 -23
- package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +3 -0
- package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js +26 -2
- package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/packing/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/packing/packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/packing/scan-product-packing.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js +152 -132
- package/dist-server/graphql/resolvers/worksheet/packing-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/assign-picking-worker.js +13 -10
- package/dist-server/graphql/resolvers/worksheet/picking/assign-picking-worker.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js +6 -19
- package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/index.js +2 -1
- package/dist-server/graphql/resolvers/worksheet/picking/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js +49 -58
- package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js +4 -4
- package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js +6 -0
- package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js +3 -2
- package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/index.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js +15 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js.map +1 -0
- package/dist-server/graphql/resolvers/worksheet/unloading/unload.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js +3 -1
- package/dist-server/graphql/resolvers/worksheet/unloading-worksheet.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet/worksheets.js +18 -0
- package/dist-server/graphql/resolvers/worksheet/worksheets.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.js +4 -5
- package/dist-server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.js.map +1 -1
- package/dist-server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.js +4 -2
- package/dist-server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.js.map +1 -1
- package/dist-server/graphql/types/worksheet/find-release-orders-by-task-no.js +11 -0
- package/dist-server/graphql/types/worksheet/find-release-orders-by-task-no.js.map +1 -0
- package/dist-server/graphql/types/worksheet/index.js +33 -6
- package/dist-server/graphql/types/worksheet/index.js.map +1 -1
- package/dist-server/graphql/types/worksheet/picking-assignment-status.js +2 -2
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js +3 -0
- package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-info.js +1 -0
- package/dist-server/graphql/types/worksheet/worksheet-info.js.map +1 -1
- package/dist-server/graphql/types/worksheet/worksheet-patch.js +1 -0
- package/dist-server/graphql/types/worksheet/worksheet-patch.js.map +1 -1
- package/dist-server/graphql/types/worksheet-detail/index.js +0 -2
- package/dist-server/graphql/types/worksheet-detail/index.js.map +1 -1
- package/dist-server/index.js +5 -0
- package/dist-server/index.js.map +1 -1
- package/dist-server/routes.js +12 -0
- package/dist-server/routes.js.map +1 -1
- package/dist-server/utils/inventory-util.js +14 -25
- package/dist-server/utils/inventory-util.js.map +1 -1
- package/package.json +17 -17
- package/server/constants/template.ts +1 -0
- package/server/controllers/ecommerce/sellercraft-controller.ts +10 -3
- package/server/controllers/inbound/unloading-worksheet-controller.ts +376 -8
- package/server/controllers/index.ts +3 -0
- package/server/controllers/outbound/loading-worksheet-controller.ts +13 -0
- package/server/controllers/outbound/packing-worksheet-controller.ts +224 -9
- package/server/controllers/outbound/picking-worksheet-controller.ts +465 -16
- package/server/controllers/outbound/returning-worksheet-controller.ts +12 -1
- package/server/controllers/outbound/sorting-worksheet-controller.ts +149 -4
- package/server/controllers/render-fm-grn.ts +266 -0
- package/server/controllers/render-grn.ts +57 -23
- package/server/controllers/render-invoices.ts +119 -72
- package/server/controllers/render-orientage-do.ts +11 -11
- package/server/controllers/render-orientage-grn.ts +12 -11
- package/server/controllers/render-po.ts +170 -0
- package/server/controllers/render-ro-do.ts +93 -8
- package/server/controllers/worksheet-controller.ts +18 -2
- package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts +13 -4
- package/server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts +35 -2
- package/server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts +35 -25
- package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +2 -0
- package/server/graphql/resolvers/worksheet/loading/complete-loading.ts +41 -8
- package/server/graphql/resolvers/worksheet/packing/index.ts +3 -1
- package/server/graphql/resolvers/worksheet/packing/packing.ts +5 -4
- package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts +9 -4
- package/server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.ts +24 -0
- package/server/graphql/resolvers/worksheet/packing-worksheet.ts +167 -145
- package/server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts +15 -11
- package/server/graphql/resolvers/worksheet/picking/complete-picking.ts +5 -20
- package/server/graphql/resolvers/worksheet/picking/index.ts +3 -1
- package/server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.ts +62 -61
- package/server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.ts +24 -0
- package/server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts +5 -4
- package/server/graphql/resolvers/worksheet/sorting/sorting-product.ts +5 -4
- package/server/graphql/resolvers/worksheet/sorting-worksheet.ts +6 -0
- package/server/graphql/resolvers/worksheet/unloaded-inventories.ts +6 -2
- package/server/graphql/resolvers/worksheet/unloading/index.ts +4 -0
- package/server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts +26 -0
- package/server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.ts +24 -0
- package/server/graphql/resolvers/worksheet/unloading/unload.ts +3 -1
- package/server/graphql/resolvers/worksheet/unloading-worksheet.ts +3 -1
- package/server/graphql/resolvers/worksheet/worksheets.ts +26 -0
- package/server/graphql/resolvers/worksheet-detail/generate-batch-picking-worksheet-details-by-bulk.ts +10 -12
- package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts +4 -2
- package/server/graphql/types/worksheet/find-release-orders-by-task-no.ts +8 -0
- package/server/graphql/types/worksheet/index.ts +33 -6
- package/server/graphql/types/worksheet/picking-assignment-status.ts +2 -2
- package/server/graphql/types/worksheet/worksheet-detail-info.ts +3 -0
- package/server/graphql/types/worksheet/worksheet-info.ts +1 -0
- package/server/graphql/types/worksheet/worksheet-patch.ts +1 -0
- package/server/graphql/types/worksheet-detail/index.ts +0 -2
- package/server/index.ts +5 -0
- package/server/routes.ts +17 -0
- package/server/utils/inventory-util.ts +15 -23
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
|
|
4
|
+
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
4
5
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
6
|
+
const warehouse_base_1 = require("@things-factory/warehouse-base");
|
|
5
7
|
const constants_1 = require("../../../../constants");
|
|
6
8
|
const controllers_1 = require("../../../../controllers");
|
|
7
9
|
exports.completeLoadingResolver = {
|
|
@@ -16,14 +18,36 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
|
|
|
16
18
|
domain,
|
|
17
19
|
name: releaseGoodNo,
|
|
18
20
|
status: sales_base_1.ORDER_STATUS.LOADING
|
|
19
|
-
});
|
|
21
|
+
}, ['bizplace', 'bizplace.domain']);
|
|
20
22
|
const worksheet = await worksheetController.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.LOADING, [
|
|
21
23
|
'worksheetDetails',
|
|
22
|
-
'worksheetDetails.targetInventory'
|
|
24
|
+
'worksheetDetails.targetInventory',
|
|
25
|
+
'worksheetDetails.targetInventory.product'
|
|
23
26
|
]);
|
|
24
27
|
const worksheetDetails = worksheet.worksheetDetails;
|
|
25
28
|
const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
|
|
26
29
|
const remainInventories = targetInventories.filter((targetInventory) => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.LOADING);
|
|
30
|
+
const customerDomain = releaseGood.bizplace.domain;
|
|
31
|
+
let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
|
|
32
|
+
where: { domain: customerDomain }
|
|
33
|
+
});
|
|
34
|
+
if (customerAvailableSftp) {
|
|
35
|
+
let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
|
|
36
|
+
where: { domain, outboundOrderId: releaseGood.id }
|
|
37
|
+
});
|
|
38
|
+
let shipmentResult = await integration_sftp_1.SftpAPI.createShipment(customerAvailableSftp, {
|
|
39
|
+
releaseGood,
|
|
40
|
+
orderInventories: targetInventories,
|
|
41
|
+
sftp: customerAvailableSftp
|
|
42
|
+
});
|
|
43
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(shipmentResult);
|
|
44
|
+
let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
|
|
45
|
+
releaseGood,
|
|
46
|
+
inventoryItems,
|
|
47
|
+
sftp: customerAvailableSftp
|
|
48
|
+
});
|
|
49
|
+
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
|
|
50
|
+
}
|
|
27
51
|
await worksheetController.completeLoading(releaseGoodNo);
|
|
28
52
|
if (remainInventories.length) {
|
|
29
53
|
await createReturnWorksheet(tx, domain, user, releaseGoodNo, remainInventories);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,6 @@ const activate_packing_1 = require("./activate-packing");
|
|
|
5
5
|
const complete_packing_1 = require("./complete-packing");
|
|
6
6
|
const packing_1 = require("./packing");
|
|
7
7
|
const scan_product_packing_1 = require("./scan-product-packing");
|
|
8
|
-
|
|
8
|
+
const undo_serial_number_packing_1 = require("./undo-serial-number-packing");
|
|
9
|
+
exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, activate_packing_1.activatePackingResolver), complete_packing_1.completePackingResolver), packing_1.packingResolver), scan_product_packing_1.scanProductPackingResolver), undo_serial_number_packing_1.undoSerialNumberPackingResolver);
|
|
9
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/index.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAC5D,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/index.ts"],"names":[],"mappings":";;;AAAA,yDAA4D;AAC5D,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;AACnE,6EAA8E;AAEjE,QAAA,SAAS,6EACjB,0CAAuB,GACvB,0CAAuB,GACvB,yBAAe,GACf,iDAA0B,GAC1B,4DAA+B,EACnC"}
|
|
@@ -4,14 +4,14 @@ exports.packing = exports.packingResolver = void 0;
|
|
|
4
4
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
5
|
const controllers_1 = require("../../../../controllers");
|
|
6
6
|
exports.packingResolver = {
|
|
7
|
-
async packing(_, { worksheetDetailName, releaseQty }, context) {
|
|
7
|
+
async packing(_, { worksheetDetailName, releaseQty, serialNumber }, context) {
|
|
8
8
|
const { tx, domain, user } = context.state;
|
|
9
|
-
await packing(tx, domain, user, worksheetDetailName, releaseQty);
|
|
9
|
+
await packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber);
|
|
10
10
|
}
|
|
11
11
|
};
|
|
12
|
-
async function packing(tx, domain, user, worksheetDetailName, releaseQty) {
|
|
12
|
+
async function packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber) {
|
|
13
13
|
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
14
|
-
const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty);
|
|
14
|
+
const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
|
|
15
15
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
16
16
|
const worksheet = worksheetDetail.worksheet;
|
|
17
17
|
if (releaseGood.type === 'b2c' && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/packing.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB;IAEpB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IAExG,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;QAC1D,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;QAEnF,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACnE;KACF;AACH,CAAC;AAxBD,0BAwBC"}
|
|
@@ -4,14 +4,14 @@ exports.scanProductPacking = exports.scanProductPackingResolver = void 0;
|
|
|
4
4
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
5
5
|
const controllers_1 = require("../../../../controllers");
|
|
6
6
|
exports.scanProductPackingResolver = {
|
|
7
|
-
async scanProductPacking(_, { worksheetDetailName, productBarcode }, context) {
|
|
7
|
+
async scanProductPacking(_, { worksheetDetailName, productBarcode, serialNumber }, context) {
|
|
8
8
|
const { tx, domain, user } = context.state;
|
|
9
|
-
await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode);
|
|
9
|
+
await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber);
|
|
10
10
|
}
|
|
11
11
|
};
|
|
12
|
-
async function scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode) {
|
|
12
|
+
async function scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber) {
|
|
13
13
|
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
14
|
-
const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode);
|
|
14
|
+
const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode, serialNumber);
|
|
15
15
|
let releaseGood = worksheetDetail.targetInventory.releaseGood;
|
|
16
16
|
const worksheet = worksheetDetail.worksheet;
|
|
17
17
|
if (releaseGood.type === 'b2c' && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"scan-product-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/scan-product-packing.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AAIxF,yDAA2F;AAG9E,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QAClG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IAC/F,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,cAAsB,EACtB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,eAAe,GAAG,MAAM,mBAAmB,CAAC,kBAAkB,CAClE,mBAAmB,EACnB,cAAc,EACd,YAAY,CACb,CAAA;IAED,IAAI,WAAW,GAAgB,eAAe,CAAC,eAAe,CAAC,WAAW,CAAA;IAC1E,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;IAEtD,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,CAAA,EAAE;QAC1D,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;QAEnF,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACnE;KACF;AACH,CAAC;AA5BD,gDA4BC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.undoSerialNumberPackingResolver = void 0;
|
|
4
|
+
const controllers_1 = require("../../../../controllers");
|
|
5
|
+
exports.undoSerialNumberPackingResolver = {
|
|
6
|
+
async undoSerialNumberPacking(_, { worksheetDetailName, inventoryItemId }, context) {
|
|
7
|
+
const { tx, domain, user } = context.state;
|
|
8
|
+
await undoSerialNumberPacking(tx, domain, user, worksheetDetailName, inventoryItemId);
|
|
9
|
+
}
|
|
10
|
+
};
|
|
11
|
+
async function undoSerialNumberPacking(tx, domain, user, worksheetDetailName, inventoryItemId) {
|
|
12
|
+
const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
13
|
+
await worksheetController.undoSerialNumberPacking(worksheetDetailName, inventoryItemId);
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=undo-serial-number-packing.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"undo-serial-number-packing.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/packing/undo-serial-number-packing.ts"],"names":[],"mappings":";;;AAKA,yDAAoE;AAEvD,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,eAAe,EAAE,EAAE,OAAY;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,uBAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA;IACvF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,uBAAuB,CACpC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,eAAuB;IAEvB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;AACzF,CAAC"}
|
|
@@ -11,148 +11,168 @@ const utils_1 = require("../../../utils");
|
|
|
11
11
|
exports.packingWorksheetResolver = {
|
|
12
12
|
async packingWorksheet(_, { releaseGoodNo }, context) {
|
|
13
13
|
var _a;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
// Find Release Order based on Bin
|
|
23
|
-
if (!releaseGood) {
|
|
24
|
-
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
25
|
-
where: { domain, name: releaseGoodNo }
|
|
14
|
+
try {
|
|
15
|
+
const { tx, domain, user } = context.state;
|
|
16
|
+
let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
|
|
17
|
+
where: {
|
|
18
|
+
domain,
|
|
19
|
+
name: releaseGoodNo
|
|
20
|
+
},
|
|
21
|
+
relations: ['bizplace', 'bizplace.domain']
|
|
26
22
|
});
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
.
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
let marketplaceOrder;
|
|
61
|
-
let marketplaceOrderItems = [];
|
|
62
|
-
let marketplaceStore;
|
|
63
|
-
let trackingNo;
|
|
64
|
-
let shippingProvider;
|
|
65
|
-
let marketplaceStatus;
|
|
66
|
-
if (releaseGood.type === 'b2c') {
|
|
67
|
-
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
68
|
-
domain: worksheet.bizplace.domain,
|
|
69
|
-
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
70
|
-
});
|
|
71
|
-
if (sellercraft) {
|
|
72
|
-
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
73
|
-
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
74
|
-
releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
23
|
+
// Find Release Order based on Bin
|
|
24
|
+
if (!releaseGood) {
|
|
25
|
+
const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
|
|
26
|
+
where: { domain, name: releaseGoodNo }
|
|
27
|
+
});
|
|
28
|
+
if (binLocation) {
|
|
29
|
+
const qb = tx
|
|
30
|
+
.getRepository(sales_base_1.OrderInventory)
|
|
31
|
+
.createQueryBuilder('orderInventory');
|
|
32
|
+
qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
|
|
33
|
+
.innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
|
|
34
|
+
.innerJoinAndSelect('bizplace.domain', 'domain')
|
|
35
|
+
.innerJoinAndSelect('worksheets', 'ws', `orderInventory.release_good_id = ws.release_good_id AND ws.type = 'PACKING' AND ws.status = 'EXECUTING'`)
|
|
36
|
+
.where('orderInventory.domain_id = :domainId', { domainId: domain.id })
|
|
37
|
+
.andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
|
|
38
|
+
orderInventoryStatus: [
|
|
39
|
+
sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PACK,
|
|
40
|
+
sales_base_1.ORDER_INVENTORY_STATUS.PACKING,
|
|
41
|
+
sales_base_1.ORDER_INVENTORY_STATUS.PACKED
|
|
42
|
+
]
|
|
43
|
+
})
|
|
44
|
+
.andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
|
|
45
|
+
.andWhere('releaseGood.status IN (:...status)', {
|
|
46
|
+
status: [sales_base_1.ORDER_STATUS.READY_TO_PACK, sales_base_1.ORDER_STATUS.PACKING]
|
|
47
|
+
});
|
|
48
|
+
const orderInventoryByBin = await qb.getOne();
|
|
49
|
+
if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood) {
|
|
50
|
+
releaseGoodNo = orderInventoryByBin.releaseGood.name;
|
|
51
|
+
releaseGood = orderInventoryByBin.releaseGood;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
throw new Error(`Bin do not have any existing order.`);
|
|
55
|
+
}
|
|
75
56
|
}
|
|
76
|
-
trackingNo = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo;
|
|
77
|
-
shippingProvider = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter;
|
|
78
|
-
marketplaceStatus = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus;
|
|
79
57
|
}
|
|
80
|
-
if (!
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
58
|
+
if (!releaseGood)
|
|
59
|
+
throw new Error(`Release good do not exist.`);
|
|
60
|
+
const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, [
|
|
61
|
+
'bizplace',
|
|
62
|
+
'bizplace.domain',
|
|
63
|
+
'releaseGood',
|
|
64
|
+
'releaseGood.domain',
|
|
65
|
+
'worksheetDetails',
|
|
66
|
+
'worksheetDetails.targetInventory',
|
|
67
|
+
'worksheetDetails.targetInventory.binLocation',
|
|
68
|
+
'worksheetDetails.targetInventory.inventory',
|
|
69
|
+
'worksheetDetails.targetInventory.inventory.location',
|
|
70
|
+
'worksheetDetails.targetInventory.inventory.product',
|
|
71
|
+
'worksheetDetails.targetInventory.inventory.product.productDetails',
|
|
72
|
+
'worksheetDetails.toLocation'
|
|
73
|
+
], constants_1.WORKSHEET_TYPE.PACKING, releaseGood);
|
|
74
|
+
let marketplaceOrder;
|
|
75
|
+
let marketplaceOrderItems = [];
|
|
76
|
+
let marketplaceStore;
|
|
77
|
+
let trackingNo;
|
|
78
|
+
let shippingProvider;
|
|
79
|
+
let marketplaceStatus;
|
|
80
|
+
if (releaseGood.type === 'b2c') {
|
|
81
|
+
const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
|
|
82
|
+
domain: worksheet.bizplace.domain,
|
|
83
|
+
status: integration_sellercraft_1.SellercraftStatus.ACTIVE
|
|
90
84
|
});
|
|
91
|
-
if (
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
85
|
+
if (sellercraft) {
|
|
86
|
+
if (!(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {
|
|
87
|
+
const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
|
|
88
|
+
releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood);
|
|
89
|
+
}
|
|
90
|
+
trackingNo = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo;
|
|
91
|
+
shippingProvider = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter;
|
|
92
|
+
marketplaceStatus = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus;
|
|
99
93
|
}
|
|
100
94
|
else {
|
|
101
|
-
|
|
102
|
-
where: {
|
|
95
|
+
marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
|
|
96
|
+
where: { orderNo: releaseGood.refNo },
|
|
97
|
+
relations: [
|
|
98
|
+
'domain',
|
|
99
|
+
'marketplaceStore',
|
|
100
|
+
'marketplaceOrderItems',
|
|
101
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
102
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
|
|
103
|
+
]
|
|
103
104
|
});
|
|
105
|
+
if (!marketplaceOrder) {
|
|
106
|
+
throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.');
|
|
107
|
+
}
|
|
108
|
+
let marketplaceOrderShipping;
|
|
109
|
+
if (marketplaceOrder.isSplitted) {
|
|
110
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
111
|
+
where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
marketplaceOrderShipping = await tx.getRepository(marketplace_base_1.MarketplaceOrderShipping).findOne({
|
|
116
|
+
where: { orderNoRef: worksheet.releaseGood.refNo }
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
120
|
+
? marketplaceOrderShipping.ownTrackingNo
|
|
121
|
+
: marketplaceOrderShipping.trackingNo;
|
|
122
|
+
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
123
|
+
? marketplaceOrderShipping.ownTransporter
|
|
124
|
+
: marketplaceOrderShipping.transporter;
|
|
125
|
+
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
126
|
+
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
104
127
|
}
|
|
105
|
-
trackingNo = marketplaceOrderShipping.ownTrackingNo
|
|
106
|
-
? marketplaceOrderShipping.ownTrackingNo
|
|
107
|
-
: marketplaceOrderShipping.trackingNo;
|
|
108
|
-
shippingProvider = marketplaceOrderShipping.ownTransporter
|
|
109
|
-
? marketplaceOrderShipping.ownTransporter
|
|
110
|
-
: marketplaceOrderShipping.transporter;
|
|
111
|
-
marketplaceStore = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore;
|
|
112
|
-
marketplaceStatus = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.status;
|
|
113
128
|
}
|
|
129
|
+
return {
|
|
130
|
+
worksheetInfo: {
|
|
131
|
+
releaseGood,
|
|
132
|
+
bizplaceName: releaseGood.bizplace.name,
|
|
133
|
+
refNo: releaseGood.refNo,
|
|
134
|
+
refNo2: releaseGood.refNo2,
|
|
135
|
+
refNo3: releaseGood.refNo3,
|
|
136
|
+
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
137
|
+
startedAt: worksheet.startedAt,
|
|
138
|
+
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
139
|
+
trackingNo: trackingNo ? trackingNo : '',
|
|
140
|
+
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
141
|
+
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
142
|
+
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
143
|
+
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
144
|
+
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
145
|
+
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
146
|
+
},
|
|
147
|
+
worksheetDetailInfos: worksheet.worksheetDetails.map(async (packingWSD) => {
|
|
148
|
+
const targetInventory = packingWSD.targetInventory;
|
|
149
|
+
const inventory = targetInventory.inventory;
|
|
150
|
+
return {
|
|
151
|
+
name: packingWSD.name,
|
|
152
|
+
palletId: inventory.palletId,
|
|
153
|
+
cartonId: inventory.cartonId,
|
|
154
|
+
batchId: inventory.batchId,
|
|
155
|
+
batchIdRef: inventory.batchIdRef,
|
|
156
|
+
product: inventory.product,
|
|
157
|
+
sku: inventory.product.sku,
|
|
158
|
+
releaseQty: targetInventory.releaseQty,
|
|
159
|
+
packedQty: targetInventory.packedQty,
|
|
160
|
+
status: packingWSD.status,
|
|
161
|
+
description: packingWSD.description,
|
|
162
|
+
targetName: targetInventory.name,
|
|
163
|
+
packingType: inventory.packingType,
|
|
164
|
+
packingSize: inventory.packingSize,
|
|
165
|
+
binLocation: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation,
|
|
166
|
+
location: inventory.location,
|
|
167
|
+
relatedOrderInv: targetInventory
|
|
168
|
+
};
|
|
169
|
+
})
|
|
170
|
+
};
|
|
171
|
+
}
|
|
172
|
+
catch (error) {
|
|
173
|
+
console.error(error);
|
|
174
|
+
throw error;
|
|
114
175
|
}
|
|
115
|
-
return {
|
|
116
|
-
worksheetInfo: {
|
|
117
|
-
releaseGood,
|
|
118
|
-
bizplaceName: releaseGood.bizplace.name,
|
|
119
|
-
refNo: releaseGood.refNo,
|
|
120
|
-
refNo2: releaseGood.refNo2,
|
|
121
|
-
refNo3: releaseGood.refNo3,
|
|
122
|
-
partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
|
|
123
|
-
startedAt: worksheet.startedAt,
|
|
124
|
-
shippingProvider: shippingProvider ? shippingProvider : '',
|
|
125
|
-
trackingNo: trackingNo ? trackingNo : '',
|
|
126
|
-
airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
|
|
127
|
-
invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
|
|
128
|
-
platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
|
|
129
|
-
marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
|
|
130
|
-
marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
|
|
131
|
-
marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
|
|
132
|
-
},
|
|
133
|
-
worksheetDetailInfos: worksheet.worksheetDetails.map(async (packingWSD) => {
|
|
134
|
-
const targetInventory = packingWSD.targetInventory;
|
|
135
|
-
const inventory = targetInventory.inventory;
|
|
136
|
-
return {
|
|
137
|
-
name: packingWSD.name,
|
|
138
|
-
palletId: inventory.palletId,
|
|
139
|
-
cartonId: inventory.cartonId,
|
|
140
|
-
batchId: inventory.batchId,
|
|
141
|
-
batchIdRef: inventory.batchIdRef,
|
|
142
|
-
product: inventory.product,
|
|
143
|
-
sku: inventory.product.sku,
|
|
144
|
-
releaseQty: targetInventory.releaseQty,
|
|
145
|
-
packedQty: targetInventory.packedQty,
|
|
146
|
-
status: packingWSD.status,
|
|
147
|
-
description: packingWSD.description,
|
|
148
|
-
targetName: targetInventory.name,
|
|
149
|
-
packingType: inventory.packingType,
|
|
150
|
-
packingSize: inventory.packingSize,
|
|
151
|
-
binLocation: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation,
|
|
152
|
-
location: inventory.location
|
|
153
|
-
};
|
|
154
|
-
})
|
|
155
|
-
};
|
|
156
176
|
}
|
|
157
177
|
};
|
|
158
178
|
async function getTrackingNo(marketplaceStore, marketplaceOrderItems) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":";;;AAGA,qFAAwF;AACxF,uEAKyC;AACzC,2DAA8G;AAE9G,mEAAoE;
|
|
1
|
+
{"version":3,"file":"packing-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/packing-worksheet.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,16 +12,19 @@ exports.assignPickingWorkerResolver = {
|
|
|
12
12
|
throw new Error('Target user is not belong to current domain');
|
|
13
13
|
if (!assignee)
|
|
14
14
|
throw new Error('failed to find target user');
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
15
|
+
await Promise.all(worksheetId.map(async (worksheetId) => {
|
|
16
|
+
const worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
|
|
17
|
+
id: worksheetId,
|
|
18
|
+
}, { where: [{
|
|
19
|
+
type: constants_1.WORKSHEET_TYPE.BATCH_PICKING
|
|
20
|
+
}, { type: constants_1.WORKSHEET_TYPE.PICKING }] });
|
|
21
|
+
if (!worksheet)
|
|
22
|
+
throw new Error('failed to find target picking worksheet');
|
|
23
|
+
if (worksheet.status !== constants_1.WORKSHEET_STATUS.DEACTIVATED)
|
|
24
|
+
throw new Error(`current status of worksheet is not able to assign worker`);
|
|
25
|
+
worksheet.assignee = assignee;
|
|
26
|
+
await tx.getRepository(entities_1.Worksheet).save(worksheet);
|
|
27
|
+
}));
|
|
25
28
|
}
|
|
26
29
|
};
|
|
27
30
|
//# sourceMappingURL=assign-picking-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assign-picking-worker.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAGhD,qDAAwE;AACxE,mDAAgD;AAEnC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CACvB,UAAgB,EAChB,EAAE,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"assign-picking-worker.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/assign-picking-worker.ts"],"names":[],"mappings":";;;AAAA,yDAAgD;AAGhD,qDAAwE;AACxE,mDAAgD;AAEnC,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CACvB,UAAgB,EAChB,EAAE,WAAW,EAAE,MAAM,EAA6C,EAClE,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,MAAM,QAAQ,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QAC/F,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,UAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC;YACtF,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAA;QAEhE,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAE5D,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,EAAC,EAAE;YACrD,MAAM,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACrE,EAAE,EAAE,WAAW;aAChB,EAAC,EAAC,KAAK,EAAE,CAAC;wBACT,IAAI,EAAC,0BAAc,CAAC,aAAa;qBAClC,EAAC,EAAC,IAAI,EAAC,0BAAc,CAAC,OAAO,EAAC,CAAC,EAAC,CAAC,CAAA;YAElC,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;YAC1E,IAAI,SAAS,CAAC,MAAM,KAAK,4BAAgB,CAAC,WAAW;gBACnD,MAAM,IAAI,KAAK,CAAC,0DAA0D,CAAC,CAAA;YAE7E,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAA;YAC7B,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QAEnD,CAAC,CAAC,CAAC,CAAA;IACL,CAAC;CACF,CAAA"}
|
|
@@ -5,7 +5,6 @@ const biz_base_1 = require("@things-factory/biz-base");
|
|
|
5
5
|
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
6
6
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
7
7
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
8
|
-
const integration_sftp_1 = require("@things-factory/integration-sftp");
|
|
9
8
|
const marketplace_base_1 = require("@things-factory/marketplace-base");
|
|
10
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
11
10
|
const setting_base_1 = require("@things-factory/setting-base");
|
|
@@ -158,28 +157,16 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
|
|
|
158
157
|
}
|
|
159
158
|
}
|
|
160
159
|
else {
|
|
161
|
-
|
|
162
|
-
|
|
160
|
+
if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
|
|
161
|
+
await tx
|
|
162
|
+
.getRepository(marketplace_base_1.MarketplaceOrderShipping)
|
|
163
|
+
.update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
|
|
164
|
+
else
|
|
165
|
+
throw resp;
|
|
163
166
|
}
|
|
164
167
|
}
|
|
165
168
|
}
|
|
166
169
|
}
|
|
167
|
-
const customerDomain = releaseGood.bizplace.domain;
|
|
168
|
-
let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
|
|
169
|
-
where: { domain: customerDomain }
|
|
170
|
-
});
|
|
171
|
-
if (customerAvailableSftp) {
|
|
172
|
-
const orderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
|
|
173
|
-
where: { releaseGood },
|
|
174
|
-
relations: ['product']
|
|
175
|
-
});
|
|
176
|
-
let result = await integration_sftp_1.SftpAPI.createShipment(customerAvailableSftp, {
|
|
177
|
-
releaseGood,
|
|
178
|
-
orderInventories,
|
|
179
|
-
sftp: customerAvailableSftp
|
|
180
|
-
});
|
|
181
|
-
customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(result);
|
|
182
|
-
}
|
|
183
170
|
if (releaseGood.packingOption) {
|
|
184
171
|
const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
|
|
185
172
|
const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
|