@things-factory/worksheet-base 5.0.0-alpha.4 → 5.0.0-alpha.40

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

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

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

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

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

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

package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js

@@ -2,70 +2,61 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pickingAssignmentStatusByUsersResolver = void 0;
 const auth_base_1 = require("@things-factory/auth-base");
-const biz_base_1 = require("@things-factory/biz-base");
 const typeorm_1 = require("typeorm");
 const constants_1 = require("../../../../constants");
 const entities_1 = require("../../../../entities");
 exports.pickingAssignmentStatusByUsersResolver = {
-    async pickingAssignmentStatusByUsers(_, { bizplaceId, name, email }, context) {
+    async pickingAssignmentStatusByUsers(_, params, context) {
         const { domain } = context.state;
-        const domainUsers = await (0, auth_base_1.getDomainUsers)(domain);
-        const domainUserIds = domainUsers
-            .filter((user) => user.userType === 'user')
-            .map((user) => user.id);
-        const findOneOption = { where: { id: (0, typeorm_1.In)(domainUserIds) } };
-        if (name)
-            findOneOption.where.name = (0, typeorm_1.ILike)(`%${name}%`);
-        if (email)
-            findOneOption.where.email = (0, typeorm_1.ILike)(`%${email}%`);
-        const users = await (0, typeorm_1.getRepository)(auth_base_1.User).find(findOneOption);
-        const bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne(bizplaceId);
-        const assignedPickingWorksheets = await (0, typeorm_1.getRepository)(entities_1.Worksheet).find({
-            where: {
-                domain,
-                bizplace,
-                type: constants_1.WORKSHEET_TYPE.PICKING,
-                status: (0, typeorm_1.In)([constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING]),
-                assignee: (0, typeorm_1.In)(users.map((u) => u.id))
-            },
-            relations: ['assignee']
+        const nameFilter = params.filters.find(p => { return p.name == "name"; });
+        const emailFilter = params.filters.find(p => { return p.name == "email"; });
+        const roleFilter = params.filters.find(p => { return p.name == 'roles'; });
+        const pendingSorter = params.sortings.find(p => { return p.name == 'pending'; });
+        const pickingSorter = params.sortings.find(p => { return p.name == 'picking'; });
+        const getUserInfoQb = await (0, typeorm_1.getRepository)(auth_base_1.User).createQueryBuilder('u');
+        getUserInfoQb.select('u.id');
+        getUserInfoQb.addSelect('u.name');
+        getUserInfoQb.addSelect('u.email');
+        getUserInfoQb.addSelect("string_agg(r.name,', ') as roles");
+        getUserInfoQb.innerJoin('u.roles', 'r');
+        getUserInfoQb.where('r.domain_id = :domainId', { domainId: domain.id });
+        roleFilter ? getUserInfoQb.andWhere('r.name ilike :userRole', { userRole: `%${roleFilter.value}%` }) : "";
+        nameFilter ? getUserInfoQb.andWhere('u.name ilike :userName', { userName: `%${nameFilter.value}%` }) : "";
+        emailFilter ? getUserInfoQb.andWhere('u.email ilike :userEmail', { userEmail: `%${emailFilter.value}%` }) : "";
+        getUserInfoQb.andWhere('r.name not ilike :userR', { userR: `%CLIENT%` });
+        getUserInfoQb.andWhere('u.user_type = :userType', { userType: "user" });
+        getUserInfoQb.groupBy('u.id');
+        getUserInfoQb.addGroupBy('u.name');
+        getUserInfoQb.addGroupBy('u.email');
+        const getAssignedWSQb = await (0, typeorm_1.getRepository)(entities_1.Worksheet).createQueryBuilder('ws');
+        getAssignedWSQb.select('ws.assignee_id');
+        getAssignedWSQb.addSelect('u.name');
+        getAssignedWSQb.addSelect("sum(case when ws.status='EXECUTING' then 1 else 0 end) as picking");
+        getAssignedWSQb.addSelect("sum(case when ws.status='DEACTIVATED' then 1 else 0 end) as pending");
+        getAssignedWSQb.innerJoin('ws.assignee', 'u');
+        getAssignedWSQb.where('ws.domain_id = :id', { id: domain.id });
+        getAssignedWSQb.andWhere('ws.type IN (:...type)', { type: [constants_1.WORKSHEET_TYPE.PICKING, constants_1.WORKSHEET_TYPE.BATCH_PICKING] });
+        getAssignedWSQb.andWhere('ws.status IN (:...status)', { status: [constants_1.WORKSHEET_STATUS.DEACTIVATED, constants_1.WORKSHEET_STATUS.EXECUTING] });
+        getAssignedWSQb.groupBy('ws.assignee_id');
+        getAssignedWSQb.addGroupBy('u.name');
+        (pendingSorter === null || pendingSorter === void 0 ? void 0 : pendingSorter.desc) ? getAssignedWSQb.orderBy('pending', 'DESC') : '';
+        (pickingSorter === null || pickingSorter === void 0 ? void 0 : pickingSorter.desc) ? getAssignedWSQb.orderBy('picking', 'DESC') : '';
+        pickingSorter && Object.keys(pickingSorter).length == 1 ? getAssignedWSQb.orderBy('picking', 'ASC') : '';
+        pendingSorter && Object.keys(pendingSorter).length == 1 ? getAssignedWSQb.orderBy('pending', 'ASC') : '';
+        const parameter1 = getUserInfoQb.getParameters();
+        const parameter2 = getAssignedWSQb.getParameters();
+        const combineParams = Object.assign(parameter1, parameter2);
+        const combineQb = (0, typeorm_1.getManager)().createQueryBuilder();
+        combineQb.select('u.*');
+        combineQb.addSelect('coalesce(ws.picking, 0) as picking');
+        combineQb.addSelect('coalesce(ws.pending, 0) as pending');
+        combineQb.from("(" + getUserInfoQb.getQuery() + ")", "u");
+        combineQb.leftJoin("(" + getAssignedWSQb.getQuery() + ")", "ws", ' ws.assignee_id = u.u_id');
+        combineQb.setParameters(combineParams);
+        const combineInfo = await combineQb.getRawMany();
+        return combineInfo.map(itm => {
+            return { user: { id: itm.u_id, email: itm.u_email, name: itm.u_name, description: itm.roles }, pending: itm.pending, picking: itm.picking };
         });
-        const assignmentMap = assignedPickingWorksheets.reduce((assignmentMap, worksheet) => {
-            const assignee = worksheet.assignee;
-            const status = worksheet.status;
-            if (assignmentMap.has(assignee.id)) {
-                const assignment = assignmentMap.get(assignee.id);
-                if (status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
-                    assignment.pending.push(worksheet);
-                }
-                else if (status === constants_1.WORKSHEET_STATUS.EXECUTING) {
-                    assignment.picking.push(worksheet);
-                }
-            }
-            else {
-                if (status === constants_1.WORKSHEET_STATUS.DEACTIVATED) {
-                    assignmentMap.set(assignee.id, {
-                        user: assignee,
-                        pending: [worksheet],
-                        picking: []
-                    });
-                }
-                else if (status === constants_1.WORKSHEET_STATUS.EXECUTING) {
-                    assignmentMap.set(assignee.id, {
-                        user: assignee,
-                        pending: [],
-                        picking: [worksheet]
-                    });
-                }
-            }
-            return assignmentMap;
-        }, new Map());
-        users.forEach((user) => {
-            if (!assignmentMap.has(user.id)) {
-                assignmentMap.set(user.id, { user, pending: [], picking: [] });
-            }
-        });
-        return Array.from(assignmentMap.values());
     }
 };
 //# sourceMappingURL=picking-assignment-status-by-user.js.map

package/dist-server/graphql/resolvers/worksheet/picking/picking-assignment-status-by-user.js.map

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

package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.undoSerialNumberPickingResolver = void 0;
+const controllers_1 = require("../../../../controllers");
+exports.undoSerialNumberPickingResolver = {
+    async undoSerialNumberPicking(_, { worksheetDetailName, inventoryItemId }, context) {
+        const { tx, domain, user } = context.state;
+        await undoSerialNumberPicking(tx, domain, user, worksheetDetailName, inventoryItemId);
+    }
+};
+async function undoSerialNumberPicking(tx, domain, user, worksheetDetailName, inventoryItemId) {
+    const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
+    await worksheetController.undoSerialNumberPicking(worksheetDetailName, inventoryItemId);
+}
+//# sourceMappingURL=undo-serial-number-picking.js.map

package/dist-server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo-serial-number-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/undo-serial-number-picking.ts"],"names":[],"mappings":";;;AAKA,yDAAoE;AAEvD,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,eAAe,EAAE,EAAE,OAAY;QAC1F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,uBAAuB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA;IACvF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,uBAAuB,CACpC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,eAAuB;IAEvB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;AACzF,CAAC"}

package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanProductSorting = exports.scanProductSortingResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.scanProductSortingResolver = {
-    async scanProductSorting(_, { taskNo, releaseGoodNo, productBarcode }, context) {
+    async scanProductSorting(_, { taskNo, releaseGoodNo, productBarcode, serialNumber }, context) {
         const { tx, domain, user } = context.state;
-        await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode);
+        await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber);
     }
 };
-async function scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode) {
+async function scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber) {
     const worksheetController = new controllers_1.SortingWorksheetController(tx, domain, user);
-    await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode);
+    await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber);
 }
 exports.scanProductSorting = scanProductSorting;
 //# sourceMappingURL=scan-product-sorting.js.map

