@things-factory/worksheet-base 4.3.770 → 4.3.772

package/dist-server/controllers/outbound/picking-worksheet-controller.js

@@ -616,10 +616,27 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             newTargetInventory.creator = this.user;
             newTargetInventory.updater = this.user;
             newTargetInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(newTargetInventory);
-            // Update locked qty and uomValue of inventory
-            inventory.lockedQty = targetInventory.releaseQty + (inventory.lockedQty || 0);
-            inventory.lockedUomValue = targetInventory.releaseUomValue + (inventory.lockedUomValue || 0);
-            await this.updateInventory(inventory);
+            // Atomic update of locked qty and uomValue of inventory
+            const lockResult = await this.trxMgr
+                .getRepository(warehouse_base_1.Inventory)
+                .createQueryBuilder()
+                .update(warehouse_base_1.Inventory)
+                .set({
+                lockedQty: () => `COALESCE("locked_qty", 0) + :releaseQty::numeric`,
+                lockedUomValue: () => `COALESCE("locked_uom_value", 0) + :releaseUomValue::numeric`,
+                updater: this.user,
+                updatedAt: new Date()
+            })
+                .setParameter('releaseQty', targetInventory.releaseQty)
+                .setParameter('releaseUomValue', targetInventory.releaseUomValue)
+                .where('id = :id AND qty >= COALESCE(locked_qty, 0) + :newQty', {
+                id: inventory.id,
+                newQty: targetInventory.releaseQty
+            })
+                .execute();
+            if (lockResult.affected === 0) {
+                throw new Error(`Insufficient inventory for picking assignment`);
+            }
             // Create worksheet details
             await this.createWorksheetDetails(worksheet, constants_1.WORKSHEET_TYPE.PICKING, [newTargetInventory]);
         }
@@ -639,12 +656,21 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             worksheetDetailIds.push(worksheetDetail.id);
             const targetInventory = worksheetDetail.targetInventory;
             targetInventoryIds.push(targetInventory.id);
-            let inventory = await this.trxMgr
+            // Atomic update of locked qty and uomValue of inventory
+            await this.trxMgr
                 .getRepository(warehouse_base_1.Inventory)
-                .findOne({ where: { id: worksheetDetail.targetInventory.inventory.id } });
-            inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty;
-            inventory.lockedUomValue = inventory.lockedUomValue - targetInventory.releaseUomValue;
-            await this.updateInventory(inventory);
+                .createQueryBuilder()
+                .update(warehouse_base_1.Inventory)
+                .set({
+                lockedQty: () => `GREATEST(COALESCE("locked_qty", 0) - :releaseQty::numeric, 0)`,
+                lockedUomValue: () => `GREATEST(COALESCE("locked_uom_value", 0) - :releaseUomValue::numeric, 0)`,
+                updater: this.user,
+                updatedAt: new Date()
+            })
+                .setParameter('releaseQty', targetInventory.releaseQty)
+                .setParameter('releaseUomValue', targetInventory.releaseUomValue)
+                .where('id = :id', { id: worksheetDetail.targetInventory.inventory.id })
+                .execute();
             await this.trxMgr
                 .getRepository(sales_base_1.OrderProduct)
                 .update({ id: targetInventory.orderProduct.id }, { status: sales_base_1.ORDER_PRODUCT_STATUS.PENDING_ASSIGN, updater: this.user });
@@ -770,6 +796,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 pickedQty = matchingProduct.qty;
                 pickedUomValue = matchingProduct.uomValue;
             }
+            // validation to prevent decimal quantities for non-decimal products
+            const scanPickProduct = await this.trxMgr.getRepository(product_base_1.Product).findOne({
+                where: { id: worksheetDetailInfos.productId }
+            });
+            if (pickedQty % 1 !== 0 && !(scanPickProduct === null || scanPickProduct === void 0 ? void 0 : scanPickProduct.isInventoryDecimal)) {
+                throw new Error('Decimal quantities are not allowed for this product');
+            }
             // //validation to prevent over release
             if (!targetInventory)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `inventory not assigned`));
