@things-factory/operato-wms 4.3.752 → 4.3.755

package/dist-server/graphql/resolvers/outbound/sort-item.js

@@ -3,8 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortItem = void 0;
 const typeorm_1 = require("typeorm");
 const sales_base_1 = require("@things-factory/sales-base");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
+/**
+ * Calculates the available quantity that can still be sorted for an order inventory
+ */
+function getAvailableQty(oi) {
+    const available = Math.min(oi.releaseQty, oi.pickedQty) - oi.sortedQty;
+    return available > 0 ? available : 0;
+}
+/**
+ * Creates or updates an order tote item with the given quantity
+ */
+async function upsertOrderToteItem(tx, domain, user, orderTote, orderInventory, qtyToAdd) {
+    var _a;
+    const orderToteItemRepo = tx.getRepository(sales_base_1.OrderToteItem);
+    const existingItem = (await orderToteItemRepo.findOne({
+        where: {
+            domain,
+            orderTote,
+            orderInventory,
+            orderProduct: orderInventory.orderProduct
+        }
+    }));
+    if (!existingItem) {
+        await orderToteItemRepo.save({
+            domain,
+            name: sales_base_1.OrderNoGenerator.orderToteItem(),
+            orderTote,
+            orderInventory,
+            orderProduct: orderInventory.orderProduct,
+            qty: qtyToAdd,
+            updater: user
+        });
+    }
+    else {
+        await orderToteItemRepo.update(existingItem.id, {
+            qty: Number((_a = existingItem.qty) !== null && _a !== void 0 ? _a : 0) + qtyToAdd,
+            updater: user,
+            updatedAt: new Date()
+        });
+    }
+}
 exports.sortItem = {
-    async sortItem(_, { releaseGoodNo, productBarcode, qty, worksheetDetails }, context) {
+    async sortItem(_, { releaseGoodNo, productBarcode, qty, worksheetDetails, toteNo }, context) {
         const { domain, user, tx } = context.state;
         // Single query to get order inventories based on either releaseGood name or binLocation
         const orderInventories = await tx
@@ -12,20 +53,17 @@ exports.sortItem = {
             .createQueryBuilder('orderInventory')
             .innerJoinAndSelect('orderInventory.productDetail', 'productDetail')
             .innerJoinAndSelect('productDetail.productBarcodes', 'productBarcode')
+            .leftJoinAndSelect('orderInventory.orderProduct', 'orderProduct')
             .leftJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
+            .leftJoinAndSelect('releaseGood.bizplace', 'bizplace')
             .leftJoinAndSelect('orderInventory.binLocation', 'binLocation')
             .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
             .andWhere('orderInventory.status IN (:...statuses)', {
-            statuses: [
-                sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
-                sales_base_1.ORDER_INVENTORY_STATUS.LOADING
-            ]
+            statuses: [sales_base_1.ORDER_INVENTORY_STATUS.SORTING, sales_base_1.ORDER_INVENTORY_STATUS.LOADING]
         })
             .andWhere('productBarcode.gtin = :gtin', { gtin: productBarcode })
             .andWhere(new typeorm_1.Brackets(qb => {
-            qb
-                .where('orderInventory.sortedQty < orderInventory.pickedQty')
-                .andWhere('orderInventory.sortedQty < orderInventory.releaseQty');
+            qb.where('orderInventory.sortedQty < orderInventory.pickedQty').andWhere('orderInventory.sortedQty < orderInventory.releaseQty');
         }))
             .andWhere(new typeorm_1.Brackets(qb => {
             qb.where('releaseGood.name = :releaseGoodNo', { releaseGoodNo }).orWhere('binLocation.name = :releaseGoodNo', { releaseGoodNo });
@@ -33,11 +71,49 @@ exports.sortItem = {
             .getMany();
         if (!orderInventories.length)
             throw new Error('No matching product barcode found');
-        // Calculate total available quantity (minimum of releaseQty and pickedQty for each order inventory)
-        const totalAvailableQty = orderInventories.reduce((sum, oi) => {
-            const availableQty = Math.min(oi.releaseQty, oi.pickedQty) - oi.sortedQty;
-            return sum + (availableQty > 0 ? availableQty : 0);
-        }, 0);
+        let resolvedReleaseGood = null;
+        let resolvedOrderTote = null;
+        if (toteNo) {
+            // Ensure we can identify a single release order when scanning by BIN
+            const uniqueReleaseGoodIds = [...new Set(orderInventories.map(oi => oi.releaseGoodId).filter(Boolean))];
+            if (uniqueReleaseGoodIds.length > 1) {
+                throw new Error('Multiple release orders detected. Please select a release order before tote scanning.');
+            }
+            resolvedReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+                where: { domain, id: uniqueReleaseGoodIds[0] },
+                relations: ['bizplace']
+            });
+            if (!resolvedReleaseGood) {
+                throw new Error('Release good not found for tote scanning');
+            }
+            resolvedOrderTote = await tx.getRepository(sales_base_1.OrderTote).findOne({
+                where: { domain, name: toteNo, releaseGood: resolvedReleaseGood }
+            });
+            if (!resolvedOrderTote) {
+                // Query for valid totes (NOT dispatched or damaged)
+                const foundTote = await tx.getRepository(warehouse_base_1.Tote).findOne({
+                    where: {
+                        bizplace: resolvedReleaseGood.bizplace,
+                        name: toteNo,
+                        deletedAt: (0, typeorm_1.IsNull)(),
+                        status: (0, typeorm_1.Not)((0, typeorm_1.In)([warehouse_base_1.TOTE_STATUS.DISPATCHED, warehouse_base_1.TOTE_STATUS.DAMAGED]))
+                    }
+                });
+                resolvedOrderTote = await tx.getRepository(sales_base_1.OrderTote).save({
+                    name: toteNo,
+                    domain,
+                    releaseGood: resolvedReleaseGood,
+                    tote: foundTote !== null && foundTote !== void 0 ? foundTote : null,
+                    creator: user,
+                    updater: user
+                });
+            }
+            else if (resolvedOrderTote.closedDate) {
+                throw new Error('Tote has been sealed, please try another tote!');
+            }
+        }
+        // Calculate total available quantity using helper function
+        const totalAvailableQty = orderInventories.reduce((sum, oi) => sum + getAvailableQty(oi), 0);
         if (qty > totalAvailableQty) {
             throw new Error(`Sort qty (${qty}) exceeds total available quantity (${totalAvailableQty})`);
         }
@@ -46,18 +122,21 @@ exports.sortItem = {
         for (const orderInventory of orderInventories) {
             if (remainingQty <= 0)
                 break;
-            const availableQty = Math.min(orderInventory.releaseQty, orderInventory.pickedQty) - orderInventory.sortedQty;
+            const availableQty = getAvailableQty(orderInventory);
             if (availableQty <= 0)
                 continue;
             const qtyToAdd = Math.min(remainingQty, availableQty);
-            const newSortQty = orderInventory.sortedQty + qtyToAdd;
             // Update the order inventory
             await tx.getRepository(sales_base_1.OrderInventory).update(orderInventory.id, {
-                sortedQty: newSortQty,
+                sortedQty: orderInventory.sortedQty + qtyToAdd,
                 status: sales_base_1.ORDER_INVENTORY_STATUS.LOADING,
                 updatedAt: new Date(),
                 updater: user
             });
+            // Create / update order tote items to reflect tote allocation during QC
+            if (resolvedOrderTote) {
+                await upsertOrderToteItem(tx, domain, user, resolvedOrderTote, orderInventory, qtyToAdd);
+            }
             remainingQty -= qtyToAdd;
         }
         return true;

package/dist-server/graphql/resolvers/outbound/sort-item.js.map

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

package/dist-server/graphql/resolvers/route-label/index.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Mutation = exports.Query = void 0;
+const route_label_1 = require("./route-label");
+exports.Query = Object.assign(Object.assign(Object.assign({}, route_label_1.routeLabelReleaseGoodsInExecutingWorksheet), route_label_1.routeLabelSequenceStatuses), route_label_1.routeLabelSequenceLogs);
+exports.Mutation = Object.assign({}, route_label_1.reserveRouteLabelSequence);
+//# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/route-label/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/route-label/index.ts"],"names":[],"mappings":";;;AAAA,+CAKsB;AAET,QAAA,KAAK,iDACb,wDAA0C,GAC1C,wCAA0B,GAC1B,oCAAsB,EAC1B;AAEY,QAAA,QAAQ,qBAChB,uCAAyB,EAC7B"}

package/dist-server/graphql/resolvers/route-label/route-label.js

@@ -0,0 +1,220 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.routeLabelSequenceLogs = exports.reserveRouteLabelSequence = exports.routeLabelSequenceStatuses = exports.routeLabelReleaseGoodsInExecutingWorksheet = void 0;
+const typeorm_1 = require("typeorm");
+const worksheet_base_1 = require("@things-factory/worksheet-base");
+const route_label_sequence_counter_1 = require("../../../entities/route-label-sequence-counter");
+const route_label_sequence_log_1 = require("../../../entities/route-label-sequence-log");
+function ensureSeqField(field) {
+    if (!['refNo', 'refNo2', 'refNo3'].includes(field)) {
+        throw new Error('Invalid sequence field. Allowed: refNo, refNo2, refNo3');
+    }
+}
+function parseNonNegativeInt(value) {
+    const n = parseInt(value !== null && value !== void 0 ? value : '0', 10);
+    return Number.isFinite(n) ? Math.max(0, n) : 0;
+}
+exports.routeLabelReleaseGoodsInExecutingWorksheet = {
+    async routeLabelReleaseGoodsInExecutingWorksheet(_, { partnerId, refNo, worksheetType, seqField }, context) {
+        const { domain, tx } = context.state;
+        let filterRefNo = '';
+        if (refNo) {
+            const removeSymbol = refNo
+                .split('')
+                .filter(res => res !== '%')
+                .join('');
+            const filterInfos = removeSymbol
+                .toLowerCase()
+                .split(',')
+                .map(value => "'%" + value.trim().replace(/'/g, "''") + "%'")
+                .join(',');
+            filterRefNo = ` and (
+        lower(rg.ref_no) like any(array[${filterInfos}])
+        or lower(rg.ref_no_2) like any(array[${filterInfos}])
+        or lower(rg.ref_no_3) like any(array[${filterInfos}])
+      )`;
+        }
+        const rows = await tx.query(`
+      select distinct
+        rg.id as "id",
+        rg.name as "name",
+        rg.ref_no as "refNo",
+        rg.ref_no_2 as "refNo2",
+        rg.ref_no_3 as "refNo3",
+        rg.route_id as "routeId",
+        rg.store_id as "storeId",
+        rg.store_name as "storeName",
+        rg.stop_id as "stopId",
+        rg.created_at as "createdAt"
+      from worksheets ws
+      inner join worksheet_details wsd on wsd.worksheet_id = ws.id
+      inner join order_inventories oi on oi.id = wsd.target_inventory_id
+      inner join release_goods rg on rg.id = oi.release_good_id
+      where ws.domain_id = $1
+        and ws.type = $2
+        and ws.status = $3
+        and rg.domain_id = $1
+        and rg.bizplace_id = $4
+        ${filterRefNo}
+      order by rg.created_at desc
+      `, [domain.id, worksheetType, worksheet_base_1.WORKSHEET_STATUS.EXECUTING, partnerId]);
+        const releaseGoods = rows || [];
+        // If seqField is provided, fetch and merge sequence data
+        if (seqField && ['refNo', 'refNo2', 'refNo3'].includes(seqField) && releaseGoods.length > 0) {
+            const releaseGoodIds = releaseGoods.map((rg) => rg.id);
+            // Fetch lastSeq from counters
+            const lastSeqById = new Map();
+            const counterRepo = tx.getRepository(route_label_sequence_counter_1.RouteLabelSequenceCounter);
+            const counters = await counterRepo.find({
+                where: { domain, releaseGoodId: (0, typeorm_1.In)(releaseGoodIds), field: seqField }
+            });
+            for (const c of counters) {
+                lastSeqById.set(c.releaseGoodId, parseNonNegativeInt(c.lastSeq));
+            }
+            // Fetch lastPrintedBy from logs (most recent per releaseGood)
+            const lastPrintedById = new Map();
+            const logRepo = tx.getRepository(route_label_sequence_log_1.RouteLabelSequenceLog);
+            const logs = await logRepo.find({
+                where: { domain, releaseGoodId: (0, typeorm_1.In)(releaseGoodIds), field: seqField },
+                relations: ['creator'],
+                order: { createdAt: 'DESC' },
+                take: 500
+            });
+            for (const log of logs) {
+                if (!lastPrintedById.has(log.releaseGoodId) && log.creator) {
+                    lastPrintedById.set(log.releaseGoodId, log.creator.name || '');
+                }
+            }
+            // Merge sequence data into release goods
+            return releaseGoods.map((rg) => (Object.assign(Object.assign({}, rg), { lastSeq: lastSeqById.get(rg.id) || 0, lastPrintedBy: lastPrintedById.get(rg.id) || null })));
+        }
+        return releaseGoods;
+    }
+};
+exports.routeLabelSequenceStatuses = {
+    async routeLabelSequenceStatuses(_, { releaseGoodIds, field }, context) {
+        const { domain, tx } = context.state;
+        ensureSeqField(field);
+        const lastSeqById = new Map();
+        const counterRepo = tx.getRepository(route_label_sequence_counter_1.RouteLabelSequenceCounter);
+        const counters = await counterRepo.find({
+            where: { domain, releaseGoodId: (0, typeorm_1.In)(releaseGoodIds), field }
+        });
+        for (const c of counters) {
+            lastSeqById.set(c.releaseGoodId, parseNonNegativeInt(c.lastSeq));
+        }
+        const histById = new Map();
+        const lastPrintedById = new Map();
+        const logRepo = tx.getRepository(route_label_sequence_log_1.RouteLabelSequenceLog);
+        const logs = await logRepo.find({
+            where: { domain, releaseGoodId: (0, typeorm_1.In)(releaseGoodIds), field },
+            relations: ['creator'],
+            order: { createdAt: 'DESC' },
+            take: 500
+        });
+        for (const log of logs) {
+            const list = histById.get(log.releaseGoodId) || [];
+            if (list.length >= 5)
+                continue;
+            list.push(`${log.from}-${log.to}`);
+            histById.set(log.releaseGoodId, list);
+            // Store the creator name from the most recent log entry (first one due to DESC order)
+            if (!lastPrintedById.has(log.releaseGoodId) && log.creator) {
+                lastPrintedById.set(log.releaseGoodId, log.creator.name || '');
+            }
+        }
+        return releaseGoodIds.map((releaseGoodId) => {
+            return {
+                releaseGoodId,
+                field,
+                lastSeq: lastSeqById.get(releaseGoodId) || 0,
+                history: histById.get(releaseGoodId) || [],
+                lastPrintedBy: lastPrintedById.get(releaseGoodId) || null
+            };
+        });
+    }
+};
+exports.reserveRouteLabelSequence = {
+    async reserveRouteLabelSequence(_, { releaseGoodId, field, qty }, context) {
+        const { domain, tx, user } = context.state;
+        ensureSeqField(field);
+        const q = parseNonNegativeInt(qty);
+        if (q <= 0) {
+            throw new Error('Print qty must be greater than 0');
+        }
+        const counterRepo = tx.getRepository(route_label_sequence_counter_1.RouteLabelSequenceCounter);
+        const logRepo = tx.getRepository(route_label_sequence_log_1.RouteLabelSequenceLog);
+        // Lock counter row to avoid duplicated sequences under concurrent prints.
+        let counter = await counterRepo
+            .createQueryBuilder('c')
+            .setLock('pessimistic_write')
+            .where('c.domain = :domainId and c.releaseGoodId = :releaseGoodId and c.field = :field', {
+            domainId: domain.id,
+            releaseGoodId,
+            field
+        })
+            .getOne();
+        if (!counter) {
+            try {
+                await counterRepo.save({
+                    domain,
+                    releaseGoodId,
+                    field,
+                    lastSeq: 0,
+                    creator: user,
+                    updater: user
+                });
+            }
+            catch (e) {
+                // ignore: concurrent insert can violate unique index
+            }
+            counter = await counterRepo
+                .createQueryBuilder('c')
+                .setLock('pessimistic_write')
+                .where('c.domain = :domainId and c.releaseGoodId = :releaseGoodId and c.field = :field', {
+                domainId: domain.id,
+                releaseGoodId,
+                field
+            })
+                .getOne();
+        }
+        if (!counter) {
+            throw new Error('Failed to initialize route label sequence counter');
+        }
+        const last = parseNonNegativeInt(counter.lastSeq);
+        const from = last + 1;
+        const to = last + q;
+        await counterRepo.update(counter.id, { lastSeq: to, updater: user, updatedAt: new Date() });
+        await logRepo.save({ domain, releaseGoodId, field, from, to, qty: q, creator: user });
+        return { releaseGoodId, field, from, to };
+    }
+};
+exports.routeLabelSequenceLogs = {
+    async routeLabelSequenceLogs(_, { releaseGoodId, field }, context) {
+        const { domain, tx } = context.state;
+        ensureSeqField(field);
+        const rows = (await tx.query(`
+        select
+          l.id as "id",
+          l.release_good_id as "releaseGoodId",
+          l.field as "field",
+          l."from" as "from",
+          l."to" as "to",
+          l.qty as "qty",
+          l.created_at as "createdAt",
+          u.name as "creatorName"
+        from route_label_sequence_logs l
+        left join users u on u.id = l.creator_id
+        where l.domain_id = $1
+          and l.release_good_id = $2
+          and l.field = $3
+        order by l.created_at desc
+        limit 200
+        `, [domain.id, releaseGoodId, field])) || [];
+        return rows.map((row) => {
+            const createdAt = row.createdAt ? new Date(row.createdAt) : null;
+            return Object.assign(Object.assign({}, row), { createdAt: createdAt ? createdAt.toISOString() : null });
+        });
+    }
+};
+//# sourceMappingURL=route-label.js.map

package/dist-server/graphql/resolvers/route-label/route-label.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/index.ts"],"names":[],"mappings":";;;AAAA,qDAA8E;AAC9E,uEAAyE;AACzE,uEAA0G;AAC1G,iDAA4C;AAC5C,mDAA8C;AAC9C,mEAA4D;AAE/C,QAAA,KAAK,mCACb,sCAAqB,GACrB,qCAAoB,EACxB;AAEY,QAAA,QAAQ,2FAChB,sDAA4B,GAC5B,sDAA4B,GAC5B,0DAAgC,GAChC,0BAAW,GACX,4BAAY,GACZ,0CAAkB,EACtB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/zone-worksheet/index.ts"],"names":[],"mappings":";;;AAAA,qDAA8E;AAC9E,uEAAwE;AACxE,uEAA0G;AAC1G,iDAA4C;AAC5C,mDAA8C;AAC9C,mEAA4D;AAE/C,QAAA,KAAK,mCACb,sCAAqB,GACrB,qCAAoB,EACxB;AAEY,QAAA,QAAQ,2FAChB,sDAA4B,GAC5B,sDAA4B,GAC5B,0DAAgC,GAChC,0BAAW,GACX,4BAAY,GACZ,0CAAkB,EACtB"}

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

@@ -6,6 +6,7 @@ const worksheet_base_1 = require("@things-factory/worksheet-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const product_base_1 = require("@things-factory/product-base");
+const setting_base_1 = require("@things-factory/setting-base");
 const uuid_1 = require("uuid");
 exports.zonePicking = {
     async scanProductZonePicking(_, { worksheetId, cartonId, productBarcode, binNo, pickingQty }, context) {
@@ -244,11 +245,51 @@ async function completeZonePicking(worksheetId, context, isPartial) {
         });
     }
     else if (!isPartial) {
-        await tx.getRepository(sales_base_1.ReleaseGood).update({ id: (0, typeorm_1.In)(roIds), status: sales_base_1.ORDER_STATUS.PARTIAL_PROCESSING }, {
-            status: sales_base_1.ORDER_STATUS.PROCESSING,
-            updater: user,
-            updatedAt: new Date()
+        // When completing fully, check if all OrderInventories for each ReleaseGood are actually completed
+        // Only update from PARTIAL_PROCESSING to PROCESSING if all OrderInventories are completed
+        const releaseGoods = await tx.getRepository(sales_base_1.ReleaseGood).find({
+            where: { id: (0, typeorm_1.In)(roIds) },
+            relations: ['orderInventories']
         });
+        const completedRoIds = [];
+        const incompleteRoIds = [];
+        for (const rg of releaseGoods) {
+            // Check if all OrderInventories are in a completed state (not PROCESSING)
+            const completedStatuses = [
+                sales_base_1.ORDER_INVENTORY_STATUS.PICKED,
+                sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
+                sales_base_1.ORDER_INVENTORY_STATUS.LOADING,
+                sales_base_1.ORDER_INVENTORY_STATUS.LOADED,
+                sales_base_1.ORDER_INVENTORY_STATUS.TERMINATED,
+                sales_base_1.ORDER_INVENTORY_STATUS.MISSING,
+                sales_base_1.ORDER_INVENTORY_STATUS.CANCELLED
+            ];
+            const allCompleted = rg.orderInventories.every(oi => completedStatuses.includes(oi.status));
+            if (allCompleted) {
+                completedRoIds.push(rg.id);
+            }
+            else {
+                incompleteRoIds.push(rg.id);
+            }
+        }
+        // Update ReleaseGoods that are fully completed from PARTIAL_PROCESSING to PROCESSING
+        if (completedRoIds.length > 0) {
+            await tx.getRepository(sales_base_1.ReleaseGood).update({ id: (0, typeorm_1.In)(completedRoIds), status: sales_base_1.ORDER_STATUS.PARTIAL_PROCESSING }, {
+                status: sales_base_1.ORDER_STATUS.PROCESSING,
+                updater: user,
+                updatedAt: new Date()
+            });
+        }
+        // For ReleaseGoods that still have incomplete OrderInventories:
+        // - If they're in PROCESSING, update to PARTIAL_PROCESSING
+        // - If they're already in PARTIAL_PROCESSING, leave them as is
+        if (incompleteRoIds.length > 0) {
+            await tx.getRepository(sales_base_1.ReleaseGood).update({ id: (0, typeorm_1.In)(incompleteRoIds), status: sales_base_1.ORDER_STATUS.PROCESSING }, {
+                status: sales_base_1.ORDER_STATUS.PARTIAL_PROCESSING,
+                updater: user,
+                updatedAt: new Date()
+            });
+        }
     }
     //find exist loading worksheet
     const existLoadingWorksheet = await tx
@@ -261,31 +302,67 @@ async function completeZonePicking(worksheetId, context, isPartial) {
         .getMany();
     let roWithoutLoadingWorksheet = roIds.filter(roId => !existLoadingWorksheet.some(ws => ws.releaseGood.id === roId));
     let roWithLoadingWorksheet = roIds.filter(roId => existLoadingWorksheet.some(ws => ws.releaseGood.id === roId));
+    // Get disable-QC-in-loading setting
+    const disableQcSetting = await tx.getRepository(setting_base_1.Setting).findOne({
+        where: {
+            domain,
+            name: 'disable-QC-in-loading'
+        }
+    });
+    const disableQc = (disableQcSetting === null || disableQcSetting === void 0 ? void 0 : disableQcSetting.value) === 'true';
     if (roWithoutLoadingWorksheet.length > 0) {
-        await generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet);
+        await generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet, disableQc);
     }
     if (roWithLoadingWorksheet.length > 0) {
-        //update picked oi to loading
-        await tx.getRepository(sales_base_1.OrderInventory).update({ releaseGood: (0, typeorm_1.In)(roWithLoadingWorksheet), status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED }, {
-            status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
-            updater: user,
-            updatedAt: new Date()
-        });
-        const loadingOrderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
-            where: { releaseGood: (0, typeorm_1.In)(roWithLoadingWorksheet), status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING }
-        });
-        //update loading wsd deactivated to executing
-        await tx.getRepository(worksheet_base_1.WorksheetDetail).update({
-            targetInventory: (0, typeorm_1.In)(loadingOrderInventories.map(oi => oi.id)),
-            type: worksheet_base_1.WORKSHEET_TYPE.LOADING,
-            status: worksheet_base_1.WORKSHEET_STATUS.DEACTIVATED
-        }, { status: worksheet_base_1.WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user });
+        if (disableQc) {
+            // When QC is disabled: update PICKED to LOADING status and set sortedQty = pickedQty automatically
+            // Use query builder with raw SQL to set sortedQty = pickedQty in a single update
+            await tx
+                .getRepository(sales_base_1.OrderInventory)
+                .createQueryBuilder()
+                .update(sales_base_1.OrderInventory)
+                .set({
+                status: sales_base_1.ORDER_INVENTORY_STATUS.LOADING,
+                sortedQty: () => '"picked_qty"',
+                updater: user,
+                updatedAt: new Date()
+            })
+                .where('release_good_id IN (:...roIds)', { roIds: roWithLoadingWorksheet })
+                .andWhere('status = :status', { status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED })
+                .execute();
+            const loadingOrderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
+                where: { releaseGood: (0, typeorm_1.In)(roWithLoadingWorksheet), status: sales_base_1.ORDER_INVENTORY_STATUS.LOADING }
+            });
+            //update loading wsd deactivated to executing
+            await tx.getRepository(worksheet_base_1.WorksheetDetail).update({
+                targetInventory: (0, typeorm_1.In)(loadingOrderInventories.map(oi => oi.id)),
+                type: worksheet_base_1.WORKSHEET_TYPE.LOADING,
+                status: worksheet_base_1.WORKSHEET_STATUS.DEACTIVATED
+            }, { status: worksheet_base_1.WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user });
+        }
+        else {
+            // When QC is enabled: update PICKED to SORTING status (existing behavior)
+            await tx.getRepository(sales_base_1.OrderInventory).update({ releaseGood: (0, typeorm_1.In)(roWithLoadingWorksheet), status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED }, {
+                status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
+                updater: user,
+                updatedAt: new Date()
+            });
+            const loadingOrderInventories = await tx.getRepository(sales_base_1.OrderInventory).find({
+                where: { releaseGood: (0, typeorm_1.In)(roWithLoadingWorksheet), status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING }
+            });
+            //update loading wsd deactivated to executing
+            await tx.getRepository(worksheet_base_1.WorksheetDetail).update({
+                targetInventory: (0, typeorm_1.In)(loadingOrderInventories.map(oi => oi.id)),
+                type: worksheet_base_1.WORKSHEET_TYPE.LOADING,
+                status: worksheet_base_1.WORKSHEET_STATUS.DEACTIVATED
+            }, { status: worksheet_base_1.WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user });
+        }
     }
     const wsStatus = isPartial ? worksheet_base_1.WORKSHEET_STATUS.PARTIAL_EXECUTING : worksheet_base_1.WORKSHEET_STATUS.DONE;
     await updateWorksheetsAndDetails(tx, worksheet, worksheetDetails, wsStatus, user);
     return true;
 }
-async function generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet) {
+async function generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet, disableQc) {
     const releaseGoods = await tx.getRepository(sales_base_1.ReleaseGood).find({
         where: { id: (0, typeorm_1.In)(roWithoutLoadingWorksheet), status: (0, typeorm_1.Not)((0, typeorm_1.In)(sales_base_1.ORDER_STATUS.OBSOLETE)) },
         relations: ['orderInventories', 'sortedBy']
@@ -320,12 +397,31 @@ async function generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorks
             };
         });
         await tx.getRepository(worksheet_base_1.WorksheetDetail).insert(loadingWorksheetDetails);
-        //update picked oi to loading
-        await tx.getRepository(sales_base_1.OrderInventory).update({ id: (0, typeorm_1.In)(orderInventories.map(oi => oi.id)), status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED }, {
-            status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
-            updater: user,
-            updatedAt: new Date()
-        });
+        // Update picked OrderInventories based on disableQc setting
+        if (disableQc) {
+            // When QC is disabled: update PICKED to LOADING status and set sortedQty = pickedQty automatically
+            await tx
+                .getRepository(sales_base_1.OrderInventory)
+                .createQueryBuilder()
+                .update(sales_base_1.OrderInventory)
+                .set({
+                status: sales_base_1.ORDER_INVENTORY_STATUS.LOADING,
+                sortedQty: () => '"picked_qty"',
+                updater: user,
+                updatedAt: new Date()
+            })
+                .where('id IN (:...oiIds)', { oiIds: orderInventories.map(oi => oi.id) })
+                .andWhere('status = :status', { status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED })
+                .execute();
+        }
+        else {
+            // When QC is enabled: update PICKED to SORTING status (existing behavior)
+            await tx.getRepository(sales_base_1.OrderInventory).update({ id: (0, typeorm_1.In)(orderInventories.map(oi => oi.id)), status: sales_base_1.ORDER_INVENTORY_STATUS.PICKED }, {
+                status: sales_base_1.ORDER_INVENTORY_STATUS.SORTING,
+                updater: user,
+                updatedAt: new Date()
+            });
+        }
     }
 }
 async function updateWorksheetsAndDetails(tx, worksheet, worksheetDetails, status, updater) {