package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js.map

@@ -1 +1 @@
-{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,OAAY;QACtF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,CAAC,CAAA;IACnF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,cAAuB;IAEvB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,CAAC,CAAA;AACrF,CAAC;AAVD,gDAUC"}
+{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,EAAE,OAAY;QACpG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;IACjG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,cAAuB,EACvB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAAA;AACnG,CAAC;AAXD,gDAWC"}

package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortingProduct = exports.sortingProductResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.sortingProductResolver = {
-    async sortingProduct(_, { taskNo, releaseGoodNo, productId, sortingQty }, context) {
+    async sortingProduct(_, { taskNo, releaseGoodNo, productId, sortingQty, serialNumber }, context) {
         const { tx, domain, user } = context.state;
-        await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty);
+        await sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty, serialNumber);
     }
 };
-async function sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty) {
+async function sortingProduct(tx, domain, user, taskNo, releaseGoodNo, productId, sortingQty, serialNumber) {
     const worksheetController = new controllers_1.SortingWorksheetController(tx, domain, user);
-    await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty);
+    await worksheetController.sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber);
 }
 exports.sortingProduct = sortingProduct;
 //# sourceMappingURL=sorting-product.js.map

package/dist-server/graphql/resolvers/worksheet/sorting/sorting-product.js.map