@@ -834,13 +867,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             const releaseQty = targetInventory.releaseQty;
             targetInventory.pickedQty = ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.pickedQty) || 0) + pickedQty;
             let updateOiObj = {
-                pickedQty: () => `"picked_qty" + ${pickedQty}`,
+                pickedQty: () => `"picked_qty" + :pickedQty`,
                 updatedAt: new Date(),
                 updater: this.user,
                 pickedBy: this.user.name,
                 pickedByUser: this.user,
                 pickedAt: new Date(),
-                status: () => `case when release_qty = "picked_qty" + ${pickedQty} then '${sales_base_1.ORDER_INVENTORY_STATUS.PICKED}' else status end`
+                status: () => `case when release_qty = "picked_qty" + :pickedQty then '${sales_base_1.ORDER_INVENTORY_STATUS.PICKED}' else status end`
             };
             if (targetInventory.binLocation) {
                 updateOiObj['binLocation'] = targetInventory.binLocation;
@@ -850,6 +883,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .createQueryBuilder()
                 .update(sales_base_1.OrderInventory)
                 .set(updateOiObj)
+                .setParameter('pickedQty', pickedQty)
                 .where({ id: targetInventory.id })
                 .andWhere(`picked_qty + :pickedQty <= release_qty`, { pickedQty })
                 .execute();
@@ -870,11 +904,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             .execute();
                         let releaseUomValue = Math.trunc((pickedUomValue / pickedQty) * releaseQty * 1000) / 1000;
                         let updateInvObj = {
-                            qty: () => `"qty" - ${releaseQty}`,
-                            lockedQty: () => `"locked_qty" - ${releaseQty}`,
-                            uomValue: () => `"uom_value" - ${releaseUomValue}`,
-                            lockedUomValue: () => `"locked_uom_value" - ${releaseUomValue}`,
-                            status: () => `case when "qty" - ${releaseQty} <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
+                            qty: () => `"qty" - :deductQty::numeric`,
+                            lockedQty: () => `GREATEST("locked_qty" - :deductQty::numeric, 0)`,
+                            uomValue: () => `"uom_value" - :deductUomValue::numeric`,
+                            lockedUomValue: () => `GREATEST("locked_uom_value" - :deductUomValue::numeric, 0)`,
+                            status: () => `case when "qty" - :deductQty::numeric <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
                             updater: this.user,
                             updatedAt: new Date()
                         };
@@ -883,6 +917,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             .createQueryBuilder()
                             .update(warehouse_base_1.Inventory)
                             .set(updateInvObj)
+                            .setParameter('deductQty', releaseQty)
+                            .setParameter('deductUomValue', releaseUomValue)
                             .where('id = :id', { id: worksheetDetailInfos.inventoryId })
                             .returning(['qty'])
                             .execute();
@@ -960,6 +996,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             });
             if (!oiValidate)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`));
+            // validation to prevent decimal quantities for non-decimal products
+            if (pickedQty % 1 !== 0 && !product.isInventoryDecimal) {
+                throw new Error('Decimal quantities are not allowed for this product');
+            }
             //validation to prevent over release
             if (inventory.qty <= 0)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
@@ -1048,10 +1088,18 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 if (!toLocation)
                     throw new Error(this.ERROR_MSG.FIND.NO_RESULT(locationName));
                 if (fromLocation.id !== toLocation.id) {
+                    await this.trxMgr
+                        .getRepository(warehouse_base_1.Inventory)
+                        .update({ id: inventory.id }, {
+                        location: toLocation,
+                        warehouse: toLocation.warehouse,
+                        zone: toLocation.zone,
+                        updater: this.user
+                    });
                     inventory.location = toLocation;
                     inventory.warehouse = toLocation.warehouse;
                     inventory.zone = toLocation.zone;
-                    inventory = await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.RELOCATE);
+                    await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.RELOCATE, 0, 0, this.user, this.trxMgr);
                 }
             }
         }
@@ -1089,6 +1137,15 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             .reduce((a, b) => a + b, 0);
         if (sumOfReleaseQty != releaseQty)
             throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `insufficient picking quantity`));
+        // validation to prevent decimal quantities for non-decimal products
+        if (targetInventories.length > 0) {
+            const batchPickProduct = await this.trxMgr.getRepository(product_base_1.Product).findOne({
+                where: { id: targetInventories[0].productId }
+            });
+            if (releaseQty % 1 !== 0 && !(batchPickProduct === null || batchPickProduct === void 0 ? void 0 : batchPickProduct.isInventoryDecimal)) {
+                throw new Error('Decimal quantities are not allowed for this product');
+            }
+        }
         for (var i = 0; i < targetInventories.length; i++) {
             let targetInventory = targetInventories[i];
             let inventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).findOne({
@@ -1131,10 +1188,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
             await this.updateOrderTargets([targetInventory]);
             let updateInvObj = {
-                qty: () => `"qty" - ${targetInventory.releaseQty}`,
-                lockedQty: () => `"locked_qty" - ${targetInventory.releaseQty}`,
-                uomValue: () => `"uom_value" - ${targetInventory.releaseUomValue}`,
-                lockedUomValue: () => `"locked_uom_value" - ${targetInventory.releaseUomValue}`,
+                qty: () => `"qty" - :deductQty::numeric`,
+                lockedQty: () => `GREATEST("locked_qty" - :deductQty::numeric, 0)`,
+                uomValue: () => `"uom_value" - :deductUomValue::numeric`,
+                lockedUomValue: () => `GREATEST("locked_uom_value" - :deductUomValue::numeric, 0)`,
+                status: () => `case when "qty" - :deductQty::numeric <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
                 updater: this.user,
                 updatedAt: new Date()
             };
