@things-factory/worksheet-base 5.0.0-alpha.5 → 5.0.0-alpha.52

package/dist-server/graphql/resolvers/worksheet/cancel-draft-release-order.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cancelDraftReleaseOrder = void 0;
+const sales_base_1 = require("@things-factory/sales-base");
+exports.cancelDraftReleaseOrder = {
+    async cancelDraftReleaseOrder(_, { name }, context) {
+        const { tx, domain, user } = context.state;
+        const foundDRO = await tx.getRepository(sales_base_1.DraftReleaseGood).findOne({
+            where: { domain, name }
+        });
+        if (foundDRO) {
+            await tx.getRepository(sales_base_1.DraftReleaseGood).save(Object.assign(Object.assign({}, foundDRO), { status: sales_base_1.ORDER_STATUS.CANCELLED, updater: user }));
+        }
+        return;
+    }
+};
+//# sourceMappingURL=cancel-draft-release-order.js.map

package/dist-server/graphql/resolvers/worksheet/cancel-draft-release-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cancel-draft-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cancel-draft-release-order.ts"],"names":[],"mappings":";;;AAGA,2DAGmC;AAGtB,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QAC1D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,QAAQ,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,6BAAgB,CAAC,CAAC,OAAO,CAAC;YAClF,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;SACxB,CAAC,CAAA;QAEF,IAAI,QAAQ,EAAE;YACZ,MAAM,EAAE,CAAC,aAAa,CAAC,6BAAgB,CAAC,CAAC,IAAI,iCACxC,QAAQ,KACX,MAAM,EAAE,yBAAY,CAAC,SAAS,EAC9B,OAAO,EAAE,IAAI,IACb,CAAA;SACH;QACD,OAAM;IACR,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js

@@ -46,7 +46,9 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
             'targetInventory.inventory.product.productDetails',
             'targetInventory.inventory.product.productDetails.childProductDetail',
             'targetInventory.inventory.bizplace',
+            'targetInventory.inventory.domain',
             'targetInventory.inventory.bizplace.domain',
+            'targetInventory.inventory.warehouse',
             'targetInventory.inventory.location',
             'targetInventory.inspectedLocation',
             'targetInventory.inspectedLocation.warehouse'
