npm - @things-factory/worksheet-base - Versions diffs - 4.0.10 → 4.0.14 - Mend

@things-factory/worksheet-base 4.0.10 → 4.0.14

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.

Files changed (106) hide show

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js CHANGED Viewed

@@ -7,6 +7,7 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
+const setting_base_1 = require("@things-factory/setting-base");
 const constants_1 = require("../../../../constants");
 const controllers_1 = require("../../../../controllers/");
 const ecommerce_1 = require("../../../../controllers/ecommerce");
@@ -27,7 +28,7 @@ exports.completePickingResolver = {
     }
 };
 async function completePicking(tx, domain, user, releaseGoodNo) {
-    var _a;
+    var _a, _b, _c;
     const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
     const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
         where: { domain, name: releaseGoodNo },
@@ -60,6 +61,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
             .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
         if (sellercraft) {
             const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+            await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
             await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
         }
         else {
@@ -156,11 +158,28 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     }
     if (releaseGood.packingOption) {
         const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
-        await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
+        const directActivatePackingWorksheet = await tx.getRepository(setting_base_1.Setting).findOne({
+            where: { domain: domain, category: 'id-rule', name: 'enable-direct-activate-packing-worksheet' }
+        });
+        const partnerDirectActivatePackingWorksheetSetting = await tx
+            .getRepository(setting_base_1.PartnerSetting)
+            .findOne({
+            where: { setting: directActivatePackingWorksheet, domain: domain, partnerDomain: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
+        });
+        let packingWorksheet = await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
+        if (directActivatePackingWorksheet != undefined && directActivatePackingWorksheet.value.toLowerCase() == 'true') {
+            if (partnerDirectActivatePackingWorksheetSetting != undefined) {
+                if (partnerDirectActivatePackingWorksheetSetting.value.toLowerCase() == 'true')
+                    await packingWSCtrl.activatePacking(packingWorksheet.name);
+            }
+            else {
+                await packingWSCtrl.activatePacking(packingWorksheet.name);
+            }
+        }
     }
     else {
         // Find Existing Loading Worksheet if any
-        const existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+        let existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
             where: {
                 releaseGood,
                 type: constants_1.WORKSHEET_TYPE.LOADING,
@@ -170,14 +189,20 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
         if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
             const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
             let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
-            if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+            if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
                 loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
             }
             const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
             await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
         }
         else {
-            throw new Error('Picking completion has been triggered twice, loading worksheet has been generated. Kindly proceed to loading.');
+            const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
+            let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
+            if (!((_c = loadingWorksheet.worksheetDetails) === null || _c === void 0 ? void 0 : _c.length)) {
+                loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
+            }
+            const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
+            await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
         }
     }
 }

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map CHANGED Viewed

	@@ -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;~~AAG9G~~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~~QAClG~~,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;~~KAC5D~~;SAAM;QACL,yCAAyC;QACzC,~~MAAM~~,qBAAqB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;~~YACjF~~,KAAK,EAAE;gBACL,WAAW;gBACX,IAAI,EAAE,0BAAc,CAAC,OAAO;gBAC5B,MAAM,EAAE,4BAAgB,CAAC,WAAW;aACrC;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;YACtF,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,IAAI,gBAAgB,GAAc,MAAM,aAAa,CAAC,wBAAwB,CAC5E,aAAa,EACb,uBAAuB,CACxB,CAAA;YAED,IAAI,CAAC,CAAA,MAAA,gBAAgB,CAAC,gBAAgB,0CAAE,MAAM,CAAA,EAAE;gBAC9C,gBAAgB,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;aAC9E;YAED,MAAM,uBAAuB,GAAsB,gBAAgB,CAAC,gBAAgB,CAAA;YACpF,MAAM,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;SACpF;aAAM;YACL,MAAM,~~IAAI~~,~~KAAK,CACb,+~~GAA+G,~~CAChH~~,CAAA;~~SACF~~;KACF;AACH,CAAC;~~AApLD~~,~~0CAoLC~~"}