@@ -1143,6 +1201,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .createQueryBuilder()
                 .update(warehouse_base_1.Inventory)
                 .set(updateInvObj)
+                .setParameter('deductQty', targetInventory.releaseQty)
+                .setParameter('deductUomValue', targetInventory.releaseUomValue)
                 .where('id = :id', { id: targetInventory.inventory.id })
                 .returning(['qty'])
                 .execute();
@@ -1159,10 +1219,18 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 if (!toLocation)
                     throw new Error(this.ERROR_MSG.FIND.NO_RESULT(locationName));
                 if (fromLocation.id !== toLocation.id) {
+                    await this.trxMgr
+                        .getRepository(warehouse_base_1.Inventory)
+                        .update({ id: inventory.id }, {
+                        location: toLocation,
+                        warehouse: toLocation.warehouse,
+                        zone: toLocation.zone,
+                        updater: this.user
+                    });
                     inventory.location = toLocation;
                     inventory.warehouse = toLocation.warehouse;
                     inventory.zone = toLocation.zone;
-                    await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.RELOCATE);
+                    await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.RELOCATE, 0, 0, this.user, this.trxMgr);
                 }
             }
         }
@@ -1207,6 +1275,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             if (!matchingProduct)
                 throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
             pickedQty = matchingProduct.qty;
