@things-factory/worksheet-base 4.3.824 → 4.3.827

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

@@ -865,8 +865,6 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             if (toteNo) {
                 await this.toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace);
             }
-            // temporarily override with separate logic to handle transaction to speed up function
-            // await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
             const releaseQty = targetInventory.releaseQty;
             targetInventory.pickedQty = ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.pickedQty) || 0) + pickedQty;
             let updateOiObj = {
@@ -891,62 +889,55 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .andWhere(`picked_qty + :pickedQty <= release_qty`, { pickedQty })
                 .execute();
             if (oiUpdateResult.affected > 0 && targetInventory.pickedQty == releaseQty) {
-                (0, typeorm_1.getConnection)().transaction(async (tx) => {
-                    try {
-                        //update worksheet details only when line item picking complete
-                        await tx
-                            .getRepository(entities_1.WorksheetDetail)
-                            .createQueryBuilder()
-                            .update(entities_1.WorksheetDetail)
-                            .set({
-                            status: constants_1.WORKSHEET_STATUS.DONE,
-                            updater: this.user,
-                            updatedAt: new Date()
-                        })
-                            .where('id = :id', { id: worksheetDetailInfos.worksheetDetailId })
-                            .execute();
-                        let releaseUomValue = Math.trunc((pickedUomValue / pickedQty) * releaseQty * 1000) / 1000;
-                        let updateInvObj = {
-                            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()
-                        };
-                        const invUpdateResult = await tx
-                            .getRepository(warehouse_base_1.Inventory)
-                            .createQueryBuilder()
-                            .update(warehouse_base_1.Inventory)
-                            .set(updateInvObj)
-                            .setParameter('deductQty', releaseQty)
-                            .setParameter('deductUomValue', releaseUomValue)
-                            .where('id = :id AND qty >= :deductQty', {
-                            id: worksheetDetailInfos.inventoryId,
-                            deductQty: releaseQty
-                        })
-                            .returning(['qty'])
-                            .execute();
-                        if (invUpdateResult.affected === 0) {
-                            throw new Error(`Insufficient inventory quantity to complete picking`);
-                        }
-                        await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -releaseQty, -releaseUomValue, this.user, tx);
-                        let inventoryItems = await tx
-                            .getRepository(warehouse_base_1.InventoryItem)
-                            .find({ where: { outboundOrderId: worksheetDetailInfos.releaseGoodId } });
-                        if (inventoryItems.length > 0) {
-                            inventoryItems.forEach((itm) => {
-                                itm.status = warehouse_base_1.INVENTORY_STATUS.PICKED;
-                                itm.updater = this.user;
-                            });
-                            await tx.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
-                        }
-                    }
-                    catch (error) {
-                        throw error;
-                    }
-                });
+                //update worksheet details only when line item picking complete
+                await this.trxMgr
+                    .getRepository(entities_1.WorksheetDetail)
+                    .createQueryBuilder()
+                    .update(entities_1.WorksheetDetail)
+                    .set({
+                    status: constants_1.WORKSHEET_STATUS.DONE,
+                    updater: this.user,
+                    updatedAt: new Date()
+                })
+                    .where('id = :id', { id: worksheetDetailInfos.worksheetDetailId })
+                    .execute();
+                let releaseUomValue = Math.trunc((pickedUomValue / pickedQty) * releaseQty * 1000) / 1000;
+                let updateInvObj = {
+                    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()
+                };
+                const invUpdateResult = await this.trxMgr
+                    .getRepository(warehouse_base_1.Inventory)
+                    .createQueryBuilder()
+                    .update(warehouse_base_1.Inventory)
+                    .set(updateInvObj)
+                    .setParameter('deductQty', releaseQty)
+                    .setParameter('deductUomValue', releaseUomValue)
+                    .where('id = :id AND qty >= :deductQty', {
+                    id: worksheetDetailInfos.inventoryId,
+                    deductQty: releaseQty
+                })
+                    .returning(['qty'])
+                    .execute();
+                if (invUpdateResult.affected === 0) {
+                    throw new Error(`Insufficient inventory quantity to complete picking`);
+                }
+                await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -releaseQty, -releaseUomValue, this.user, this.trxMgr);
+                let inventoryItems = await this.trxMgr
+                    .getRepository(warehouse_base_1.InventoryItem)
+                    .find({ where: { outboundOrderId: worksheetDetailInfos.releaseGoodId } });
+                if (inventoryItems.length > 0) {
+                    inventoryItems.forEach((itm) => {
+                        itm.status = warehouse_base_1.INVENTORY_STATUS.PICKED;
+                        itm.updater = this.user;
+                    });
+                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+                }
             }
             let worksheetDetail = await this.trxMgr
                 .getRepository(entities_1.WorksheetDetail)
@@ -1993,7 +1984,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
     }
     async assignInventoriesForUnassignedOrder(worksheet, tx) {
-        var _a;
+        var _a, _b, _c;
         const releaseGood = worksheet.releaseGood;
         const orderProducts = releaseGood.orderProducts;
         let finalOrderInventories = [];
@@ -2045,18 +2036,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             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: () => `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();
+            await (0, warehouse_base_1.upsertProductDetailStockUnassigned)(transaction, (_b = oi.productDetail) === null || _b === void 0 ? void 0 : _b.id, this.domain.id, (_c = releaseGood.bizplace) === null || _c === void 0 ? void 0 : _c.id, -oi.releaseQty, -oi.releaseUomValue);
             const worksheetDetail = Object.assign(new entities_1.WorksheetDetail(), {
                 domain: this.domain,
                 bizplace: { id: releaseGood.bizplace.id },
@@ -2076,7 +2056,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         return newWorksheetDetails;
     }
     async assignInventoriesForUnassignedMergedOrder(worksheet) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         //const releaseGood = worksheet.releaseGood
         const orderProducts = worksheet.worksheetDetails
             .filter(itm => itm.targetProduct.releaseGood.assignedInventory == false)
@@ -2134,18 +2114,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         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: () => `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();
+                    await (0, warehouse_base_1.upsertProductDetailStockUnassigned)(this.trxMgr, (_d = orderProducts[i].productDetail) === null || _d === void 0 ? void 0 : _d.id, this.domain.id, ((_e = orderProducts[i].bizplace) === null || _e === void 0 ? void 0 : _e.id) || orderProducts[i].bizplaceId, -allocatedQty, -allocatedUomValue);
                     // update order product status to ASSIGNED
                     await this.trxMgr
                         .getRepository(sales_base_1.OrderProduct)