1	+ {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js ADDED Viewed

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchAndAssignPickingTaskResolver = void 0;
+const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const setting_base_1 = require("@things-factory/setting-base");
+const constants_1 = require("../../../../constants");
+const entities_1 = require("../../../../entities");
+const picking_worksheet_1 = require("../picking-worksheet");
+const activate_picking_1 = require("./activate-picking");
+exports.fetchAndAssignPickingTaskResolver = {
+    async fetchAndAssignPickingTask(_, {}, context) {
+        const { tx, domain, user } = context.state;
+        const assignee = await tx.getRepository(auth_base_1.User).findOne(user.id, { relations: ['domains'] });
+        if (((assignee === null || assignee === void 0 ? void 0 : assignee.domains) || []).every((userDomain) => userDomain.id !== domain.id))
+            throw new Error('Target user is not belong to current domain');
+        if (!assignee)
+            throw new Error('failed to find target user');
+        let worksheet;
+        worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+            relations: ['releaseGood'],
+            where: [
+                {
+                    domain,
+                    type: constants_1.WORKSHEET_TYPE.PICKING,
+                    status: constants_1.WORKSHEET_STATUS.EXECUTING,
+                    assignee: assignee
+                },
+                {
+                    domain,
+                    type: constants_1.WORKSHEET_TYPE.PICKING,
+                    status: constants_1.WORKSHEET_STATUS.DEACTIVATED,
+                    assignee: assignee
+                }
+            ],
+            order: {
+                name: 'ASC'
+            }
+        });
+        if (!worksheet) {
+            worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+                relations: ['releaseGood'],
+                where: [
+                    {
+                        domain,
+                        type: constants_1.WORKSHEET_TYPE.PICKING,
+                        status: constants_1.WORKSHEET_STATUS.EXECUTING,
+                        assignee: null
+                    },
+                    {
+                        domain,
+                        type: constants_1.WORKSHEET_TYPE.PICKING,
+                        status: constants_1.WORKSHEET_STATUS.DEACTIVATED,
+                        assignee: null
+                    }
+                ]
+            });
+            await (0, typeorm_1.getRepository)(entities_1.Worksheet).update({ id: worksheet.id }, { assignee: assignee });
+        }
+        if (worksheet.status == constants_1.WORKSHEET_STATUS.DEACTIVATED)
+            await (0, activate_picking_1.activatePicking)(tx, domain, user, worksheet.name);
+        const locationSortingRules = await tx.getRepository(setting_base_1.Setting).findOne({
+            where: { domain, name: 'rule-for-picking-product' }
+        });
+        const sortingRule = JSON.parse(locationSortingRules.value);
+        const locationSortingRule = Object.keys(sortingRule).map(field => {
+            return { name: field, desc: sortingRule[field] === 'DESC' };
+        });
+        return await (0, picking_worksheet_1.pickingWorksheet)(domain, worksheet.releaseGood.name, locationSortingRule, tx);
+    }
+};
+//# sourceMappingURL=fetch-and-assign-picking-task.js.map

package/dist-server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"fetch-and-assign-picking-task.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/picking/index.js CHANGED Viewed

@@ -5,6 +5,7 @@ const activate_batch_picking_1 = require("./activate-batch-picking");
 const activate_picking_1 = require("./activate-picking");
 const assign_picking_inventories_1 = require("./assign-picking-inventories");
 const assign_picking_worker_1 = require("./assign-picking-worker");
+const fetch_and_assign_picking_task_1 = require("./fetch-and-assign-picking-task");
 const batch_picking_1 = require("./batch-picking");
 const complete_batch_picking_1 = require("./complete-batch-picking");
 const complete_picking_1 = require("./complete-picking");
@@ -12,5 +13,5 @@ const picking_1 = require("./picking");
 const scan_product_picking_1 = require("./scan-product-picking");
 const scan_product_batch_picking_1 = require("./scan-product-batch-picking");
 const undo_picking_assignment_1 = require("./undo-picking-assignment");
-exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_picking_inventories_1.assignPickingInventoriesResolver), undo_picking_assignment_1.undoPickingAssigmentResolver), activate_picking_1.activatePickingResolver), activate_batch_picking_1.activateBatchPickingResolver), picking_1.pickingResolver), scan_product_picking_1.scanProductPickingResolver), scan_product_batch_picking_1.scanProductBatchPickingResolver), batch_picking_1.batchPickingResolver), complete_picking_1.completePickingResolver), complete_batch_picking_1.completeBatchPickingResolver), assign_picking_worker_1.assignPickingWorkerResolver);
+exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, assign_picking_inventories_1.assignPickingInventoriesResolver), undo_picking_assignment_1.undoPickingAssigmentResolver), activate_picking_1.activatePickingResolver), activate_batch_picking_1.activateBatchPickingResolver), picking_1.pickingResolver), scan_product_picking_1.scanProductPickingResolver), scan_product_batch_picking_1.scanProductBatchPickingResolver), batch_picking_1.batchPickingResolver), complete_picking_1.completePickingResolver), complete_batch_picking_1.completeBatchPickingResolver), assign_picking_worker_1.assignPickingWorkerResolver), fetch_and_assign_picking_task_1.fetchAndAssignPickingTaskResolver);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/worksheet/picking/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,yDAA4D;AAC5D,6EAA+E;AAC/E,mEAAqE;AACrE,mDAAsD;AACtD,qEAAuE;AACvE,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;AACnE,6EAA8E;AAC9E,uEAAwE;AAE3D,QAAA,SAAS,~~iKACjB,~~6DAAgC,GAChC,sDAA4B,GAC5B,0CAAuB,GACvB,qDAA4B,GAC5B,yBAAe,GACf,iDAA0B,GAC1B,4DAA+B,GAC/B,oCAAoB,GACpB,0CAAuB,GACvB,qDAA4B,GAC5B,mDAA2B,~~EAC/B~~"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/index.ts"],"names":[],"mappings":";;;AAAA,qEAAuE;AACvE,yDAA4D;AAC5D,6EAA+E;AAC/E,mEAAqE;AACrE,mFAAmF;AACnF,mDAAsD;AACtD,qEAAuE;AACvE,yDAA4D;AAC5D,uCAA2C;AAC3C,iEAAmE;AACnE,6EAA8E;AAC9E,uEAAwE;AAE3D,QAAA,SAAS,+KACjB,6DAAgC,GAChC,sDAA4B,GAC5B,0CAAuB,GACvB,qDAA4B,GAC5B,yBAAe,GACf,iDAA0B,GAC1B,4DAA+B,GAC/B,oCAAoB,GACpB,0CAAuB,GACvB,qDAA4B,GAC5B,mDAA2B,GAC3B,iEAAiC,EACrC"}