@@ -1 +1 @@
-{"version":3,"file":"sorting-product.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/sorting-product.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,OAAY;QACzF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;IACtF,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,cAAc,CAClC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,SAAiB,EACjB,UAAkB;IAElB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;AACxF,CAAC;AAXD,wCAWC"}
+{"version":3,"file":"sorting-product.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/sorting-product.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,OAAY;QACvG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;IACpG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,cAAc,CAClC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,SAAiB,EACjB,UAAkB,EAClB,YAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,CAAC,CAAA;AACtG,CAAC;AAZD,wCAYC"}

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

@@ -19,22 +19,26 @@ exports.sortingWorksheetResolver = {
         const qb = (0, typeorm_1.getRepository)(sales_base_1.OrderInventory).createQueryBuilder('OI');
         qb.select('SUM(OI.releaseQty)', 'releaseQty')
             .addSelect('SUM(OI.sortedQty)', 'sortedQty')
+            .addSelect(`string_agg(CONCAT(BIN.name, '(', OI.releaseQty, ')' ), ' ')`, 'binRemarks')
             .addSelect('PROD.id', 'productId')
             .addSelect('PROD.name', 'productName')
             .addSelect('PROD.sku', 'productSku')
             .addSelect('PROD.description', 'productDescription')
+            .addSelect('PROD.isRequireSerialNumberScanningOutbound', 'isRequireSerialNumberScanningOutbound')
             .addSelect('OI.batch_id', 'batchId')
             .addSelect('OI.packing_type', 'packingType')
             .addSelect('OI.packing_size', 'packingSize')
             .addSelect('INV.expiration_date', 'expirationDate')
             .leftJoin('OI.product', 'PROD')
             .leftJoin('OI.inventory', 'INV')
+            .leftJoin('OI.binLocation', 'BIN')
             .where('OI.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.id })
             .andWhere('OI.status <> :releaseGoodStatus', { releaseGoodStatus: sales_base_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT })
             .groupBy('PROD.id')
             .addGroupBy('PROD.name')
             .addGroupBy('PROD.sku')
             .addGroupBy('PROD.description')
+            .addGroupBy('PROD.isRequireSerialNumberScanningOutbound')
             .addGroupBy('INV.expiration_date')
             .addGroupBy('OI.batch_id')
             .addGroupBy('OI.packing_type')
@@ -58,12 +62,14 @@ exports.sortingWorksheetResolver = {
                     productSku: item === null || item === void 0 ? void 0 : item.productSku,
                     productName: item === null || item === void 0 ? void 0 : item.productName,
                     productDescription: item === null || item === void 0 ? void 0 : item.productDescription,
+                    isRequireSerialNumberScanningOutbound: item === null || item === void 0 ? void 0 : item.isRequireSerialNumberScanningOutbound,
                     releaseQty: item.releaseQty,
                     sortedQty: item.sortedQty,
                     status: item.status,
                     expirationDate: item === null || item === void 0 ? void 0 : item.expirationDate,
                     packingType: item === null || item === void 0 ? void 0 : item.packingType,
                     packingSize: item === null || item === void 0 ? void 0 : item.packingSize,
+                    binRemarks: item === null || item === void 0 ? void 0 : item.binRemarks,
                     releaseGood
                 };
             })

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

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

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

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unloadedInventories = void 0;
-const warehouse_base_1 = require("@things-factory/warehouse-base");
 const typeorm_1 = require("typeorm");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 exports.unloadedInventories = {
@@ -45,7 +45,8 @@ exports.unloadedInventories = {
             });
             const items = foundInv.map((inv) => {
                 const expirationDate = inv.expirationDate ? new Date(inv.expirationDate) : null;
-                return Object.assign(Object.assign({}, inv), { expirationDate: expirationDate });
+                const manufactureDate = inv.manufactureDate ? new Date(inv.manufactureDate) : null;
+                return Object.assign(Object.assign({}, inv), { expirationDate: expirationDate, manufactureDate: manufactureDate });
             });
             return items;
         }

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

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

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

