@things-factory/worksheet-base 4.3.75 → 4.3.78

package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js

@@ -1,168 +1,110 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rejectCancellationReleaseOrder = void 0;
-const typeorm_1 = require("typeorm");
+const env_1 = require("@things-factory/env");
 const sales_base_1 = require("@things-factory/sales-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.rejectCancellationReleaseOrder = {
     async rejectCancellationReleaseOrder(_, { name }, context) {
         const { tx, domain, user } = context.state;
-        let foundRO = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
-            where: { domain, name, status: sales_base_1.ORDER_STATUS.PENDING_CANCEL },
-            relations: [
-                'bizplace',
-                'orderInventories',
-                'orderInventories.inventory',
-                'orderInventories.inventory.location',
-                'orderInventories.deliveryOrder',
-                'orderVass'
-            ]
-        });
-        if (!foundRO)
-            throw new Error(`Release order doesn't exists.`);
-        let targetOIs = foundRO.orderInventories;
-        let foundOVs = foundRO.orderVass;
-        let isDeactivatedPicking = false;
-        foundRO.status = sales_base_1.ORDER_STATUS.PENDING_WORKSHEET;
-        // get the worksheet based on RO number
-        let foundWS = await tx.getRepository(entities_1.Worksheet).find({
-            where: {
-                domain,
-                releaseGood: foundRO
-            }
-        });
-        // check worksheet table if started_at is not null to indicate that the worksheet has been activated 
-        if (foundWS && (foundWS === null || foundWS === void 0 ? void 0 : foundWS.length)) {
-            foundWS = foundWS.map((ws) => {
-                if (ws.startedAt && !ws.endedAt) {
-                    return Object.assign(Object.assign({}, ws), { status: constants_1.WORKSHEET_STATUS.EXECUTING, updater: user });
-                }
-                else if (ws.startedAt && ws.endedAt) {
-                    return Object.assign(Object.assign({}, ws), { status: constants_1.WORKSHEET_STATUS.DONE, updater: user });
-                }
-                else if (!ws.startedAt && !ws.endedAt && ws.type === constants_1.WORKSHEET_TYPE.PICKING) {
-                    isDeactivatedPicking = true;
-                    return Object.assign(Object.assign({}, ws), { status: constants_1.WORKSHEET_STATUS.DEACTIVATED, updater: user });
-                }
+        try {
+            // find release order
+            let foundRO = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+                where: { domain, name, status: sales_base_1.ORDER_STATUS.PENDING_CANCEL },
+                relations: [
+                    'bizplace',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.location',
+                    'orderInventories.deliveryOrder',
+                    'orderVass'
+                ]
             });
-            await tx.getRepository(entities_1.Worksheet).save(foundWS);
-        }
-        // check if the worksheet is in Loading stage
-        const isLoadingStage = foundWS.some((ws) => ws.type === constants_1.WORKSHEET_TYPE.LOADING);
-        // change the order inventory status accordingly
-        let newOrderInventories = targetOIs.map((oi) => {
-            if (isLoadingStage && oi.deliveryOrder && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_REVERSE)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.LOADED;
-            else if (isLoadingStage && !oi.deliveryOrder && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_REVERSE)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.LOADING;
-            else if (!isLoadingStage && oi.inventory && isDeactivatedPicking && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK;
-            else if (!isLoadingStage && oi.inventory && !isDeactivatedPicking && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKING;
-            else if (!isLoadingStage && oi.inventory && !isDeactivatedPicking && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_REVERSE)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
-            else if (!isLoadingStage && !oi.inventory && isDeactivatedPicking && oi.status === sales_base_1.ORDER_INVENTORY_STATUS.PENDING_CANCEL)
-                oi.status = sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT;
-            return Object.assign(Object.assign({}, oi), { updater: user });
-        });
-        await tx.getRepository(sales_base_1.OrderInventory).save(newOrderInventories);
-        // find the worksheet details based on order inventories
-        let foundWSD = await tx.getRepository(entities_1.WorksheetDetail).find({
-            where: {
-                domain,
-                targetInventory: (0, typeorm_1.In)(newOrderInventories.map((oi) => oi.id))
-            },
-            relations: ['targetInventory']
-        });
-        if (foundWSD && (foundWSD === null || foundWSD === void 0 ? void 0 : foundWSD.length)) {
-            foundWSD = foundWSD.map((wsd) => {
-                //change the worksheet details status accordingly
-                newOrderInventories.forEach((oi) => {
-                    var _a, _b;
-                    if (((_a = wsd.targetInventory) === null || _a === void 0 ? void 0 : _a.id) === oi.id && wsd.type === constants_1.WORKSHEET_TYPE.PICKING) {
-                        switch (oi.status) {
-                            case sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK:
-                                wsd.status = constants_1.WORKSHEET_STATUS.DEACTIVATED;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.PICKING:
-                                wsd.status = constants_1.WORKSHEET_STATUS.EXECUTING;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.REPLACED:
-                                wsd.status = constants_1.WORKSHEET_STATUS.REPLACED;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.PICKED:
-                                wsd.status = constants_1.WORKSHEET_STATUS.DONE;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.LOADING:
-                                wsd.status = constants_1.WORKSHEET_STATUS.DONE;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.LOADED:
-                                wsd.status = constants_1.WORKSHEET_STATUS.DONE;
-                                break;
-                        }
-                    }
-                    else if (((_b = wsd.targetInventory) === null || _b === void 0 ? void 0 : _b.id) === oi.id && wsd.type === constants_1.WORKSHEET_TYPE.LOADING) {
-                        switch (oi.status) {
-                            case sales_base_1.ORDER_INVENTORY_STATUS.LOADING:
-                                wsd.status = constants_1.WORKSHEET_STATUS.EXECUTING;
-                                break;
-                            case sales_base_1.ORDER_INVENTORY_STATUS.LOADED:
-                                wsd.status = constants_1.WORKSHEET_STATUS.DONE;
-                                break;
-                        }
+            if (!foundRO)
+                throw new Error(`Release order doesn't exists.`);
+            let targetOIs = foundRO.orderInventories;
+            // perform update on all order inventories and worksheet
+            let worksheetDetails = await Promise.all(targetOIs.map(async (orderInventory) => {
+                let existingWorksheetDetail = await tx.getRepository(entities_1.WorksheetDetail).createQueryBuilder('wd')
+                    .innerJoinAndSelect('wd.worksheet', 'ws')
+                    .where('wd.target_inventory_id = :orderInventoryId', { orderInventoryId: orderInventory.id })
+                    .orderBy('ws.created_at', 'DESC')
+                    .addOrderBy('wd.name')
+                    .getOne();
+                if (existingWorksheetDetail) {
+                    const startedAt = existingWorksheetDetail.worksheet.startedAt;
+                    const wdType = existingWorksheetDetail.worksheet.type;
+                    let wdStatus, oiStatus, roStatus, wStatus;
+                    switch (wdType) {
+                        case 'PICKING':
+                        case 'BATCH_PICKING':
+                            wdStatus = !startedAt ? constants_1.WORKSHEET_STATUS.DEACTIVATED : orderInventory.pickedQty == orderInventory.releaseQty ? constants_1.WORKSHEET_STATUS.DONE : constants_1.WORKSHEET_STATUS.EXECUTING;
+                            oiStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK : orderInventory.pickedQty == orderInventory.releaseQty ? sales_base_1.ORDER_INVENTORY_STATUS.PICKED : sales_base_1.ORDER_INVENTORY_STATUS.PICKING;
+                            roStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK : sales_base_1.ORDER_INVENTORY_STATUS.PICKING;
+                            break;
+                        case 'PACKING':
+                            wdStatus = !startedAt ? constants_1.WORKSHEET_STATUS.DEACTIVATED : orderInventory.packedQty == orderInventory.releaseQty ? constants_1.WORKSHEET_STATUS.DONE : constants_1.WORKSHEET_STATUS.EXECUTING;
+                            oiStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PACK : orderInventory.packedQty == orderInventory.releaseQty ? sales_base_1.ORDER_INVENTORY_STATUS.PACKED : sales_base_1.ORDER_INVENTORY_STATUS.PACKING;
+                            roStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PACK : sales_base_1.ORDER_INVENTORY_STATUS.PACKING;
+                            break;
+                        case 'SORTING':
+                            wdStatus = !startedAt ? constants_1.WORKSHEET_STATUS.DEACTIVATED : orderInventory.sortedQty == orderInventory.releaseQty ? constants_1.WORKSHEET_STATUS.DONE : constants_1.WORKSHEET_STATUS.EXECUTING;
+                            oiStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_SORT : orderInventory.sortedQty == orderInventory.releaseQty ? sales_base_1.ORDER_INVENTORY_STATUS.PICKED : sales_base_1.ORDER_INVENTORY_STATUS.SORTING;
+                            roStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_SORT : sales_base_1.ORDER_INVENTORY_STATUS.SORTING;
+                            break;
+                        case 'LOADING':
+                            wdStatus = !startedAt ? constants_1.WORKSHEET_STATUS.DEACTIVATED : (orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.deliveryOrder) ? constants_1.WORKSHEET_STATUS.DONE : constants_1.WORKSHEET_STATUS.EXECUTING;
+                            oiStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_LOAD : (orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.deliveryOrder) ? sales_base_1.ORDER_INVENTORY_STATUS.LOADED : sales_base_1.ORDER_INVENTORY_STATUS.LOADING;
+                            roStatus = !startedAt ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_LOAD : sales_base_1.ORDER_INVENTORY_STATUS.LOADING;
+                            break;
+                        default:
+                            break;
                     }
+                    wStatus = !startedAt ? constants_1.WORKSHEET_STATUS.DEACTIVATED : constants_1.WORKSHEET_STATUS.EXECUTING;
+                    await tx.getRepository(entities_1.WorksheetDetail).update({ id: existingWorksheetDetail.id }, { status: wdStatus, updatedAt: new Date(), updater: user });
+                    await tx.getRepository(sales_base_1.OrderInventory).update({ id: orderInventory.id }, { status: oiStatus, updatedAt: new Date(), updater: user });
+                    return { worksheet: existingWorksheetDetail.worksheet, wStatus, roStatus };
+                }
+                else {
+                    await tx.getRepository(sales_base_1.OrderInventory).update({ id: orderInventory.id }, { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, updatedAt: new Date(), updater: user });
+                    return { worksheet: null, wStatus: null, roStatus: sales_base_1.ORDER_STATUS.PENDING_WORKSHEET };
+                }
+            }));
+            if (worksheetDetails[0].worksheet) {
+                await tx.getRepository(entities_1.Worksheet).update({ id: worksheetDetails[0].worksheet.id }, {
+                    status: worksheetDetails[0].wStatus,
+                    updatedAt: new Date(),
+                    updater: user
                 });
-                return Object.assign(Object.assign({}, wsd), { updater: user });
-            });
-            await tx.getRepository(entities_1.WorksheetDetail).save(foundWSD);
-        }
-        if (foundOVs && (foundOVs === null || foundOVs === void 0 ? void 0 : foundOVs.length)) {
-            // update status of order vass to accordingly
-            foundOVs = foundOVs.map((orderVas) => {
-                if (!isLoadingStage)
-                    orderVas.status = sales_base_1.ORDER_VAS_STATUS.READY_TO_PROCESS;
-                else
-                    orderVas.status = sales_base_1.ORDER_VAS_STATUS.COMPLETED;
-                return Object.assign(Object.assign({}, orderVas), { updater: user });
-            });
-            await tx.getRepository(sales_base_1.OrderVas).save(foundOVs);
-        }
-        // find DO and change status to previous status
-        let foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).find({
-            where: { domain, releaseGood: foundRO, status: sales_base_1.ORDER_STATUS.PENDING_CANCEL },
-            relations: ['transportVehicle']
-        });
-        if (foundDO && (foundDO === null || foundDO === void 0 ? void 0 : foundDO.length)) {
-            foundDO = foundDO.map((deliveryOrder) => {
-                return Object.assign(Object.assign({}, deliveryOrder), { status: sales_base_1.ORDER_STATUS.READY_TO_DISPATCH, updater: user });
+            }
+            await tx.getRepository(sales_base_1.ReleaseGood).update({ id: foundRO.id }, {
+                status: worksheetDetails[0].roStatus,
+                updatedAt: new Date(),
+                updater: user
             });
-            await tx.getRepository(sales_base_1.DeliveryOrder).save(foundDO);
-        }
-        const isLoadingRO = foundWS.some((ws) => ws.type === constants_1.WORKSHEET_TYPE.LOADING &&
-            ws.status === constants_1.WORKSHEET_STATUS.EXECUTING);
-        if (isLoadingRO)
-            foundRO.status = sales_base_1.ORDER_STATUS.LOADING;
-        else {
-            var isReadyToLoadRO = foundWS.some((ws) => ws.type === constants_1.WORKSHEET_TYPE.LOADING &&
-                ws.status === constants_1.WORKSHEET_STATUS.DEACTIVATED);
-        }
-        if (isReadyToLoadRO)
-            foundRO.status = sales_base_1.ORDER_STATUS.READY_TO_LOAD;
-        else {
-            var isPickingRO = foundWS.some((ws) => ws.type === constants_1.WORKSHEET_TYPE.PICKING &&
-                ws.status === constants_1.WORKSHEET_STATUS.EXECUTING);
+            // reverse DO status
+            await reverseDO(foundRO, context);
+            return;
         }
-        if (isPickingRO)
-            foundRO.status = sales_base_1.ORDER_STATUS.PICKING;
-        else {
-            var isReadyToPickRO = foundWS.some((ws) => ws.type === constants_1.WORKSHEET_TYPE.PICKING &&
-                ws.status === constants_1.WORKSHEET_STATUS.DEACTIVATED);
+        catch (error) {
+            env_1.logger.error(`reject-cancellation-release-order[rejectCancellationReleaseOrder]:(data:${JSON.stringify({ name, tx, domain, user })}) ${error}`);
+            throw new Error('Something went wrong. Please contact support.');
         }
-        if (isReadyToPickRO)
-            foundRO.status = sales_base_1.ORDER_STATUS.READY_TO_PICK;
-        await tx.getRepository(sales_base_1.ReleaseGood).save(Object.assign(Object.assign({}, foundRO), { updater: user }));
-        return;
     }
 };
+async function reverseDO(releaseGood, context) {
+    const { tx, domain, user } = context.state;
+    // find DO and change status to previous status
+    let foundDO = await tx.getRepository(sales_base_1.DeliveryOrder).find({
+        where: { domain, releaseGood, status: sales_base_1.ORDER_STATUS.PENDING_CANCEL },
+        relations: ['transportVehicle']
+    });
+    if (foundDO && (foundDO === null || foundDO === void 0 ? void 0 : foundDO.length)) {
+        foundDO = foundDO.map((deliveryOrder) => {
+            return Object.assign(Object.assign({}, deliveryOrder), { status: sales_base_1.ORDER_STATUS.READY_TO_DISPATCH, updater: user });
+        });
+        await tx.getRepository(sales_base_1.DeliveryOrder).save(foundDO);
+    }
+}
 //# sourceMappingURL=reject-cancellation-release-order.js.map

package/dist-server/graphql/resolvers/worksheet/reject-cancellation-release-order.js.map

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

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

@@ -28,6 +28,7 @@ const worksheet_list_1 = require("./worksheet-list");
 const worksheet_patch_1 = require("./worksheet-patch");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
 const batch_pick_worksheet_info_1 = require("./batch-pick-worksheet-info");
+const multiple_release_good_worksheet_1 = require("./multiple-release-good-worksheet");
 exports.Mutation = `
   createWorksheet (
     worksheet: NewWorksheet!
@@ -64,10 +65,11 @@ exports.Mutation = `
 
   generateReleaseGoodWorksheet (
     releaseGoodNo: String!
+    currentStatus: String
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateMultipleReleaseGoodWorksheet (
-    releaseGoodNos: [String!]
+    releaseGoods: [MultipleReleaseGoodWorksheet!]
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   fetchSellercraftDocument (
@@ -743,6 +745,7 @@ exports.Types = [
     my_picking_assignment_status_1.MyPickingAssignmentStatus,
     find_release_orders_by_task_no_1.FindReleaseOrdersByTaskNo,
     delivery_order_ro_1.DeliveryOrderRO,
-    batch_pick_worksheet_info_1.GenerateBatchPickInfo
+    batch_pick_worksheet_info_1.GenerateBatchPickInfo,
+    multiple_release_good_worksheet_1.MultipleReleaseGoodWorksheet
 ];
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2EAAmE;AAEtD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;CACtB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,iEAA4D;AAC5D,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2EAAmE;AACnE,uFAAgF;AAEnE,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,0CAAmB;IACnB,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;IACrB,8DAA4B;CAC7B,CAAA"}

package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MultipleReleaseGoodWorksheet = void 0;
+const apollo_server_koa_1 = require("apollo-server-koa");
+exports.MultipleReleaseGoodWorksheet = (0, apollo_server_koa_1.gql) `
+  input MultipleReleaseGoodWorksheet {
+    name: String
+    status: String
+  }
+`;
+//# sourceMappingURL=multiple-release-good-worksheet.js.map

package/dist-server/graphql/types/worksheet/multiple-release-good-worksheet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"multiple-release-good-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/multiple-release-good-worksheet.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,4BAA4B,GAAG,IAAA,uBAAG,EAAA;;;;;CAK9C,CAAA"}

package/dist-server/utils/worksheet-util.js

@@ -37,7 +37,9 @@ async function fetchExecutingWorksheet(domain, bizplace, relations, type, refOrd
         throw new Error(`Worksheet is completed already`);
     }
     else if (worksheet.status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
-        throw new Error(`Worksheet is not activated yet`);
+        //@oscarchuaweiwen-fsd this function is being used in quite some place, for packing worksheet you have handled the status DEACTIVATED, but for loading worksheet it's not being handled
+        //won't there be issue if it doesn't throw error for places that didnt handle the status DEACTIVATED?
+        return worksheet;
     }
     else {
         throw new Error(`Current worksheet status (${worksheet.status}) is not proper to execute it.`);

package/dist-server/utils/worksheet-util.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.75",
+  "version": "4.3.78",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.74",
-    "@things-factory/biz-base": "^4.3.74",
-    "@things-factory/document-template-base": "^4.3.74",
-    "@things-factory/id-rule-base": "^4.3.74",
-    "@things-factory/integration-lmd": "^4.3.74",
-    "@things-factory/integration-marketplace": "^4.3.75",
-    "@things-factory/integration-sellercraft": "^4.3.75",
-    "@things-factory/integration-sftp": "^4.3.74",
-    "@things-factory/marketplace-base": "^4.3.75",
-    "@things-factory/notification": "^4.3.74",
-    "@things-factory/sales-base": "^4.3.75",
-    "@things-factory/setting-base": "^4.3.74",
-    "@things-factory/shell": "^4.3.74",
-    "@things-factory/transport-base": "^4.3.74",
-    "@things-factory/warehouse-base": "^4.3.75"
+    "@things-factory/auth-base": "^4.3.78",
+    "@things-factory/biz-base": "^4.3.78",
+    "@things-factory/document-template-base": "^4.3.78",
+    "@things-factory/id-rule-base": "^4.3.78",
+    "@things-factory/integration-lmd": "^4.3.78",
+    "@things-factory/integration-marketplace": "^4.3.78",
+    "@things-factory/integration-sellercraft": "^4.3.78",
+    "@things-factory/integration-sftp": "^4.3.78",
+    "@things-factory/marketplace-base": "^4.3.78",
+    "@things-factory/notification": "^4.3.78",
+    "@things-factory/sales-base": "^4.3.78",
+    "@things-factory/setting-base": "^4.3.78",
+    "@things-factory/shell": "^4.3.78",
+    "@things-factory/transport-base": "^4.3.78",
+    "@things-factory/warehouse-base": "^4.3.78"
   },
-  "gitHead": "3076ac1b79bc1f56d033b4d13c1dd9baac545e27"
+  "gitHead": "90e997e892d476732961326f4731ca47b22a45bc"
 }

package/server/controllers/outbound/packing-worksheet-controller.ts

@@ -193,15 +193,17 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.inventory',
         'targetInventory.inventory.product',
         'targetInventory.inventory.product.productDetails',
+        'targetInventory.inventory.product.productDetails.childProductDetail',
         'targetInventory.inventory.location'
       ]
     )
     const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
     const product: Product = worksheetDetail.targetInventory.inventory.product
+    const filterProductDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
     let packedQty: number = 1
-    const pickedQty: number = targetInventory.releaseQty
+    let pickedQty: number = targetInventory.releaseQty
 
     // search for matching product barcode
     const productDetail: ProductDetail = product?.productDetails
@@ -212,7 +214,24 @@ export class PackingWorksheetController extends VasWorksheetController {
           detail.packingType === inventory.packingType &&
           detail.packingSize === inventory.packingSize
       )
-    if (!productDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+    if (!productDetail && !product?.isRequireSerialNumberScanningOutbound) {
+      let roProductDetail: ProductDetail = product?.productDetails.find(
+        (parentDetail: ProductDetail) =>
+          parentDetail.packingType === inventory.packingType && parentDetail.packingSize == inventory.packingSize
+      )
+
+      roProductDetail.product = product
+
+      let childQty = await this.getChildQty(filterProductDetails, productBarcode, roProductDetail)
+      packedQty *= childQty
+    } else if (!productDetail) {
+      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    }
+
+    if (packedQty + targetInventory.packedQty > pickedQty) {
+      throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+    }
 
     // Serial Number scanning for batch picking
     if (targetInventory?.refWorksheetId) {

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -40,7 +40,7 @@ import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { SellercraftController } from '../../controllers'
 
 export class PickingWorksheetController extends VasWorksheetController {
-  async generatePickingWorksheet(releaseGoodNo: string): Promise<Worksheet> {
+  async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
     let releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
       {
@@ -78,7 +78,7 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     releaseGood.status = ORDER_STATUS.READY_TO_PICK
     releaseGood.updater = this.user
-    await this.updateRefOrder(releaseGood)
+    await this.updateRefOrder(releaseGood, null, currentStatus)
 
     return worksheet
   }
@@ -254,13 +254,14 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [])
 
-    const completeSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
-      where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT },
+    // retrieve order inventory
+    const pickingOrderInventory: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
+      where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_STATUS.PICKING },
       relations: ['releaseGood']
     })
 
-    let releaseGoods: ReleaseGood[] = completeSplitOIs.map((oi: OrderInventory) => oi.releaseGood)
-
+    let releaseGoods: ReleaseGood[] = pickingOrderInventory.map((oi: OrderInventory) => oi.releaseGood)
+    
     if (releaseGoods?.length) {
       releaseGoods = releaseGoods.map((rg: ReleaseGood) => {
         return {
@@ -272,11 +273,6 @@ export class PickingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
     }
 
-    if (completeSplitOIs?.length) {
-      const ids: string[] = completeSplitOIs.map((oi: OrderInventory) => oi.id)
-      await this.trxMgr.getRepository(OrderInventory).delete(ids)
-    }
-
     return worksheet
   }
 

package/server/controllers/worksheet-controller.ts

@@ -1,4 +1,4 @@
-import { EntityManager, EntitySchema, Equal, FindOneOptions, In, Not } from 'typeorm'
+import { EntityManager, EntitySchema, Equal, FindOneOptions, In, Not, getRepository } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
 import { Bizplace, getDomainUsers } from '@things-factory/biz-base'
@@ -489,7 +489,11 @@ export class WorksheetController {
    * @description
    * Update reference order like (ArrivalNotice, ReleaseGood, VasOrder, InventoryCheck)
    */
-  async updateRefOrder(refOrder: ReferenceOrderType, entitySchema?: EntitySchema): Promise<any> {
+  async updateRefOrder(
+    refOrder: ReferenceOrderType,
+    entitySchema?: EntitySchema,
+    currentStatus?: string
+  ): Promise<any> {
     if (!entitySchema) {
       if (refOrder instanceof ArrivalNotice) {
         entitySchema = ArrivalNotice
@@ -507,6 +511,25 @@ export class WorksheetController {
     if (!refOrder.id) throw new Error(this.ERROR_MSG.UPDATE.ID_NOT_EXISTS)
     if (!refOrder.updater?.id) refOrder = this.setStamp(refOrder)
 
+    if (currentStatus && entitySchema == ReleaseGood) {
+
+      let res = await getRepository(entitySchema).query(
+        `
+        update release_goods
+        set status = $1
+        where id = $2
+        and status = $3
+        returning id
+      `,
+        [refOrder.status, refOrder.id, currentStatus]
+      )
+
+      if (res[1] == 0) {
+        this.trxMgr.queryRunner.rollbackTransaction()
+        throw new Error('Worksheet has already been created')
+      }
+    }
+
     return await this.trxMgr.getRepository(entitySchema).save(refOrder)
   }
 

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -96,6 +96,19 @@ export const confirmCancellationReleaseOrder = {
               })
               .where('id = :id', { id: inventory.id })
               .execute()
+
+            // @ChrisLim-git commented for further review as it causes qty to add into inventory
+            // await tx
+            //   .createQueryBuilder()
+            //   .update(Inventory)
+            //   .set({
+            //     qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
+            //     uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
+            //     status: INVENTORY_STATUS.STORED,
+            //     updater: user
+            //   })
+            //   .where('id = :id', { id: inventory.id })
+            //   .execute()
           }
 
           return orderInventory