package/dist-server/graphql/resolvers/worksheet/picking/picking.js CHANGED Viewed

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.picking = exports.pickingResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.pickingResolver = {
-    async picking(_, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty }, context) {
+    async picking(_, { worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber }, context) {
         const { tx, domain, user } = context.state;
-        await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty);
+        await picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber);
     }
 };
-async function picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty) {
+async function picking(tx, domain, user, worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber) {
     const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
-    await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty);
+    await worksheetController.picking(worksheetDetailName, worksheetType, palletId, locationName, releaseQty, binLocation, serialNumber);
 }
 exports.picking = picking;
 //# sourceMappingURL=picking.js.map

package/dist-server/graphql/resolvers/worksheet/picking/picking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,OAAY;~~QAC5G~~,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,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;~~IACzG~~,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB;~~IAElB~~,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,CAAC,CAAA;~~AAC3G~~,CAAC;~~AAZD~~,~~0BAYC~~"}
1	+ {"version":3,"file":"picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,OAAY;QACvI,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,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;IACpI,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,QAAgB,EAChB,YAAoB,EACpB,UAAkB,EAClB,WAAoB,EACpB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAAC,mBAAmB,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC,CAAA;AACtI,CAAC;AAdD,0BAcC"}

package/dist-server/graphql/resolvers/worksheet/picking/scan-product-picking.js CHANGED Viewed

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanProductPicking = exports.scanProductPickingResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.scanProductPickingResolver = {
-    async scanProductPicking(_, { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation }, context) {
+    async scanProductPicking(_, { worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber }, context) {
         const { tx, domain, user } = context.state;
-        await scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation);
+        await scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber);
     }
 };
-async function scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation) {
+async function scanProductPicking(tx, domain, user, worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber) {
     const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
-    await worksheetController.scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation);
+    await worksheetController.scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber);
 }
 exports.scanProductPicking = scanProductPicking;
 //# sourceMappingURL=scan-product-picking.js.map

package/dist-server/graphql/resolvers/worksheet/picking/scan-product-picking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"scan-product-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/scan-product-picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,~~EAC7E~~,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CACtB,EAAE,EACF,MAAM,EACN,IAAI,EACJ,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,~~CACZ~~,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,cAAsB,EACtB,QAAgB,EAChB,WAAoB;~~IAEpB~~,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAC1C,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,~~CACZ~~,CAAA;AACH,CAAC;~~AAlBD~~,~~gDAkBC~~"}
1	+ {"version":3,"file":"scan-product-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/scan-product-picking.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,EAC3F,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CACtB,EAAE,EACF,MAAM,EACN,IAAI,EACJ,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,CACb,CAAA;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,aAAqB,EACrB,cAAsB,EACtB,QAAgB,EAChB,WAAoB,EACpB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAC1C,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,QAAQ,EACR,WAAW,EACX,YAAY,CACb,CAAA;AACH,CAAC;AApBD,gDAoBC"}

package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js CHANGED Viewed

@@ -1,70 +1,99 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickingWorksheetResolver = void 0;
+exports.pickingWorksheet = exports.pickingWorksheetResolver = void 0;
 const typeorm_1 = require("typeorm");
 const sales_base_1 = require("@things-factory/sales-base");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 const utils_1 = require("../../../utils");
 exports.pickingWorksheetResolver = {
     async pickingWorksheet(_, { releaseGoodNo, locationSortingRules }, context) {
-        var _a;
-        const { domain } = context.state;
-        const releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
-            where: { domain, name: releaseGoodNo /*status: ORDER_STATUS.PICKING*/ },
-            relations: ['bizplace', 'bizplace.domain']
+        const { domain, tx } = context.state;
+        return await pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx);
+    }
+};
+async function pickingWorksheet(domain, releaseGoodNo, locationSortingRules, tx) {
+    var _a;
+    let releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+        where: { domain, name: releaseGoodNo /*status: ORDER_STATUS.PICKING*/ },
+        relations: ['bizplace', 'bizplace.domain']
+    });
+    // Find Release Order based on Bin
+    if (!releaseGood) {
+        const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
+            where: { domain, name: releaseGoodNo }
         });