@@ -6,7 +6,9 @@ const complete_product_scan_unload_1 = require("./complete-product-scan-unload")
 const complete_unloading_1 = require("./complete-unloading");
 const complete_unloading_partially_1 = require("./complete-unloading-partially");
 const scan_product_unload_1 = require("./scan-product-unload");
+const scan_serial_number_unload_1 = require("./scan-serial-number-unload");
+const undo_serial_number_unload_1 = require("./undo-serial-number-unload");
 const undo_unloading_1 = require("./undo-unloading");
 const unload_1 = require("./unload");
-exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, activate_unloading_1.activateUnloadingResolver), scan_product_unload_1.scanProductUnloadResolver), unload_1.unloadResolver), undo_unloading_1.undoUnloadingResolver), complete_product_scan_unload_1.completeProductScanUnloadResolver), complete_unloading_1.completeUnloadingResolver), complete_unloading_partially_1.completeUnloadingPartiallyResolver);
+exports.Mutations = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, activate_unloading_1.activateUnloadingResolver), scan_product_unload_1.scanProductUnloadResolver), scan_serial_number_unload_1.scanSerialNumberUnloadResolver), unload_1.unloadResolver), undo_unloading_1.undoUnloadingResolver), undo_serial_number_unload_1.undoSerialNumberUnloadResolver), complete_product_scan_unload_1.completeProductScanUnloadResolver), complete_unloading_1.completeUnloadingResolver), complete_unloading_partially_1.completeUnloadingPartiallyResolver);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/index.ts"],"names":[],"mappings":";;;AAAA,6DAAgE;AAChE,iFAAkF;AAClF,6DAAgE;AAChE,iFAAmF;AACnF,+DAAiE;AACjE,qDAAwD;AACxD,qCAAyC;AAE5B,QAAA,SAAS,yGACjB,8CAAyB,GACzB,+CAAyB,GACzB,uBAAc,GACd,sCAAqB,GACrB,gEAAiC,GACjC,8CAAyB,GACzB,iEAAkC,EACtC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/index.ts"],"names":[],"mappings":";;;AAAA,6DAAgE;AAChE,iFAAkF;AAClF,6DAAgE;AAChE,iFAAmF;AACnF,+DAAiE;AACjE,2EAA4E;AAC5E,2EAA4E;AAC5E,qDAAwD;AACxD,qCAAyC;AAE5B,QAAA,SAAS,qIACjB,8CAAyB,GACzB,+CAAyB,GACzB,0DAA8B,GAC9B,uBAAc,GACd,sCAAqB,GACrB,0DAA8B,GAC9B,gEAAiC,GACjC,8CAAyB,GACzB,iEAAkC,EACtC"}