+            // validation to prevent decimal quantities for non-decimal products
+            if (pickedQty % 1 !== 0 && !(product === null || product === void 0 ? void 0 : product.isInventoryDecimal)) {
+                throw new Error('Decimal quantities are not allowed for this product');
+            }
             const sumOfReleaseQty = parseFloat(targetInventories
                 .map((oi) => oi.releaseQty)
                 .reduce((a, b) => a + b, 0)
@@ -1264,10 +1336,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
                         await this.updateOrderTargets([targetInventory]);
                         let updateInvObj = {
-                            qty: () => `"qty" - ${targetInventory.releaseQty}`,
-                            lockedQty: () => `"locked_qty" - ${targetInventory.releaseQty}`,
-                            uomValue: () => `"uom_value" - ${targetInventory.releaseUomValue}`,
-                            lockedUomValue: () => `"locked_uom_value" - ${targetInventory.releaseUomValue}`,
+                            qty: () => `"qty" - :deductQty::numeric`,
+                            lockedQty: () => `GREATEST("locked_qty" - :deductQty::numeric, 0)`,
+                            uomValue: () => `"uom_value" - :deductUomValue::numeric`,
+                            lockedUomValue: () => `GREATEST("locked_uom_value" - :deductUomValue::numeric, 0)`,
+                            status: () => `case when "qty" - :deductQty::numeric <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
                             updater: this.user,
                             updatedAt: new Date()
                         };
@@ -1276,6 +1349,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             .createQueryBuilder()
                             .update(warehouse_base_1.Inventory)
                             .set(updateInvObj)
+                            .setParameter('deductQty', targetInventory.releaseQty)
+                            .setParameter('deductUomValue', targetInventory.releaseUomValue)
                             .where('id = :id', { id: targetInventory.inventory.id })
                             .returning(['qty'])
                             .execute();
@@ -1490,6 +1565,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
     }
     async updatePickingTransaction(releaseGood, orderInventory, worksheetDetail, inventory, pickedQty) {
         var _a;
+        // validation to prevent decimal quantities for non-decimal products
+        const pickTxProduct = await this.trxMgr.getRepository(product_base_1.Product).findOne({
+            where: { id: orderInventory.productId }
+        });
+        if (pickedQty % 1 !== 0 && !(pickTxProduct === null || pickTxProduct === void 0 ? void 0 : pickTxProduct.isInventoryDecimal)) {
+            throw new Error('Decimal quantities are not allowed for this product');
+        }
         const releaseQty = orderInventory.releaseQty;
         orderInventory.pickedQty = ((orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.pickedQty) || 0) + pickedQty;
         if (orderInventory.pickedQty == releaseQty) {
@@ -1501,11 +1583,28 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             orderInventory.pickedBy = (_a = this.user) === null || _a === void 0 ? void 0 : _a.name;
             orderInventory.pickedByUser = this.user;
             orderInventory.pickedAt = new Date();
-            inventory.qty -= orderInventory.releaseQty;
-            inventory.uomValue = Math.round((inventory.uomValue - orderInventory.releaseUomValue) * 100) / 100;
-            inventory.lockedQty = inventory.lockedQty - orderInventory.releaseQty;
-            inventory.lockedUomValue = Math.round((inventory.lockedUomValue - orderInventory.releaseUomValue) * 100) / 100;
-            inventory = await this.transactionInventory(inventory, releaseGood, -orderInventory.releaseQty, -orderInventory.releaseUomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING);
+            // Atomic SQL update instead of stale-read pattern
+            await this.trxMgr
+                .getRepository(warehouse_base_1.Inventory)
+                .createQueryBuilder()
+                .update(warehouse_base_1.Inventory)
+                .set({
+                qty: () => `"qty" - :deductQty::numeric`,
+                uomValue: () => `"uom_value" - :deductUomValue::numeric`,
+                lockedQty: () => `GREATEST("locked_qty" - :deductQty::numeric, 0)`,
+                lockedUomValue: () => `GREATEST("locked_uom_value" - :deductUomValue::numeric, 0)`,
+                status: () => `case when "qty" - :deductQty::numeric <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
+                updater: this.user,
+                updatedAt: new Date()
+            })
+                .setParameter('deductQty', orderInventory.releaseQty)
+                .setParameter('deductUomValue', orderInventory.releaseUomValue)
+                .where('id = :id', { id: inventory.id })
+                .execute();
+            // Generate inventory history separately
+            await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -orderInventory.releaseQty, -orderInventory.releaseUomValue, this.user, this.trxMgr);
+            // Re-read inventory for downstream use (status check for TERMINATED)
+            inventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).findOne({ where: { id: inventory.id } });
             worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
             worksheetDetail.updater = this.user;
             await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