-        if (!releaseGood)
-            throw new Error(`Couldn't find picking worksheet by order no (${releaseGoodNo})`);
-        const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, ['bizplace'], constants_1.WORKSHEET_TYPE.PICKING, releaseGood);
-        const qb = (0, typeorm_1.createQueryBuilder)(entities_1.WorksheetDetail, 'WSD');
-        qb.leftJoinAndSelect('WSD.targetInventory', 'T_INV')
-            .leftJoinAndSelect('T_INV.inventory', 'INV')
-            .leftJoinAndSelect('T_INV.product', 'PROD')
-            .leftJoinAndSelect('INV.location', 'LOC');
-        if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
-            locationSortingRules.forEach((rule) => {
-                qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
-            });
-        }
-        const worksheetDetails = await qb
-            .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
-            .andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED })
-            .andWhere('"T_INV"."status" != :t_invstatus', { t_invstatus: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED })
-            .getMany();
-        return {
-            worksheetInfo: {
-                bizplaceName: releaseGood.bizplace.name,
-                partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
-                startedAt: worksheet.startedAt,
-                refNo: releaseGood.refNo,
-                refNo2: releaseGood.refNo2,
-                releaseGood
+        const orderInventoryByBin = await tx.getRepository(sales_base_1.OrderInventory).findOne({
+            where: {
+                domain,
+                binLocation,
+                status: (0, typeorm_1.In)([sales_base_1.ORDER_INVENTORY_STATUS.PICKING, sales_base_1.ORDER_INVENTORY_STATUS.PICKED])
             },
-            worksheetDetailInfos: worksheetDetails.map(async (pickingWSD) => {
-                const targetInventory = pickingWSD.targetInventory;
-                const inventory = targetInventory.inventory;
-                return {
-                    name: pickingWSD.name,
-                    palletId: inventory === null || inventory === void 0 ? void 0 : inventory.palletId,
-                    cartonId: inventory === null || inventory === void 0 ? void 0 : inventory.cartonId,
-                    batchId: inventory === null || inventory === void 0 ? void 0 : inventory.batchId,
-                    batchIdRef: inventory === null || inventory === void 0 ? void 0 : inventory.batchIdRef,
-                    product: inventory === null || inventory === void 0 ? void 0 : inventory.product,
-                    qty: inventory === null || inventory === void 0 ? void 0 : inventory.qty,
-                    releaseQty: targetInventory.releaseQty,
-                    pickedQty: targetInventory.pickedQty,
-                    status: pickingWSD.status,
-                    description: pickingWSD.description,
-                    targetName: targetInventory.name,
-                    packingType: inventory === null || inventory === void 0 ? void 0 : inventory.packingType,
-                    packingSize: inventory === null || inventory === void 0 ? void 0 : inventory.packingSize,
-                    expirationDate: inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate,
-                    location: inventory === null || inventory === void 0 ? void 0 : inventory.location,
-                    relatedOrderInv: targetInventory
-                };
-            })
-        };
+            order: {
+                createdAt: 'ASC'
+            },
+            relations: ['releaseGood', 'releaseGood.bizplace', 'releaseGood.bizplace.domain']
+        });
+        if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood) {
+            releaseGoodNo = orderInventoryByBin.releaseGood.name;
+            releaseGood = orderInventoryByBin.releaseGood;
+        }
     }