@@ -55,10 +57,11 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
     for (let worksheetDetail of worksheetDetails) {
         const targetInventory = worksheetDetail.targetInventory;
         let inventory = targetInventory.inventory;
-        const transactQty = targetInventory.inspectedQty - inventory.qty;
-        const transactUomValue = targetInventory.inspectedUomValue - inventory.uomValue;
+        let transactQty = targetInventory.inspectedQty - inventory.qty;
+        let transactUomValue = targetInventory.inspectedUomValue - inventory.uomValue;
         const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
-            where: { domain: inventory.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE }
+            where: { domain: inventory.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE },
+            relations: ['domain']
         });
         if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.MISSING) {
             // create STORED, CC_ADJUSTMENT history
@@ -102,8 +105,13 @@ async function cycleCountAdjustment(tx, domain, user, cycleCountNo) {
             const prevLocationId = inventory.location.id;
             if (targetInventory.inspectedBatchNo !== inventory.batchId) {
                 // generate TERMINATED, ADJUSTMENT history
+                const { qty, uomValue } = inventory;
                 inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
-                await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -transactQty, -transactUomValue, user, tx);
+                inventory.qty = 0;
+                inventory.uomValue = 0;
+                await (0, utils_1.generateInventoryHistory)(inventory, cycleCount, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.CC_ADJUSTMENT, -qty, -uomValue, user, tx);
+                transactQty = targetInventory.inspectedQty;
+                transactUomValue = targetInventory.inspectedUomValue;
             }
             inventory.batchId = targetInventory.inspectedBatchNo;
             inventory.qty = targetInventory.inspectedQty;

package/dist-server/graphql/resolvers/worksheet/cycle-count-adjustment.js.map

@@ -1 +1 @@
-{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cycle-count-adjustment.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/cycle-count-adjustment.ts"],"names":[],"mappings":";;;AAAA,qCAA2C;AAG3C,qFAAwF;AACxF,2DAAiH;AAEjH,mEAAkH;AAElH,kDAAqE;AACrE,sDAA4D;AAC5D,gDAA8D;AAC9D,0CAA+E;AAElE,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,YAAY,EAAE,EAAE,OAAY;QAC/D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAA;IAC5D,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,YAAoB;IAEpB,qBAAqB;IACrB,MAAM,UAAU,GAAmB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,OAAO,CAAC;QAChF,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,yBAAY,CAAC,cAAc;SACpC;KACF,CAAC,CAAA;IAEF,IAAI,SAAS,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACnE,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,0BAAc,CAAC,WAAW,EAAE,0BAAc,CAAC,mBAAmB,CAAC,CAAC;YAC1E,cAAc,EAAE,UAAU;SAC3B;KACF,CAAC,CAAA;IAEF,wCAAwC;IACxC,MAAM,gBAAgB,GAAsB,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;QACvF,KAAK,EAAE;YACL,MAAM;YACN,SAAS;YACT,IAAI,EAAE,IAAA,YAAE,EAAC,CAAC,0BAAc,CAAC,WAAW,EAAE,0BAAc,CAAC,mBAAmB,CAAC,CAAC;YAC1E,MAAM,EAAE,4BAAgB,CAAC,SAAS;SACnC;QACD,SAAS,EAAE;YACT,iBAAiB;YACjB,2BAA2B;YAC3B,mCAAmC;YACnC,kDAAkD;YAClD,qEAAqE;YACrE,oCAAoC;YACpC,kCAAkC;YAClC,2CAA2C;YAC3C,qCAAqC;YACrC,oCAAoC;YACpC,mCAAmC;YACnC,6CAA6C;SAC9C;KACF,CAAC,CAAA;IAEF,KAAK,IAAI,eAAe,IAAI,gBAAgB,EAAE;QAC5C,MAAM,eAAe,GAAmB,eAAe,CAAC,eAAe,CAAA;QACvE,IAAI,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;QAEpD,IAAI,WAAW,GAAW,eAAe,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,CAAA;QACtE,IAAI,gBAAgB,GAAW,eAAe,CAAC,iBAAiB,GAAG,SAAS,CAAC,QAAQ,CAAA;QAErF,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,qCAAW,CAAC,CAAC,OAAO,CAAC;YAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE;YAC9E,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;QAEF,IAAI,eAAe,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO,EAAE;YAC7D,uCAAuC;YACvC,MAAM,IAAA,gCAAwB,EAC5B,SAAS,EACT,UAAU,EACV,2CAA0B,CAAC,aAAa,EACxC,CAAC,SAAS,CAAC,GAAG,EACd,CAAC,SAAS,CAAC,QAAQ,EACnB,IAAI,EACJ,EAAE,CACH,CAAA;YAED,SAAS,CAAC,GAAG,GAAG,CAAC,CAAA;YACjB,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAA;YACtB,SAAS,CAAC,SAAS,GAAG,CAAC,CAAA;YACvB,SAAS,CAAC,cAAc,GAAG,CAAC,CAAA;YAC5B,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;YACxB,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;YAC9C,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAE7D,wCAAwC;YACxC,MAAM,IAAA,gCAAwB,EAAC,SAAS,EAAE,UAAU,EAAE,2CAA0B,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAE5G,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;aACrE;SACF;aAAM,IAAI,eAAe,CAAC,YAAY,IAAI,CAAC,EAAE;YAC5C,uCAAuC;YACvC,MAAM,IAAA,gCAAwB,EAC5B,SAAS,EACT,UAAU,EACV,2CAA0B,CAAC,aAAa,EACxC,WAAW,EACX,gBAAgB,EAChB,IAAI,EACJ,EAAE,CACH,CAAA;YAED,6CAA6C;YAC7C,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC,gBAAgB,CAAA;YACpD,SAAS,CAAC,GAAG,GAAG,eAAe,CAAC,YAAY,CAAA;YAC5C,SAAS,CAAC,SAAS,GAAG,CAAC,CAAA;YACvB,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,iBAAiB,CAAA;YACtD,SAAS,CAAC,cAAc,GAAG,CAAC,CAAA;YAC5B,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,iBAAiB,CAAA;YACtD,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,iBAAiB,CAAC,SAAS,CAAA;YACjE,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;YAC9C,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;YACxB,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAE7D,wCAAwC;YACxC,MAAM,IAAA,gCAAwB,EAAC,SAAS,EAAE,UAAU,EAAE,2CAA0B,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAE5G,IAAI,WAAW,EAAE;gBACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBAC1F,MAAM,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;aACrE;SACF;aAAM;YACL,MAAM,cAAc,GAAW,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAA;YAEpD,IAAI,eAAe,CAAC,gBAAgB,KAAK,SAAS,CAAC,OAAO,EAAE;gBAC1D,0CAA0C;gBAC1C,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAsC,SAAS,CAAA;gBACtE,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,UAAU,CAAA;gBAC9C,SAAS,CAAC,GAAG,GAAG,CAAC,CAAA;gBACjB,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAA;gBAEtB,MAAM,IAAA,gCAAwB,EAC5B,SAAS,EACT,UAAU,EACV,2CAA0B,CAAC,aAAa,EACxC,CAAC,GAAG,EACJ,CAAC,QAAQ,EACT,IAAI,EACJ,EAAE,CACH,CAAA;gBAED,WAAW,GAAG,eAAe,CAAC,YAAY,CAAA;gBAC1C,gBAAgB,GAAG,eAAe,CAAC,iBAAiB,CAAA;aACrD;YAED,SAAS,CAAC,OAAO,GAAG,eAAe,CAAC,gBAAgB,CAAA;YACpD,SAAS,CAAC,GAAG,GAAG,eAAe,CAAC,YAAY,CAAA;YAC5C,SAAS,CAAC,SAAS,GAAG,CAAC,CAAA;YACvB,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,iBAAiB,CAAA;YACtD,SAAS,CAAC,cAAc,GAAG,CAAC,CAAA;YAC5B,SAAS,CAAC,QAAQ,GAAG,eAAe,CAAC,iBAAiB,CAAA;YACtD,SAAS,CAAC,SAAS,GAAG,eAAe,CAAC,iBAAiB,CAAC,SAAS,CAAA;YACjE,SAAS,CAAC,MAAM,GAAG,iCAAgB,CAAC,MAAM,CAAA;YAC1C,SAAS,CAAC,OAAO,GAAG,IAAI,CAAA;YACxB,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;YAE7D,IAAI,cAAc,KAAK,eAAe,CAAC,iBAAiB,CAAC,EAAE,EAAE;gBAC3D,MAAM,YAAY,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;gBACvF,MAAM,IAAA,4BAAoB,EAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;aAC3D;YAED,MAAM,IAAA,gCAAwB,EAC5B,SAAS,EACT,UAAU,EACV,2CAA0B,CAAC,aAAa,EACxC,WAAW,EACX,gBAAgB,EAChB,IAAI,EACJ,EAAE,CACH,CAAA;SACF;QAED,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,sBAAsB,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;SACrE;QAED,eAAe,CAAC,MAAM,GAAG,mCAAsB,CAAC,UAAU,CAAA;QAC1D,eAAe,CAAC,OAAO,GAAG,IAAI,CAAA;QAC9B,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QAE5D,eAAe,CAAC,MAAM,GAAG,4BAAgB,CAAC,QAAQ,CAAA;QAClD,eAAe,CAAC,OAAO,GAAG,IAAI,CAAA;QAC9B,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAe,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;KAC9D;IAED,SAAS,CAAC,MAAM,GAAG,4BAAgB,CAAC,IAAI,CAAA;IACxC,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;IAEjD,oCAAoC;IACpC,UAAU,CAAC,MAAM,GAAG,yBAAY,CAAC,IAAI,CAAA;IACrC,UAAU,CAAC,OAAO,GAAG,IAAI,CAAA;IACzB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAc,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;AACzD,CAAC;AA7LD,oDA6LC"}

package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findReleaseOrdersByTaskNoResolver = void 0;
 const sales_base_1 = require("@things-factory/sales-base");
 const shell_1 = require("@things-factory/shell");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.findReleaseOrdersByTaskNoResolver = {
@@ -11,6 +12,34 @@ exports.findReleaseOrdersByTaskNoResolver = {
         let task = await tx.getRepository(entities_1.Worksheet).findOne({
             where: { taskNo, status: constants_1.WORKSHEET_STATUS.EXECUTING, type: constants_1.WORKSHEET_TYPE.SORTING }
         });
+        // Find Task based on Bin
+        if (!task) {
+            const binLocation = await tx.getRepository(warehouse_base_1.Location).findOne({
+                where: { domain, name: taskNo }
+            });
+            const qb = tx.getRepository(sales_base_1.OrderInventory).createQueryBuilder('orderInventory');
+            qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
+                .innerJoinAndSelect('worksheets', 'ws', `orderInventory.ref_worksheet_id = ws.id AND ws.type = 'BATCH_PICKING'`)
+                .innerJoinAndSelect('worksheets', 'ws2', `ws2.task_no = ws.task_no AND ws2.type = 'SORTING'`)
+                .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
+                .innerJoinAndSelect('bizplace.domain', 'domain')
+                .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
+                .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
+                orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.SORTING]
+            })
+                .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
+                .andWhere('releaseGood.status = :status', { status: sales_base_1.ORDER_STATUS.SORTING });
+            const orderInventoryByBin = await qb.getRawOne();
+            if (orderInventoryByBin === null || orderInventoryByBin === void 0 ? void 0 : orderInventoryByBin.releaseGood_id) {
+                taskNo = orderInventoryByBin.ws_task_no;
+                task = await tx.getRepository(entities_1.Worksheet).findOne({
+                    where: { taskNo, status: constants_1.WORKSHEET_STATUS.EXECUTING, type: constants_1.WORKSHEET_TYPE.SORTING }
+                });
+            }
+            else {
+                throw new Error(`Bin do not have any batch picking order.`);
+            }
+        }
         if (!task)
             throw new Error('Unable to find task no.');
         const qb = tx
@@ -32,7 +61,7 @@ exports.findReleaseOrdersByTaskNoResolver = {
             .addGroupBy('rg.name')
             .addGroupBy('rg.status');
         const releaseGoods = await qb.getRawMany();
-        return releaseGoods;
+        return { releaseGoods, taskNo };
     }
 };
 //# sourceMappingURL=find-release-orders-by-task-no.js.map