package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scanSerialNumberUnloadResolver = void 0;
+const controllers_1 = require("../../../../controllers");
+exports.scanSerialNumberUnloadResolver = {
+    async scanSerialNumberUnload(_, { worksheetDetailName, serialNumber, inventory }, context) {
+        const { tx, domain, user } = context.state;
+        await scanSerialNumberUnload(tx, domain, user, worksheetDetailName, serialNumber, inventory);
+    }
+};
+async function scanSerialNumberUnload(tx, domain, user, worksheetDetailName, serialNumber, inventory) {
+    const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
+    await worksheetController.scanSerialNumberUnload(worksheetDetailName, serialNumber, inventory);
+}
+//# sourceMappingURL=scan-serial-number-unload.js.map

package/dist-server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scan-serial-number-unload.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/scan-serial-number-unload.ts"],"names":[],"mappings":";;;AAMA,yDAAsE;AAEzD,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,OAAY;QACjG,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;IAC9F,CAAC;CACF,CAAA;AAED,KAAK,UAAU,sBAAsB,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,YAAoB,EACpB,SAA6B;IAE7B,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,YAAY,EAAE,SAAS,CAAC,CAAA;AAChG,CAAC"}

package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.undoSerialNumberUnloadResolver = void 0;
+const controllers_1 = require("../../../../controllers");
+exports.undoSerialNumberUnloadResolver = {
+    async undoSerialNumberUnload(_, { worksheetDetailName, inventoryItemId }, context) {
+        const { tx, domain, user } = context.state;
+        await undoSerialNumberUnload(tx, domain, user, worksheetDetailName, inventoryItemId);
+    }
+};
+async function undoSerialNumberUnload(tx, domain, user, worksheetDetailName, inventoryItemId) {
+    const worksheetController = new controllers_1.UnloadingWorksheetController(tx, domain, user);
+    await worksheetController.undoSerialNumberUnload(worksheetDetailName, inventoryItemId);
+}
+//# sourceMappingURL=undo-serial-number-unload.js.map