-};
+    if (!releaseGood)
+        throw new Error(`Couldn't find picking worksheet by order no (${releaseGoodNo})`);
+    const worksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, ['bizplace'], constants_1.WORKSHEET_TYPE.PICKING, releaseGood, tx);
+    const qb = tx.createQueryBuilder(entities_1.WorksheetDetail, 'WSD');
+    qb.leftJoinAndSelect('WSD.targetInventory', 'T_INV')
+        .leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
+        .leftJoinAndSelect('T_INV.inventory', 'INV')
+        .leftJoinAndSelect('T_INV.product', 'PROD')
+        .leftJoinAndSelect('INV.location', 'LOC');
+    if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
+        locationSortingRules.forEach((rule) => {
+            qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
+        });
+    }
+    qb.addOrderBy(`PROD.name`, 'ASC');
+    const worksheetDetails = await qb
+        .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
+        .andWhere('"WSD"."status" != :status', { status: constants_1.WORKSHEET_STATUS.REPLACED })
+        .andWhere('"T_INV"."status" != :t_invstatus', { t_invstatus: sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED })
+        .getMany();
+    return {
+        worksheetInfo: {
+            bizplaceName: releaseGood.bizplace.name,
+            partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
+            startedAt: worksheet.startedAt,
+            refNo: releaseGood.refNo,
+            refNo2: releaseGood.refNo2,
+            releaseGood
+        },
+        worksheetDetailInfos: worksheetDetails.map(async (pickingWSD) => {
+            const targetInventory = pickingWSD.targetInventory;
+            const inventory = targetInventory.inventory;
+            return {
+                name: pickingWSD.name,
+                palletId: inventory === null || inventory === void 0 ? void 0 : inventory.palletId,
+                cartonId: inventory === null || inventory === void 0 ? void 0 : inventory.cartonId,
+                batchId: inventory === null || inventory === void 0 ? void 0 : inventory.batchId,
+                batchIdRef: inventory === null || inventory === void 0 ? void 0 : inventory.batchIdRef,
+                product: inventory === null || inventory === void 0 ? void 0 : inventory.product,
+                qty: inventory === null || inventory === void 0 ? void 0 : inventory.qty,
+                binLocation: (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation) || '',
+                releaseQty: targetInventory.releaseQty,
+                pickedQty: targetInventory.pickedQty,
+                status: pickingWSD.status,
+                description: pickingWSD.description,
+                targetName: targetInventory.name,
+                packingType: inventory === null || inventory === void 0 ? void 0 : inventory.packingType,
+                packingSize: inventory === null || inventory === void 0 ? void 0 : inventory.packingSize,
+                expirationDate: inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate,
+                location: inventory === null || inventory === void 0 ? void 0 : inventory.location,
+                relatedOrderInv: targetInventory
+            };
+        })
+    };
+}
+exports.pickingWorksheet = pickingWorksheet;
 //# sourceMappingURL=picking-worksheet.js.map