package/dist-server/graphql/resolvers/worksheet/find-release-orders-by-task-no.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts"],"names":[],"mappings":";;;AAEA,2DAImC;AACnC,iDAA8C;AAE9C,kDAAqE;AACrE,gDAA0G;AAE7F,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,EAAE,OAAY;QAC9D,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAe,CAAC,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,4BAAgB,CAAC,SAAS,EAAE,IAAI,EAAE,0BAAc,CAAC,OAAO,EAAE;SACpF,CAAC,CAAA;QACF,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;QAErD,MAAM,EAAE,GAAwC,EAAE;aAC/C,aAAa,CAAC,oBAAe,CAAC;aAC9B,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,aAAa,CAAC;aACrB,SAAS,CAAC,iBAAiB,CAAC;aAC5B,SAAS,CAAC,qBAAqB,CAAC;aAChC,SAAS,CAAC,cAAM,EAAE,QAAQ,EAAE,0BAA0B,CAAC;aACvD,SAAS,CAAC,0BAAqB,EAAE,KAAK,EAAE,0BAA0B,CAAC;aACnE,SAAS,CAAC,2BAAoB,EAAE,IAAI,EAAE,iCAAiC,CAAC;aACxE,SAAS,CAAC,wBAAiB,EAAE,IAAI,EAAE,4BAA4B,CAAC;aAChE,KAAK,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;aACvD,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aACnD,QAAQ,CAAC,0BAA0B,EAAE,EAAE,aAAa,EAAE,0BAAc,CAAC,OAAO,EAAE,CAAC;aAC/E,QAAQ,CAAC,8BAA8B,EAAE,EAAE,eAAe,EAAE,4BAAgB,CAAC,SAAS,EAAE,CAAC;aACzF,QAAQ,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,yBAAY,CAAC,OAAO,EAAE,CAAC;aACrE,OAAO,CAAC,OAAO,CAAC;aAChB,UAAU,CAAC,SAAS,CAAC;aACrB,UAAU,CAAC,WAAW,CAAC,CAAA;QAE1B,MAAM,YAAY,GAAwB,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;QAC/D,OAAO,YAAY,CAAA;IACrB,CAAC;CACF,CAAA"}
+{"version":3,"file":"find-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-release-orders-by-task-no.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js

@@ -1,36 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateArrivalNoticeWorksheetResolver = void 0;
+exports.generateArrivalNoticeWorksheet = exports.generateArrivalNoticeWorksheetResolver = void 0;
 const sales_base_1 = require("@things-factory/sales-base");
 const controllers_1 = require("../../../../controllers");
 const entities_1 = require("../../../../entities");
 exports.generateArrivalNoticeWorksheetResolver = {
     async generateArrivalNoticeWorksheet(_, { arrivalNoticeNo, bufferLocation }, context) {
-        var _a;
         const { tx, domain, user } = context.state;
-        let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
-        if (!((_a = unloadingWorksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id)) {
-            unloadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-                where: unloadingWorksheet,
-                relations: ['arrivalNotice']
-            });
-        }
-        let arrivalNotice = unloadingWorksheet.arrivalNotice;
-        const crossDocking = unloadingWorksheet.arrivalNotice.crossDocking;
-        if (crossDocking) {
-            arrivalNotice = await tx
-                .getRepository(sales_base_1.ArrivalNotice)
-                .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] });
-            const releaseGoodNo = arrivalNotice.releaseGood.name;
-            const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
-            await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo);
-        }
-        const vasWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-            where: { domain: domain, arrivalNotice }
-        });
-        return { unloadingWorksheet, vasWorksheet };
+        return await generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
     }
 };
+async function generateArrivalNoticeWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation) {
+    var _a;
+    let unloadingWorksheet = await generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation);
+    if (!((_a = unloadingWorksheet.arrivalNotice) === null || _a === void 0 ? void 0 : _a.id)) {
+        unloadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+            where: unloadingWorksheet,
+            relations: ['arrivalNotice']
+        });
+    }
+    let arrivalNotice = unloadingWorksheet.arrivalNotice;
+    const crossDocking = unloadingWorksheet.arrivalNotice.crossDocking;
+    if (crossDocking) {
+        arrivalNotice = await tx
+            .getRepository(sales_base_1.ArrivalNotice)
+            .findOne({ where: { domain: domain, name: arrivalNoticeNo }, relations: ['releaseGood'] });
+        const releaseGoodNo = arrivalNotice.releaseGood.name;
+        const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
+        await pickingWSCtrl.generatePickingWorksheet(releaseGoodNo);
+    }
+    const vasWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+        where: { domain: domain, arrivalNotice }
+    });
+    return { unloadingWorksheet, vasWorksheet };
+}
+exports.generateArrivalNoticeWorksheet = generateArrivalNoticeWorksheet;
 async function generateUnloadingWorksheet(tx, domain, user, arrivalNoticeNo, bufferLocation) {
     const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
     return await worksheetController.generateUnloadingWorksheet(arrivalNoticeNo, bufferLocation.id);

package/dist-server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-arrival-notice-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts"],"names":[],"mappings":";;;AACA,2DAA0D;AAG1D,yDAAkG;AAClG,mDAAgD;AAEnC,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,OAAY;;QAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,IAAI,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;QAE5G,IAAI,CAAC,CAAA,MAAA,kBAAkB,CAAC,aAAa,0CAAE,EAAE,CAAA,EAAE;YACzC,kBAAkB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;gBAC7D,KAAK,EAAE,kBAAkB;gBACzB,SAAS,EAAE,CAAC,eAAe,CAAC;aAC7B,CAAC,CAAA;SACH;QAED,IAAI,aAAa,GAAkB,kBAAkB,CAAC,aAAa,CAAA;QACnE,MAAM,YAAY,GAAY,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAA;QAE3E,IAAI,YAAY,EAAE;YAChB,aAAa,GAAG,MAAM,EAAE;iBACrB,aAAa,CAAC,0BAAa,CAAC;iBAC5B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;YAE5F,MAAM,aAAa,GAAW,aAAa,CAAC,WAAW,CAAC,IAAI,CAAA;YAC5D,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;SAC5D;QAED,MAAM,YAAY,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;SACzC,CAAC,CAAA;QAEF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAA;IAC7C,CAAC;CACF,CAAA;AAED,KAAK,UAAU,0BAA0B,CACvC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;IAE9B,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;AACjG,CAAC"}
+{"version":3,"file":"generate-arrival-notice-worksheet.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/generate-worksheet/generate-arrival-notice-worksheet.ts"],"names":[],"mappings":";;;AACA,2DAA0D;AAG1D,yDAAkG;AAClG,mDAAgD;AAEnC,QAAA,sCAAsC,GAAG;IACpD,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,cAAc,EAAE,EAAE,OAAY;QAC5F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,8BAA8B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;IAChG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,8BAA8B,CAClD,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;;IAE9B,IAAI,kBAAkB,GAAG,MAAM,0BAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,cAAc,CAAC,CAAA;IAE5G,IAAI,CAAC,CAAA,MAAA,kBAAkB,CAAC,aAAa,0CAAE,EAAE,CAAA,EAAE;QACzC,kBAAkB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,CAAC,eAAe,CAAC;SAC7B,CAAC,CAAA;KACH;IAED,IAAI,aAAa,GAAkB,kBAAkB,CAAC,aAAa,CAAA;IACnE,MAAM,YAAY,GAAY,kBAAkB,CAAC,aAAa,CAAC,YAAY,CAAA;IAE3E,IAAI,YAAY,EAAE;QAChB,aAAa,GAAG,MAAM,EAAE;aACrB,aAAa,CAAC,0BAAa,CAAC;aAC5B,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,SAAS,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC,CAAA;QAE5F,MAAM,aAAa,GAAW,aAAa,CAAC,WAAW,CAAC,IAAI,CAAA;QAC5D,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;KAC5D;IAED,MAAM,YAAY,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;QACxE,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE;KACzC,CAAC,CAAA;IAEF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,CAAA;AAC7C,CAAC;AAlCD,wEAkCC;AAED,KAAK,UAAU,0BAA0B,CACvC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,eAAuB,EACvB,cAA8B;IAE9B,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,eAAe,EAAE,cAAc,CAAC,EAAE,CAAC,CAAA;AACjG,CAAC"}