@@ -1879,7 +1978,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
     }
     async assignInventoriesForUnassignedOrder(worksheet, tx) {
-        var _a, _b, _c;
+        var _a;
         const releaseGood = worksheet.releaseGood;
         const orderProducts = releaseGood.orderProducts;
         let finalOrderInventories = [];
@@ -1912,19 +2011,35 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         for (let oi of finalOrderInventories) {
             // update inventory locked qty and uom value
             oi = await transaction.getRepository(sales_base_1.OrderInventory).save(Object.assign({}, oi));
-            await transaction.getRepository(warehouse_base_1.Inventory).update(oi.inventory.id, {
-                lockedQty: (((_b = oi.inventory) === null || _b === void 0 ? void 0 : _b.lockedQty) || 0) + oi.releaseQty,
-                lockedUomValue: (((_c = oi.inventory) === null || _c === void 0 ? void 0 : _c.lockedUomValue) || 0) + oi.releaseUomValue,
+            const lockResult = await transaction
+                .getRepository(warehouse_base_1.Inventory)
+                .createQueryBuilder()
+                .update(warehouse_base_1.Inventory)
+                .set({
+                lockedQty: () => `COALESCE("locked_qty", 0) + :releaseQty::numeric`,
+                lockedUomValue: () => `COALESCE("locked_uom_value", 0) + :releaseUomValue::numeric`,
                 updater: this.user
-            });
+            })
+                .setParameter('releaseQty', oi.releaseQty)
+                .setParameter('releaseUomValue', oi.releaseUomValue)
+                .where('id = :id AND qty >= COALESCE(locked_qty, 0) + :newQty', {
+                id: oi.inventory.id,
+                newQty: oi.releaseQty
+            })
+                .execute();
+            if (lockResult.affected === 0) {
+                throw new Error(`Insufficient inventory for picking assignment`);
+            }
             await transaction
                 .getRepository(warehouse_base_1.ProductDetailStock)
                 .createQueryBuilder()
                 .update(warehouse_base_1.ProductDetailStock)
                 .set({
-                unassignedQty: () => `"unassigned_qty" - ${oi.releaseQty}`,
-                unassignedUomValue: () => `"unassigned_uom_value" - ${oi.releaseUomValue}`
+                unassignedQty: () => `GREATEST("unassigned_qty" - :oiReleaseQty::numeric, 0)`,
+                unassignedUomValue: () => `GREATEST("unassigned_uom_value" - :oiReleaseUomValue::numeric, 0)`
             })
+                .setParameter('oiReleaseQty', oi.releaseQty)
+                .setParameter('oiReleaseUomValue', oi.releaseUomValue)
                 .where({ productDetail: oi.productDetail.id })
                 .execute();
             const worksheetDetail = Object.assign(new entities_1.WorksheetDetail(), {
@@ -1985,25 +2100,35 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     releaseQty = releaseQty - allocatedQty;
                     releaseUomValue = releaseUomValue - allocatedUomValue;
                     //// Update inventory locked quantity
-                    await this.trxMgr
+                    const lockResult = await this.trxMgr
                         .getRepository(warehouse_base_1.Inventory)
                         .createQueryBuilder('inv')
                         .update(warehouse_base_1.Inventory)
                         .set({
-                        lockedUomValue: () => `COALESCE(locked_uom_value,0) + ${allocatedUomValue}`,
-                        lockedQty: () => `COALESCE(locked_qty,0) + ${allocatedQty}`
+                        lockedUomValue: () => `COALESCE(locked_uom_value,0) + :allocatedUomValue::numeric`,
+                        lockedQty: () => `COALESCE(locked_qty,0) + :allocatedQty::numeric`
+                    })
+                        .setParameter('allocatedUomValue', allocatedUomValue)
+                        .setParameter('allocatedQty', allocatedQty)
+                        .where('id = :id AND qty >= COALESCE(locked_qty, 0) + :newQty', {
+                        id: targetInventory.id,
+                        newQty: allocatedQty
                     })
-                        .where('id = :id', { id: targetInventory.id })
                         .execute();
+                    if (lockResult.affected === 0) {
+                        throw new Error(`Insufficient inventory for picking assignment`);
+                    }
                     // update product detail stock deduct unassigned qty and unassigned uom value
                     await this.trxMgr
                         .getRepository(warehouse_base_1.ProductDetailStock)
                         .createQueryBuilder()
                         .update(warehouse_base_1.ProductDetailStock)
                         .set({
-                        unassignedQty: () => `"unassigned_qty" - ${allocatedQty}`,
-                        unassignedUomValue: () => `"unassigned_uom_value" - ${allocatedUomValue}`
+                        unassignedQty: () => `GREATEST("unassigned_qty" - :deductQty::numeric, 0)`,
+                        unassignedUomValue: () => `GREATEST("unassigned_uom_value" - :deductUomValue::numeric, 0)`
                     })
+                        .setParameter('deductQty', allocatedQty)
+                        .setParameter('deductUomValue', allocatedUomValue)
                         .where({ productDetail: orderProducts[i].productDetail.id })
                         .execute();
                     // update order product status to ASSIGNED