package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,2DAAgG;~~AAIhG~~,kDAAqE;AACrE,gDAAmD;AACnD,0CAAwD;AAE3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,oBAAoB,EAAE,EAAE,OAAY;;QAClF,MAAM,EAAE,MAAM,EAAE,~~GAAuB~~,OAAO,CAAC,KAAK,CAAA;~~QACpD~~,MAAM,WAAW,GAAgB,MAAM,~~IAAA~~,~~uBAAa~~,~~EAAC~~,wBAAW,CAAC,CAAC,OAAO,CAAC;~~YACxE~~,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,gCAAgC,EAAE;~~YACvE~~,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,CAAC;~~SAC3C~~,CAAC,CAAA;~~QACF~~,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,aAAa,GAAG,CAAC,CAAA;~~QAEnG~~,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAuB,EAC7C,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,CAAC,EACZ,0BAAc,CAAC,OAAO,EACtB,WAAW,~~CACZ~~,CAAA;~~QAED~~,MAAM,EAAE,GAAwC,~~IAAA~~,~~4BAAkB~~,~~EAAC~~,0BAAe,EAAE,KAAK,CAAC,CAAA;~~QAC1F~~,EAAE,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,OAAO,CAAC;~~aACjD~~,iBAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC;~~aAC3C~~,iBAAiB,CAAC,eAAe,EAAE,MAAM,CAAC;~~aAC1C~~,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAA;~~QAE3C~~,IAAI,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,IAAG,CAAC,EAAE;~~YACpC~~,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAqC,EAAE,EAAE;~~gBACrE~~,EAAE,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;~~YAC~~/D,CAAC,CAAC,CAAA;~~SACH~~;~~QAED~~,MAAM,gBAAgB,GAAsB,MAAM,EAAE;~~aACjD~~,KAAK,CAAC,qCAAqC,EAAE,EAAE,WAAW,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC;~~aAC3E~~,QAAQ,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,4BAAgB,CAAC,QAAQ,EAAE,CAAC;~~aAC5E~~,QAAQ,CAAC,kCAAkC,EAAE,EAAE,WAAW,EAAE,mCAAsB,CAAC,SAAS,EAAE,CAAC;~~aAC~~/F,OAAO,EAAE,CAAA;~~QAEZ~~,OAAO;~~YACL~~,aAAa,EAAE;~~gBACb~~,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;~~gBACvC~~,eAAe,EAAE,MAAA,WAAW,CAAC,QAAQ,0CAAE,MAAM,CAAC,EAAE;~~gBAChD~~,SAAS,EAAE,SAAS,CAAC,SAAS;~~gBAC9B~~,KAAK,EAAE,WAAW,CAAC,KAAK;~~gBACxB~~,MAAM,EAAE,WAAW,CAAC,MAAM;~~gBAC1B~~,WAAW;~~aACZ~~;~~YACD~~,oBAAoB,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,UAA2B,EAAE,EAAE;~~gBAC~~/E,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;~~gBAClE~~,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;~~gBACtD~~,OAAO;~~oBACL~~,IAAI,EAAE,UAAU,CAAC,IAAI;~~oBACrB~~,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;~~oBAC7B~~,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;~~oBAC7B~~,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;~~oBAC3B~~,UAAU,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,UAAU;~~oBACjC~~,OAAO,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO;~~oBAC3B~~,GAAG,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,GAAG;~~oBACnB~~,UAAU,EAAE,eAAe,CAAC,UAAU;~~oBACtC~~,SAAS,EAAE,eAAe,CAAC,SAAS;~~oBACpC~~,MAAM,EAAE,UAAU,CAAC,MAAM;~~oBACzB~~,WAAW,EAAE,UAAU,CAAC,WAAW;~~oBACnC~~,UAAU,EAAE,eAAe,CAAC,IAAI;~~oBAChC~~,WAAW,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW;~~oBACnC~~,WAAW,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW;~~oBACnC~~,cAAc,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,cAAc;~~oBACzC~~,QAAQ,EAAE,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;~~oBAC7B~~,eAAe,EAAE,eAAe;~~iBACjC~~,CAAA;~~YACH~~,CAAC,CAAC;~~SACH~~,CAAA;~~IACH~~,CAAC;~~CACF~~,~~CAAA~~"}
1	+ {"version":3,"file":"picking-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/picking-worksheet.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js CHANGED Viewed

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.recommendLocationLevel1 = exports.recommendPutawayLocationResolver = void 0;
+const typeorm_1 = require("typeorm");
 const setting_base_1 = require("@things-factory/setting-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
-const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.recommendPutawayLocationResolver = {
@@ -54,7 +54,7 @@ async function recommendLocationLevel1(domain, warehouse, optCnt) {
             domain,
             warehouse,
             status: warehouse_base_1.LOCATION_STATUS.EMPTY,
-            type: (0, typeorm_1.Not)((0, typeorm_1.In)([warehouse_base_1.LOCATION_TYPE.BUFFER, warehouse_base_1.LOCATION_TYPE.BIN]))
+            type: (0, typeorm_1.In)([warehouse_base_1.LOCATION_TYPE.SHELF, warehouse_base_1.LOCATION_TYPE.FLOOR]) // should only recommend these types
         },
         order,
         take: optCnt

package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"recommend-putway-location.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/recommend-putway-location.ts"],"names":[],"mappings":";;;~~AACA~~,+DAAsD;AAEtD,mEAAoG;~~AACpG~~,~~qCAAgD;AAChD,~~kDAAqE;AACrE,gDAA8D;AAEjD,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAC5B,CAAO,EACP,EAAE,mBAAmB,EAAE,MAAM,GAAG,CAAC,EAAmD,EACpF,OAAY;QAEZ,MAAM,MAAM,GAAW,OAAO,CAAC,KAAK,CAAC,MAAM,CAAA;QAE3C,MAAM,eAAe,GAAoB,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,OAAO,CACnF,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,EACrC;YACE,SAAS,EAAE,CAAC,WAAW,EAAE,yBAAyB,EAAE,uBAAuB,CAAC;SAC7E,CACF,CAAA;QAED,IAAI,eAAe,CAAC,MAAM,KAAK,4BAAgB,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAA;QAE9G,MAAM,aAAa,GAAkB,eAAe,CAAC,SAAS,CAAC,aAAa,CAAA;QAC5E,MAAM,WAAW,GAAgB,eAAe,CAAC,SAAS,CAAC,WAAW,CAAA;QACtE,IAAI,WAAsB,CAAA;QAC1B,IAAI,aAAa,EAAE;YACjB,WAAW,GAAG,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACnD,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,EAAE,0BAAc,CAAC,SAAS,EAAE;gBAChE,SAAS,EAAE,CAAC,gBAAgB,EAAE,0BAA0B,CAAC;aAC1D,CAAC,CAAA;SACH;aAAM,IAAI,WAAW,EAAE;YACtB,WAAW,GAAG,MAAM,IAAA,uBAAa,EAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBACnD,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,0BAAc,CAAC,gBAAgB,EAAE;gBACrE,SAAS,EAAE,CAAC,gBAAgB,EAAE,0BAA0B,CAAC;aAC1D,CAAC,CAAA;SACH;QACD,MAAM,eAAe,GAAc,WAAW,CAAC,cAAc,CAAC,SAAS,CAAA;QACvE,MAAM,mBAAmB,GAAY,MAAM,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,+BAA+B,EAAE;SACzD,CAAC,CAAA;QACF,MAAM,YAAY,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,KAAK,CAAA;QAE/C,QAAQ,YAAY,EAAE;YACpB,KAAK,SAAS;gBACZ,OAAO,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,CAAA;YAEjE;gBACE,OAAO,uBAAuB,CAAC,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,CAAA;SAClE;IACH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,uBAAuB,CAC3C,MAAc,EACd,SAAoB,EACpB,MAAc;IAEd,MAAM,YAAY,GAAY,MAAM,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,OAAO,CAAC;QACjE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,0BAA0B,EAAE;KACpD,CAAC,CAAA;IACF,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK;QAAE,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;IAE/D,OAAO,MAAM,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAC,IAAI,CAAC;QACxC,KAAK,EAAE;YACL,MAAM;YACN,SAAS;YACT,MAAM,EAAE,gCAAe,CAAC,KAAK;YAC7B,IAAI,EAAE,IAAA,~~aAAG,EAAC,IAAA,~~YAAE,EAAC,CAAC,8BAAa,CAAC,~~MAAM~~,EAAE,8BAAa,CAAC,~~GAAG~~,CAAC,CAAC,CAAC;~~SACzD~~;QACD,KAAK;QACL,IAAI,EAAE,MAAM;KACb,CAAC,CAAA;AACJ,CAAC;AArBD,0DAqBC"}
1	+ {"version":3,"file":"recommend-putway-location.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/recommend-putway-location.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js CHANGED Viewed

@@ -31,7 +31,7 @@ exports.unloadedInventories = {
         const returnOrder = foundWorksheetDetails[0].worksheet.returnOrder;
         const customerBizplace = foundWorksheetDetails[0].bizplace;
         if (arrivalNotice) {
-            return await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({
+            let foundInv = await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({
                 where: {
                     domain,
                     bizplace: customerBizplace,
@@ -43,6 +43,11 @@ exports.unloadedInventories = {
                 },
                 relations: ['reusablePallet', 'product', 'bizplace']
             });
+            const items = foundInv.map((inv) => {
+                const expirationDate = inv.expirationDate ? new Date(inv.expirationDate) : null;
+                return Object.assign(Object.assign({}, inv), { expirationDate: expirationDate });
+            });
+            return items;
         }
         if (returnOrder) {
             return await (0, typeorm_1.getRepository)(warehouse_base_1.Inventory).find({

package/dist-server/graphql/resolvers/worksheet/unloaded-inventories.js.map CHANGED Viewed

	@@ -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,~~OAAO~~,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,IAAI,CAAC;~~gBACzC~~,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,gBAAgB;oBAC1B,UAAU,EAAE,aAAa,CAAC,EAAE;oBAC5B,OAAO,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;oBACxE,QAAQ,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;oBAC/E,cAAc,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;oBAC1E,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,iCAAgB,CAAC,QAAQ,EAAE,iCAAgB,CAAC,OAAO,CAAC,CAAC;iBAClE;gBACD,SAAS,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,UAAU,CAAC;aACrD,CAAC,CAAA;~~SACH~~;QAED,IAAI,WAAW,EAAE;YACf,OAAO,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,IAAI,CAAC;gBACzC,KAAK,EAAE;oBACL,MAAM;oBACN,QAAQ,EAAE,gBAAgB;oBAC1B,UAAU,EAAE,WAAW,CAAC,EAAE;oBAC1B,OAAO,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;oBAC1E,QAAQ,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;oBAC/E,gBAAgB,EAAE,IAAA,YAAE,EAAC,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;oBAC9E,MAAM,EAAE,IAAA,YAAE,EAAC,CAAC,iCAAgB,CAAC,QAAQ,EAAE,iCAAgB,CAAC,OAAO,CAAC,CAAC;iBAClE;gBACD,SAAS,EAAE,CAAC,gBAAgB,EAAE,SAAS,EAAE,UAAU,CAAC;aACrD,CAAC,CAAA;SACH;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"unloaded-inventories.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloaded-inventories.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/unloading-return-worksheet.js CHANGED Viewed

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unloadingReturnWorksheetResolver = void 0;
 const typeorm_1 = require("typeorm");
-const utils_1 = require("../../../utils");
 const sales_base_1 = require("@things-factory/sales-base");
 const constants_1 = require("../../../constants");
+const utils_1 = require("../../../utils");
 exports.unloadingReturnWorksheetResolver = {
     async unloadingReturnWorksheet(_, { returnOrderNo }, context) {
         var _a;
@@ -50,7 +50,7 @@ exports.unloadingReturnWorksheetResolver = {
                     description: productWSD.description,
                     targetName: targetInventory.name,
                     packingType: targetInventory.packingType,
-                    packingSize: targetInventory.packingSize,
+                    packingSize: targetInventory.inventory.packingSize,
                     palletQty: targetInventory.palletQty,
                     actualPalletQty: targetInventory.actualPalletQty,
                     packQty: targetInventory.returnQty,

package/dist-server/graphql/resolvers/worksheet/unloading-return-worksheet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"unloading-return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-return-worksheet.ts"],"names":[],"mappings":";;;~~AAEA~~,qCAAuC;~~AACvC~~,~~0CAAwD;AACxD,~~2DAAwE;~~AACxE~~,kDAAmD;~~AAGtC~~,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;;QACpE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SAC1F,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAEhE,MAAM,gBAAgB,GAAa,WAAW,CAAC,QAAQ,CAAA;QACvD,MAAM,qBAAqB,GAAW,MAAA,WAAW,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAE1E,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,gBAAgB,EAChB;YACE,UAAU;YACV,iBAAiB;YACjB,gBAAgB;YAChB,0BAA0B;YAC1B,aAAa;YACb,kBAAkB;YAClB,kCAAkC;YAClC,0CAA0C;YAC1C,4CAA4C;YAC5C,SAAS;YACT,SAAS;SACV,EACD,0BAAc,CAAC,gBAAgB,EAC/B,WAAW,CACZ,CAAA;QAED,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,gBAAgB,CAAC,IAAI;gBACnC,eAAe,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,CAAC,EAAE;gBAC5C,uBAAuB,EAAE,qBAAqB,CAAC,EAAE;gBACjD,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,IAAI;gBAC7C,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,oBAAoB,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAA2B,EAAE,EAAE;gBACnF,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;gBAElE,OAAO;oBACL,EAAE,EAAE,UAAU,CAAC,EAAE;oBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,QAAQ,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ;oBAC5C,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;oBAChC,WAAW,EAAE,eAAe,CAAC,WAAW;oBACxC,WAAW,EAAE,eAAe,CAAC,WAAW;~~oBACxC~~,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,eAAe,EAAE,eAAe,CAAC,eAAe;oBAChD,OAAO,EAAE,eAAe,CAAC,SAAS;oBAClC,aAAa,EAAE,eAAe,CAAC,aAAa;oBAC5C,MAAM,EAAE,eAAe,CAAC,MAAM;oBAC9B,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"unloading-return-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/unloading-return-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAGvC,2DAAwE;AAGxE,kDAAmD;AAEnD,0CAAwD;AAE3C,QAAA,gCAAgC,GAAG;IAC9C,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;;QACpE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;YACtC,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SAC1F,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAEhE,MAAM,gBAAgB,GAAa,WAAW,CAAC,QAAQ,CAAA;QACvD,MAAM,qBAAqB,GAAW,MAAA,WAAW,CAAC,QAAQ,0CAAE,OAAO,CAAC,MAAM,CAAA;QAE1E,MAAM,SAAS,GAAc,MAAM,IAAA,+BAAuB,EACxD,MAAM,EACN,gBAAgB,EAChB;YACE,UAAU;YACV,iBAAiB;YACjB,gBAAgB;YAChB,0BAA0B;YAC1B,aAAa;YACb,kBAAkB;YAClB,kCAAkC;YAClC,0CAA0C;YAC1C,4CAA4C;YAC5C,SAAS;YACT,SAAS;SACV,EACD,0BAAc,CAAC,gBAAgB,EAC/B,WAAW,CACZ,CAAA;QAED,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,gBAAgB,CAAC,IAAI;gBACnC,eAAe,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,MAAM,CAAC,EAAE;gBAC5C,uBAAuB,EAAE,qBAAqB,CAAC,EAAE;gBACjD,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,IAAI;gBAC7C,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB;YACD,oBAAoB,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,UAA2B,EAAE,EAAE;gBACnF,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;gBAElE,OAAO;oBACL,EAAE,EAAE,UAAU,CAAC,EAAE;oBACjB,IAAI,EAAE,UAAU,CAAC,IAAI;oBACrB,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,QAAQ,EAAE,eAAe,CAAC,SAAS,CAAC,QAAQ;oBAC5C,OAAO,EAAE,eAAe,CAAC,OAAO;oBAChC,WAAW,EAAE,UAAU,CAAC,WAAW;oBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;oBAChC,WAAW,EAAE,eAAe,CAAC,WAAW;oBACxC,WAAW,EAAE,eAAe,CAAC,SAAS,CAAC,WAAW;oBAClD,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,eAAe,EAAE,eAAe,CAAC,eAAe;oBAChD,OAAO,EAAE,eAAe,CAAC,SAAS;oBAClC,aAAa,EAAE,eAAe,CAAC,aAAa;oBAC5C,MAAM,EAAE,eAAe,CAAC,MAAM;oBAC9B,SAAS,EAAE,eAAe,CAAC,SAAS;oBACpC,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,MAAM,EAAE,UAAU,CAAC,MAAM;iBAC1B,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}