package/dist-server/graphql/resolvers/worksheet/index.js

@@ -25,6 +25,7 @@ const packing_1 = require("./packing");
 const packing_worksheet_1 = require("./packing-worksheet");
 const palletizing_pallets_1 = require("./palletizing-pallets");
 const pending_cancellation_release_order_1 = require("./pending-cancellation-release-order");
+const cancel_draft_release_order_1 = require("./cancel-draft-release-order");
 const picking_1 = require("./picking");
 const picking_worksheet_1 = require("./picking-worksheet");
 const my_picking_assignment_status_1 = require("./picking/my-picking-assignment-status");
@@ -59,5 +60,5 @@ const worksheet_by_order_no_1 = require("./worksheet-by-order-no");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
 const worksheets_1 = require("./worksheets");
 exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, worksheets_1.worksheetsResolver), worksheet_1.worksheetResolver), unloading_worksheet_1.unloadingWorksheetResolver), unloading_return_worksheet_1.unloadingReturnWorksheetResolver), delivery_order_by_worksheet_1.deliveryOrderByWorksheetResolver), packing_worksheet_1.packingWorksheetResolver), putaway_worksheet_1.putawayWorksheetResolver), putaway_returning_worksheet_1.putawayReturningWorksheetResolver), return_worksheet_1.returnWorksheetResolver), picking_worksheet_1.pickingWorksheetResolver), cycle_count_worksheet_1.cycleCountWorksheetResolver), vas_worksheet_1.vasWorksheetResolver), loading_worksheet_1.loadingWorksheetResolver), unloaded_inventories_1.unloadedInventories), unloaded_inventories_by_reusable_pallet_1.unloadedInventoriesByReusablePallet), loaded_inventories_1.loadedInventories), vas_candidates_1.vasCandidatesResolver), inventories_by_pallet_1.inventoriesByPalletResolver), batch_picking_worksheet_1.batchPickingWorksheetResolver), check_stock_take_current_location_1.checkStockTakeCurrentLocationResolver), check_inventory_release_1.checkInventoryReleaseResolver), vas_transactions_1.checkRelabelableResolver), having_vas_1.havingVasResolver), worksheet_by_order_no_1.worksheetByOrderNoResolver), worksheet_with_pagination_1.worksheetWithPaginationResolver), not_tally_target_inventories_1.notTallyTargetInventoriesResolver), vas_inventories_1.vasInventories), picking_assignment_status_by_user_1.pickingAssignmentStatusByUsersResolver), my_picking_assignment_status_1.myPickingAssignmentStatusResolver), recommend_putway_location_1.recommendPutawayLocationResolver), sorting_worksheet_1.sortingWorksheetResolver), find_release_orders_by_task_no_1.findReleaseOrdersByTaskNoResolver);
-exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_worksheet_1.Mutations), unloading_1.Mutations), sorting_1.Mutations), putaway_1.Mutations), putaway_return_1.Mutations), vas_1.Mutations), picking_1.Mutations), packing_1.Mutations), loading_1.Mutations), returning_1.Mutations), unloading_return_1.Mutations), inspecting_1.Mutations), update_worksheet_1.updateWorksheet), create_worksheet_1.createWorksheet), cycle_count_adjustment_1.cycleCountAdjustmentResolver), delete_worksheet_1.deleteWorksheet), transfer_1.transfer), proceed_extra_products_1.proceedExtraProductsResolver), replace_picking_pallets_1.replacePickingPalletsResolver), pending_cancellation_release_order_1.pendingCancellationReleaseOrder), confirm_cancellation_release_order_1.confirmCancellationReleaseOrder), reject_cancellation_release_order_1.rejectCancellationReleaseOrder), vas_transactions_1.repalletizingResolver), vas_transactions_1.undoRepalletizingResolver), vas_transactions_1.repackagingResolver), vas_transactions_1.undoRepackagingResolver), vas_transactions_1.relabelingResolver), vas_transactions_1.undoRelabelingResolver), cross_dock_picking_1.crossDockPickingResolver), vas_transactions_1.unpackingResolver), palletizing_pallets_1.palletizingPallets), fetch_sellercraft_airway_bill_1.fetchSellercraftAirwayBillResolver);
+exports.Mutation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, generate_worksheet_1.Mutations), unloading_1.Mutations), sorting_1.Mutations), putaway_1.Mutations), putaway_return_1.Mutations), vas_1.Mutations), picking_1.Mutations), packing_1.Mutations), loading_1.Mutations), returning_1.Mutations), unloading_return_1.Mutations), inspecting_1.Mutations), update_worksheet_1.updateWorksheet), create_worksheet_1.createWorksheet), cycle_count_adjustment_1.cycleCountAdjustmentResolver), delete_worksheet_1.deleteWorksheet), transfer_1.transfer), proceed_extra_products_1.proceedExtraProductsResolver), replace_picking_pallets_1.replacePickingPalletsResolver), pending_cancellation_release_order_1.pendingCancellationReleaseOrder), confirm_cancellation_release_order_1.confirmCancellationReleaseOrder), reject_cancellation_release_order_1.rejectCancellationReleaseOrder), vas_transactions_1.repalletizingResolver), vas_transactions_1.undoRepalletizingResolver), vas_transactions_1.repackagingResolver), vas_transactions_1.undoRepackagingResolver), vas_transactions_1.relabelingResolver), vas_transactions_1.undoRelabelingResolver), cross_dock_picking_1.crossDockPickingResolver), vas_transactions_1.unpackingResolver), palletizing_pallets_1.palletizingPallets), fetch_sellercraft_airway_bill_1.fetchSellercraftAirwayBillResolver), cancel_draft_release_order_1.cancelDraftReleaseOrder);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,mEAAqE;AACrE,yDAAoD;AACpD,+EAAgF;AAChF,mFAAoF;AACpF,qFAAoF;AACpF,6DAA8E;AAC9E,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,2FAAoF;AACpF,uEAAyE;AACzE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;AAEpC,QAAA,KAAK,ucACb,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,mDAA2B,GAC3B,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,kEAAiC,EACrC;AAEY,QAAA,QAAQ,ucAChB,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,kEAAkC,EACtC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,uEAAyE;AACzE,uEAAyE;AACzE,2FAA2F;AAC3F,6FAAsF;AACtF,yDAAoD;AACpD,6DAA+D;AAC/D,qEAAuE;AACvE,mEAAqE;AACrE,yDAAoD;AACpD,+EAAgF;AAChF,mFAAoF;AACpF,qFAAoF;AACpF,6DAA8E;AAC9E,6CAAgD;AAChD,6CAA4D;AAC5D,mEAAqE;AACrE,6DAAwD;AACxD,uCAAyD;AACzD,2DAA8D;AAC9D,iFAAkF;AAClF,uCAAyD;AACzD,2DAA8D;AAC9D,+DAA0D;AAC1D,6FAAsF;AACtF,6EAAsE;AACtE,uCAAyD;AACzD,2DAA8D;AAC9D,yFAA0F;AAC1F,mGAAoG;AACpG,qEAAuE;AACvE,uCAAyD;AACzD,qDAAsE;AACtE,+EAAiF;AACjF,2DAA8D;AAC9D,2EAA8E;AAC9E,2FAAoF;AACpF,uEAAyE;AACzE,yDAA4D;AAC5D,2CAA6D;AAC7D,uCAAyD;AACzD,2DAA8D;AAC9D,yCAAqC;AACrC,iEAA4D;AAC5D,uGAA+F;AAC/F,2CAA6D;AAC7D,yDAA0E;AAC1E,6EAA+E;AAC/E,+DAAkE;AAClE,yDAAoD;AACpD,+BAAiD;AACjD,qDAAwD;AACxD,uDAAkD;AAClD,yDAS2B;AAC3B,mDAAsD;AACtD,2CAA+C;AAC/C,mEAAoE;AACpE,2EAA6E;AAC7E,6CAAiD;AAEpC,QAAA,KAAK,ucACb,+BAAkB,GAClB,6BAAiB,GACjB,gDAA0B,GAC1B,6DAAgC,GAChC,8DAAgC,GAChC,4CAAwB,GACxB,4CAAwB,GACxB,+DAAiC,GACjC,0CAAuB,GACvB,4CAAwB,GACxB,mDAA2B,GAC3B,oCAAoB,GACpB,4CAAwB,GACxB,0CAAmB,GACnB,6EAAmC,GACnC,sCAAiB,GACjB,sCAAqB,GACrB,mDAA2B,GAC3B,uDAA6B,GAC7B,yEAAqC,GACrC,uDAA6B,GAC7B,2CAAwB,GACxB,8BAAiB,GACjB,kDAA0B,GAC1B,2DAA+B,GAC/B,gEAAiC,GACjC,gCAAc,GACd,0EAAsC,GACtC,gEAAiC,GACjC,4DAAgC,GAChC,4CAAwB,GACxB,kEAAiC,EACrC;AAEY,QAAA,QAAQ,qdAChB,8BAA0B,GAC1B,qBAAkB,GAClB,mBAAgB,GAChB,mBAAgB,GAChB,0BAAsB,GACtB,eAAY,GACZ,mBAAgB,GAChB,mBAAgB,GAChB,mBAAgB,GAChB,qBAAkB,GAClB,4BAAwB,GACxB,sBAAgB,GAChB,kCAAe,GACf,kCAAe,GACf,qDAA4B,GAC5B,kCAAe,GACf,mBAAQ,GACR,qDAA4B,GAC5B,uDAA6B,GAC7B,oEAA+B,GAC/B,oEAA+B,GAC/B,kEAA8B,GAC9B,wCAAqB,GACrB,4CAAyB,GACzB,sCAAmB,GACnB,0CAAuB,GACvB,qCAAkB,GAClB,yCAAsB,GACtB,6CAAwB,GACxB,oCAAiB,GACjB,wCAAkB,GAClB,kEAAkC,GAClC,oDAAuB,EAC3B"}

package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js

@@ -65,6 +65,9 @@ exports.inventoriesByPalletResolver = {
                 qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
             });
         }