package/dist-server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"undo-serial-number-unload.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/undo-serial-number-unload.ts"],"names":[],"mappings":";;;AAKA,yDAAsE;AAEzD,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,sBAAsB,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,eAAe,EAAE,EAAE,OAAY;QACzF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,sBAAsB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAA;IACtF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,sBAAsB,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,eAAuB;IAEvB,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,eAAe,CAAC,CAAA;AACxF,CAAC"}

package/dist-server/graphql/resolvers/worksheet/unloading/unload.js.map

@@ -1 +1 @@
-{"version":3,"file":"unload.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/unload.ts"],"names":[],"mappings":";;;AAIA,yDAAsE;AAEzD,QAAA,cAAc,GAAG;IAC5B,KAAK,CAAC,MAAM,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,MAAM,CACnB,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,SAA6B,EAC7B,cAAsB;IAEtB,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;AAClF,CAAC"}
+{"version":3,"file":"unload.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/unloading/unload.ts"],"names":[],"mappings":";;;AAMA,yDAAsE;AAEzD,QAAA,cAAc,GAAG;IAC5B,KAAK,CAAC,MAAM,CAAC,CAAM,EAAE,EAAE,mBAAmB,EAAE,SAAS,EAAE,cAAc,EAAE,EAAE,OAAY;QACnF,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;IAChF,CAAC;CACF,CAAA;AAED,KAAK,UAAU,MAAM,CACnB,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,mBAA2B,EAC3B,SAA6B,EAC7B,cAAsB;IAEtB,MAAM,mBAAmB,GAAiC,IAAI,0CAA4B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAC5G,MAAM,mBAAmB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,EAAE,cAAc,CAAC,CAAA;AAClF,CAAC"}

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

@@ -50,6 +50,7 @@ exports.unloadingWorksheetResolver = {
         });
         return {
             worksheetInfo: {
+                arrivalNotice,
                 bizplaceName: customerBizplace.name,
                 partnerDomainId: customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.domain.id,
                 customerCompanyDomainId: customerCompanyDomain.id,
@@ -80,7 +81,8 @@ exports.unloadingWorksheetResolver = {
                     actualPackQty: targetProduct.actualPackQty,
                     remark: targetProduct.remark,
                     issue: productWSD.issue,
-                    status: productWSD.status
+                    status: productWSD.status,
+                    manufactureDate: targetProduct.manufactureDate ? new Date(targetProduct.manufactureDate) : null
                 };
             })
         };

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

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

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.worksheetsResolver = void 0;
 const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const shell_1 = require("@things-factory/shell");
@@ -82,6 +83,7 @@ exports.worksheetsResolver = {
             const releaseGoodCrossDockingParam = params.filters.find(param => param.name === 'crossDocking');
             const releaseGoodCourierOptionParam = params.filters.find(param => param.name === 'courierOption');
             const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'packingOption');
+            const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee');
             if (releaseGoodParam ||
                 releaseGoodRefNoParam ||
                 releaseGoodCrossDockingParam ||
@@ -190,6 +192,22 @@ exports.worksheetsResolver = {
                     });
                 }
             }
+            //find assignee
+            const assigneeParam = params.filters.find(param => param.name === 'assignee');
+            let assigneeFilter = [];
+            if (assigneeParam) {
+                params.filters.splice(params.filters.findIndex(item => item.name == 'assignee'), 1);
+                assigneeFilter.push(Object.assign(Object.assign({}, assigneeParam), { name: 'name' }));
+                const foundAssignee = await (0, typeorm_1.getRepository)(auth_base_1.User).find(Object.assign({}, (0, shell_1.convertListParams)({ filters: assigneeFilter })));
+                if (foundAssignee) {
+                    params.filters.push({
+                        name: 'assigneeId',
+                        operator: 'in',
+                        value: foundAssignee.map((foundIC) => foundIC.id),
+                        relation: false
+                    });
+                }
+            }
             ////Set default bizplace filter
             const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
             if (!bizplaceFilter && typeParam.value[0] !== constants_1.WORKSHEET_TYPE.BATCH_PICKING) {