+        else {
+            qb.addOrderBy('location.name', 'DESC');
+        }
         if (productFilters && productFilters.length > 0) {
             let productInfo = productFilters[0];
             qb.andWhere(new typeorm_1.Brackets(qb2 => {

package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReturnWorksheet = exports.completeLoading = exports.completeLoadingResolver = void 0;
+const biz_base_1 = require("@things-factory/biz-base");
+const integration_fulfillment_1 = require("@things-factory/integration-fulfillment");
+const integration_sftp_1 = require("@things-factory/integration-sftp");
 const sales_base_1 = require("@things-factory/sales-base");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../../constants");
 const controllers_1 = require("../../../../controllers");
 exports.completeLoadingResolver = {
@@ -16,14 +20,56 @@ async function completeLoading(tx, domain, user, releaseGoodNo) {
         domain,
         name: releaseGoodNo,
         status: sales_base_1.ORDER_STATUS.LOADING
-    });
+    }, ['bizplace', 'bizplace.domain']);
     const worksheet = await worksheetController.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.LOADING, [
         'worksheetDetails',
-        'worksheetDetails.targetInventory'
+        'worksheetDetails.targetInventory',
+        'worksheetDetails.targetInventory.product'
     ]);
     const worksheetDetails = worksheet.worksheetDetails;
     const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
     const remainInventories = targetInventories.filter((targetInventory) => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.LOADING);
+    // Search Warehouse Company Domain
+    const warehouseCompanyBizplace = await tx
+        .getRepository(biz_base_1.Bizplace)
+        .findOne({ where: { domain }, relations: ['company'] });
+    const warehouseCompany = warehouseCompanyBizplace.company;
+    const warehouseBizplaces = await tx
+        .getRepository(biz_base_1.Bizplace)
+        .find({ where: { company: warehouseCompany }, relations: ['domain'] });
+    const warehouseCompanyBizplaces = warehouseBizplaces.filter(biz => biz.domain.extType == 'company');
+    const warehouseCompanyDomain = warehouseCompanyBizplaces[0].domain;
+    const customerDomain = releaseGood.bizplace.domain;
+    const fulfillmentCenter = await tx
+        .getRepository(integration_fulfillment_1.FulfillmentCenter)
+        .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' });
+    if (fulfillmentCenter) {
+        let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
+            where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
+        });
+        if (customerAvailableSftp) {
+            const responseFileTypes = JSON.parse(customerAvailableSftp.responseFileTypes);
+            let inventoryItems = await tx.getRepository(warehouse_base_1.InventoryItem).find({
+                where: { domain, outboundOrderId: releaseGood.id }
+            });
+            if (responseFileTypes.enableShipment) {
+                let shipmentResult = await integration_sftp_1.SftpAPI.createShipment(customerAvailableSftp, {
+                    releaseGood,
+                    orderInventories: targetInventories,
+                    sftp: customerAvailableSftp
+                });
+                customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(shipmentResult);
+            }
+            if (responseFileTypes.enableSerialNumber) {
+                let snResult = await integration_sftp_1.SftpAPI.createSerialNumber(customerAvailableSftp, {
+                    releaseGood,
+                    inventoryItems,
+                    sftp: customerAvailableSftp
+                });
+                customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).save(snResult);
+            }
+        }
+    }
     await worksheetController.completeLoading(releaseGoodNo);
     if (remainInventories.length) {
         await createReturnWorksheet(tx, domain, user, releaseGoodNo, remainInventories);

package/dist-server/graphql/resolvers/worksheet/loading/complete-loading.js.map

@@ -1 +1 @@
-{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":";;;AACA,2DAA8G;AAG9G,qDAAsD;AACtD,yDAAkG;AAGrF,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;IACxD,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CAAC,wBAAW,EAAE;QACnF,MAAM;QACN,IAAI,EAAE,aAAa;QACnB,MAAM,EAAE,yBAAY,CAAC,OAAO;KAC7B,CAAC,CAAA;IACF,MAAM,SAAS,GAAc,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,EAAE;QAClH,kBAAkB;QAClB,kCAAkC;KACnC,CAAC,CAAA;IACF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;IACtE,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC/G,MAAM,iBAAiB,GAAqB,iBAAiB,CAAC,MAAM,CAClE,CAAC,eAA+B,EAAE,EAAE,CAAC,eAAe,CAAC,MAAM,KAAK,mCAAsB,CAAC,OAAO,CAC/F,CAAA;IAED,MAAM,mBAAmB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;IAExD,IAAI,iBAAiB,CAAC,MAAM,EAAE;QAC5B,MAAM,qBAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,iBAAiB,CAAC,CAAA;KAChF;AACH,CAAC;AA3BD,0CA2BC;AAED,6CAA6C;AACtC,KAAK,UAAU,qBAAqB,CACzC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,gBAAkC;IAElC,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,OAAO,MAAM,mBAAmB,CAAC,0BAA0B,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAC9F,CAAC;AATD,sDASC"}
+{"version":3,"file":"complete-loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/complete-loading.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/loading/loading.js

@@ -7,18 +7,11 @@ exports.loadingResolver = {
     async loading(_, { loadedWorksheetDetails, releaseGoodNo, orderInfo }, context) {
         var _a;
         const { tx, domain, user } = context.state;
-        await loading(tx, domain, user, loadedWorksheetDetails, releaseGoodNo);
+        const worksheetDetails = await loading(tx, domain, user, loadedWorksheetDetails, releaseGoodNo);
         const worksheetController = new controllers_1.WorksheetController(tx, domain, user);
         const releaseGood = await worksheetController.findRefOrder(sales_base_1.ReleaseGood, { domain, name: releaseGoodNo }, ['bizplace', 'deliverTo']);
         const loadingWorksheetController = new controllers_1.LoadingWorksheetController(tx, domain, user);
-        let targetInventories = [];
-        for (let worksheetDetail of loadedWorksheetDetails) {
-            worksheetDetail = await loadingWorksheetController.findWorksheetDetailByName(worksheetDetail.name, [
-                'targetInventory'
-            ]);
-            const targetInventory = worksheetDetail.targetInventory;
-            targetInventories.push(targetInventory);
-        }
+        let targetInventories = worksheetDetails.map(itm => itm.targetInventory);
         const bizplace = releaseGood.bizplace;
         orderInfo = Object.assign(Object.assign({}, orderInfo), { contactPointRefId: ((_a = releaseGood.deliverTo) === null || _a === void 0 ? void 0 : _a.id) || null });
         await (0, sales_base_1.generateDeliveryOrder)(orderInfo, targetInventories, bizplace, releaseGood, domain, user, tx);
@@ -26,7 +19,7 @@ exports.loadingResolver = {
 };
 async function loading(tx, domain, user, worksheetDetails, releaseGoodNo) {
     const worksheetController = new controllers_1.LoadingWorksheetController(tx, domain, user);
-    await worksheetController.loading(releaseGoodNo, worksheetDetails);
+    return await worksheetController.loading(releaseGoodNo, worksheetDetails);
 }
 exports.loading = loading;
 //# sourceMappingURL=loading.js.map

package/dist-server/graphql/resolvers/worksheet/loading/loading.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/loading.ts"],"names":[],"mappings":";;;AAEA,2DAA+F;AAG/F,yDAAyF;AAG5E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,OAAY;;QACtF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,aAAa,CAAC,CAAA;QACtE,MAAM,mBAAmB,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CACrE,wBAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAC/B,CAAC,UAAU,EAAE,WAAW,CAAC,CAC1B,CAAA;QAED,MAAM,0BAA0B,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/G,IAAI,iBAAiB,GAAqB,EAAE,CAAA;QAC5C,KAAK,IAAI,eAAe,IAAI,sBAAsB,EAAE;YAClD,eAAe,GAAG,MAAM,0BAA0B,CAAC,yBAAyB,CAAC,eAAe,CAAC,IAAI,EAAE;gBACjG,iBAAiB;aAClB,CAAC,CAAA;YACF,MAAM,eAAe,GAAG,eAAe,CAAC,eAAe,CAAA;YACvD,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;SACxC;QAED,MAAM,QAAQ,GAAa,WAAW,CAAC,QAAQ,CAAA;QAC/C,SAAS,mCACJ,SAAS,KACZ,iBAAiB,EAAE,CAAA,MAAA,WAAW,CAAC,SAAS,0CAAE,EAAE,KAAI,IAAI,GACrD,CAAA;QAED,MAAM,IAAA,kCAAqB,EAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,gBAAoE,EACpE,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AACpE,CAAC;AATD,0BASC"}
+{"version":3,"file":"loading.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/loading/loading.ts"],"names":[],"mappings":";;;AAEA,2DAA+F;AAG/F,yDAAyF;AAG5E,QAAA,eAAe,GAAG;IAC7B,KAAK,CAAC,OAAO,CAAC,CAAM,EAAE,EAAE,sBAAsB,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,OAAY;;QACtF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,aAAa,CAAC,CAAA;QAC/F,MAAM,mBAAmB,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,WAAW,GAAgB,MAAM,mBAAmB,CAAC,YAAY,CACrE,wBAAW,EACX,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAC/B,CAAC,UAAU,EAAE,WAAW,CAAC,CAC1B,CAAA;QAED,MAAM,0BAA0B,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC/G,IAAI,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QAE1F,MAAM,QAAQ,GAAa,WAAW,CAAC,QAAQ,CAAA;QAC/C,SAAS,mCACJ,SAAS,KACZ,iBAAiB,EAAE,CAAA,MAAA,WAAW,CAAC,SAAS,0CAAE,EAAE,KAAI,IAAI,GACrD,CAAA;QAED,MAAM,IAAA,kCAAqB,EAAC,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,OAAO,CAC3B,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,gBAA2F,EAC3F,aAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,OAAO,MAAM,mBAAmB,CAAC,OAAO,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAA;AAC3E,CAAC;AATD,0BASC"}

package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js

@@ -24,7 +24,9 @@ exports.loadingWorksheetResolver = {
                 .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
                 .innerJoinAndSelect('bizplace.domain', 'domain')
                 .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-                .andWhere('orderInventory.status IN (:...orderInventoryStatus)', { orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.LOADING, sales_base_1.ORDER_INVENTORY_STATUS.LOADED] })
+                .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
+                orderInventoryStatus: [sales_base_1.ORDER_INVENTORY_STATUS.LOADING, sales_base_1.ORDER_INVENTORY_STATUS.LOADED]
+            })
                 .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
                 .andWhere('releaseGood.status = :status', { status: sales_base_1.ORDER_STATUS.LOADING });
             const orderInventoryByBin = await qb.getOne();
@@ -35,8 +37,11 @@ exports.loadingWorksheetResolver = {
         }
         if (!releaseGood)
             throw new Error(`Release good doesn't exists.`);
+        let [orderTotes, orderTotesTotal] = await (0, typeorm_1.getRepository)(sales_base_1.OrderTote).findAndCount({
+            where: { releaseGood: releaseGood.id }
+        });
         const foundWorksheet = await (0, utils_1.fetchExecutingWorksheet)(domain, releaseGood.bizplace, ['bizplace', 'worksheetDetails'], constants_1.WORKSHEET_TYPE.LOADING, releaseGood);
-        const foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
+        let foundWSD = await (0, typeorm_1.getRepository)(entities_1.WorksheetDetail).find({
             where: {
                 domain,
                 worksheet: foundWorksheet,
@@ -45,11 +50,58 @@ exports.loadingWorksheetResolver = {
             },
             relations: [
                 'targetInventory',
+                'targetInventory.orderProduct',
                 'targetInventory.inventory',
                 'targetInventory.inventory.location',
                 'targetInventory.inventory.product'
             ]
         });
+        if (orderTotesTotal > 0) {
+            let [toteItems, toteItemsTotal] = await (0, typeorm_1.getRepository)(sales_base_1.OrderToteItem).findAndCount({
+                where: { orderTote: (0, typeorm_1.In)(orderTotes.map(itm => itm.id)) },
+                relations: ['orderTote', 'orderInventory']
+            });
+            let toteWsd = [];
+            for (let i = 0; i < toteItemsTotal; i++) {
+                let wsdIndex = foundWSD.findIndex(itm => !(itm === null || itm === void 0 ? void 0 : itm.toteName) && itm.targetInventory.id == toteItems[i].orderInventory.id);
+                if (wsdIndex >= 0) {
+                    let filterWSD = JSON.parse(JSON.stringify(foundWSD[wsdIndex]));
+                    let uomValue = Math.round((filterWSD.targetInventory.releaseUomValue / filterWSD.targetInventory.releaseQty) * 100) / 100;
+                    foundWSD[wsdIndex].targetInventory.releaseQty -= toteItems[i].qty;
+                    foundWSD[wsdIndex].targetInventory.pickedQty -= toteItems[i].qty;
+                    foundWSD[wsdIndex].targetInventory.releaseUomValue = foundWSD[wsdIndex].targetInventory.releaseQty * uomValue;
+                    filterWSD.targetInventory.releaseQty = toteItems[i].qty;
+                    filterWSD.targetInventory.pickedQty = toteItems[i].qty;
+                    filterWSD.targetInventory.releaseUomValue = toteItems[i].qty * uomValue;
+                    filterWSD.toteName = toteItems[i].orderTote.name;
+                    toteWsd.push(filterWSD);
+                }
+            }
+            foundWSD = foundWSD.concat(toteWsd);
+            foundWSD.sort((a, b) => (a.toteName > b.toteName ? 1 : -1));
+        }
+        let worksheetDetailInfos = foundWSD
+            .filter(itm => itm.targetInventory.releaseQty > 0)
+            .map((loadingWSD) => {
+            const targetInventory = loadingWSD.targetInventory;
+            const inventory = targetInventory.inventory;
+            return {
+                name: loadingWSD.name,
+                palletId: inventory.palletId,
+                batchId: inventory.batchId,
+                batchIdRef: inventory.batchIdRef,
+                product: inventory.product,
+                releaseQty: targetInventory.releaseQty,
+                releaseUomValue: targetInventory.releaseUomValue,
+                status: loadingWSD.status,
+                description: loadingWSD.description,
+                targetName: targetInventory.name,
+                packingType: inventory.packingType,
+                packingSize: inventory.packingSize,
+                inventory: targetInventory.inventory,
+                toteName: loadingWSD.toteName
+            };
+        });
         return {
             worksheetInfo: {
                 releaseGood,
@@ -58,25 +110,7 @@ exports.loadingWorksheetResolver = {
                 refNo: releaseGood.refNo,
                 ownCollection: releaseGood.ownTransport
             },
-            worksheetDetailInfos: foundWSD.map(async (loadingWSD) => {
-                const targetInventory = loadingWSD.targetInventory;
-                const inventory = targetInventory.inventory;
-                return {
-                    name: loadingWSD.name,
-                    palletId: inventory.palletId,
-                    batchId: inventory.batchId,
-                    batchIdRef: inventory.batchIdRef,
-                    product: inventory.product,
-                    releaseQty: targetInventory.releaseQty,
-                    releaseUomValue: targetInventory.releaseUomValue,
-                    status: loadingWSD.status,
-                    description: loadingWSD.description,
-                    targetName: targetInventory.name,
-                    packingType: inventory.packingType,
-                    packingSize: inventory.packingSize,
-                    inventory: targetInventory.inventory
-                };
-            })
+            worksheetDetailInfos
         };
     }
 };

package/dist-server/graphql/resolvers/worksheet/loading-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"loading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/loading-worksheet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"loading-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/loading-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA2E;AAE3E,2DAOmC;AAEnC,mEAAoE;AAEpE,kDAAqE;AACrE,gDAA8D;AAC9D,0CAAwD;AAE3C,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC5D,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,IAAI,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACtE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,gCAAgC,EAAE;YACvE,SAAS,EAAE,CAAC,UAAU,CAAC;SACxB,CAAC,CAAA;QAEF,kCAAkC;QAClC,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,WAAW,GAAa,MAAM,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;aACvC,CAAC,CAAA;YAEF,MAAM,EAAE,GAAuC,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;YACjH,EAAE,CAAC,kBAAkB,CAAC,4BAA4B,EAAE,aAAa,CAAC;iBAC/D,kBAAkB,CAAC,sBAAsB,EAAE,UAAU,CAAC;iBACtD,kBAAkB,CAAC,iBAAiB,EAAE,QAAQ,CAAC;iBAC/C,KAAK,CAAC,sCAAsC,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;iBACtE,QAAQ,CAAC,qDAAqD,EAAE;gBAC/D,oBAAoB,EAAE,CAAC,mCAAsB,CAAC,OAAO,EAAE,mCAAsB,CAAC,MAAM,CAAC;aACtF,CAAC;iBACD,QAAQ,CAAC,8CAA8C,EAAE,EAAE,UAAU,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC;iBACxF,QAAQ,CAAC,8BAA8B,EAAE,EAAE,MAAM,EAAE,yBAAY,CAAC,OAAO,EAAE,CAAC,CAAA;YAE7E,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,MAAM,EAAE,CAAA;YAE7C,IAAI,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE;gBACpC,aAAa,GAAG,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAA;gBACpD,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAA;aAC9C;SACF;QAED,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAA;QAEjE,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,GAAc,MAAM,IAAA,uBAAa,EAAC,sBAAS,CAAC,CAAC,YAAY,CAAC;YACzF,KAAK,EAAE,EAAE,WAAW,EAAE,WAAW,CAAC,EAAE,EAAE;SACvC,CAAC,CAAA;QAEF,MAAM,cAAc,GAAc,MAAM,IAAA,+BAAuB,EAC7D,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,EAAE,kBAAkB,CAAC,EAChC,0BAAc,CAAC,OAAO,EACtB,WAAW,CACZ,CAAA;QACD,IAAI,QAAQ,GAAU,MAAM,IAAA,uBAAa,EAAC,0BAAe,CAAC,CAAC,IAAI,CAAC;YAC9D,KAAK,EAAE;gBACL,MAAM;gBACN,SAAS,EAAE,cAAc;gBACzB,IAAI,EAAE,0BAAc,CAAC,OAAO;gBAC5B,MAAM,EAAE,IAAA,aAAG,EAAC,IAAA,eAAK,EAAC,4BAAgB,CAAC,IAAI,CAAC,CAAC;aAC1C;YACD,SAAS,EAAE;gBACT,iBAAiB;gBACjB,8BAA8B;gBAC9B,2BAA2B;gBAC3B,oCAAoC;gBACpC,mCAAmC;aACpC;SACF,CAAC,CAAA;QAEF,IAAI,eAAe,GAAG,CAAC,EAAE;YACvB,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,GAAkB,MAAM,IAAA,uBAAa,EAAC,0BAAa,CAAC,CAAC,YAAY,CAAC;gBAC/F,KAAK,EAAE,EAAE,SAAS,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE;gBACvD,SAAS,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;aAC3C,CAAC,CAAA;YAEF,IAAI,OAAO,GAAG,EAAE,CAAA;YAEhB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE;gBACvC,IAAI,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAC/B,GAAG,CAAC,EAAE,CAAC,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,CAAA,IAAI,GAAG,CAAC,eAAe,CAAC,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAClF,CAAA;gBAED,IAAI,QAAQ,IAAI,CAAC,EAAE;oBACjB,IAAI,SAAS,GAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACnE,IAAI,QAAQ,GACV,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,eAAe,GAAG,SAAS,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAA;oBAE5G,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,UAAU,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBACjE,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBAChE,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,eAAe,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC,UAAU,GAAG,QAAQ,CAAA;oBAE7G,SAAS,CAAC,eAAe,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBACvD,SAAS,CAAC,eAAe,CAAC,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;oBACtD,SAAS,CAAC,eAAe,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,QAAQ,CAAA;oBACvE,SAAS,CAAC,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAA;oBAChD,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;iBACxB;aACF;YAED,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YACnC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5D;QAED,IAAI,oBAAoB,GAAG,QAAQ;aAChC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,UAAU,GAAG,CAAC,CAAC;aACjD,GAAG,CAAC,CAAC,UAAe,EAAE,EAAE;YACvB,MAAM,eAAe,GAAmB,UAAU,CAAC,eAAe,CAAA;YAClE,MAAM,SAAS,GAAc,eAAe,CAAC,SAAS,CAAA;YACtD,OAAO;gBACL,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,UAAU,EAAE,SAAS,CAAC,UAAU;gBAChC,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,UAAU,EAAE,eAAe,CAAC,UAAU;gBACtC,eAAe,EAAE,eAAe,CAAC,eAAe;gBAChD,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,UAAU,EAAE,eAAe,CAAC,IAAI;gBAChC,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,WAAW,EAAE,SAAS,CAAC,WAAW;gBAClC,SAAS,EAAE,eAAe,CAAC,SAAS;gBACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;aAC9B,CAAA;QACH,CAAC,CAAC,CAAA;QAEJ,OAAO;YACL,aAAa,EAAE;gBACb,WAAW;gBACX,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;gBACvC,SAAS,EAAE,cAAc,CAAC,SAAS;gBACnC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,aAAa,EAAE,WAAW,CAAC,YAAY;aACxC;YACD,oBAAoB;SACrB,CAAA;IACH,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/worksheet/packing/index.js

@@ -5,5 +5,6 @@ const activate_packing_1 = require("./activate-packing");
 const complete_packing_1 = require("./complete-packing");
 const packing_1 = require("./packing");
 const scan_product_packing_1 = require("./scan-product-packing");
-exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign({}, activate_packing_1.activatePackingResolver), complete_packing_1.completePackingResolver), packing_1.packingResolver), scan_product_packing_1.scanProductPackingResolver);
+const undo_serial_number_packing_1 = require("./undo-serial-number-packing");
+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);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/worksheet/packing/index.js.map

@@ -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;AAEtD,QAAA,SAAS,+DACjB,0CAAuB,GACvB,0CAAuB,GACvB,yBAAe,GACf,iDAA0B,EAC9B"}
+{"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"}

package/dist-server/graphql/resolvers/worksheet/packing/packing.js

@@ -4,14 +4,14 @@ exports.packing = exports.packingResolver = void 0;
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const controllers_1 = require("../../../../controllers");
 exports.packingResolver = {
-    async packing(_, { worksheetDetailName, releaseQty }, context) {
+    async packing(_, { worksheetDetailName, releaseQty, serialNumber }, context) {
         const { tx, domain, user } = context.state;
-        await packing(tx, domain, user, worksheetDetailName, releaseQty);
+        await packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber);
     }
 };
-async function packing(tx, domain, user, worksheetDetailName, releaseQty) {
+async function packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber) {
     const worksheetController = new controllers_1.PackingWorksheetController(tx, domain, user);
-    const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty);
+    const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber);
     let releaseGood = worksheetDetail.targetInventory.releaseGood;
     const worksheet = worksheetDetail.worksheet;
     if (releaseGood.type === 'b2c' && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill)) {