npm - @things-factory/sales-base - Versions diffs - 8.0.20 → 8.0.24 - Mend

@things-factory/sales-base 8.0.20 → 8.0.24

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (45) hide show

package/dist-server/service/release-good/release-good-mutation.js CHANGED Viewed

@@ -327,11 +327,22 @@ async function deleteReleaseGood(tx, name, user, domain) {
     // Delete order inventories by ids
     await Promise.all(foundOIs.map(async (oi) => {
         var _a, _b;
-        if ((_a = oi === null || oi === void 0 ? void 0 : oi.inventory) === null || _a === void 0 ? void 0 : _a.id) {
-            oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: oi.inventory.id });
-            await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, oi.inventory), { lockedQty: oi.inventory.lockedQty - oi.releaseQty, lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue, updater: user }));
+        if (oi === null || oi === void 0 ? void 0 : oi.requestProductDetailId) {
+            if (oi.pickedQty) {
+                const inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: oi.inventory.id });
+                const pickedQty = oi.pickedQty;
+                const pickedUomValue = pickedQty * (oi.packingSize || 1);
+                await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, inventory), { status: inventory.status === warehouse_base_1.INVENTORY_STATUS.TERMINATED ? warehouse_base_1.INVENTORY_STATUS.STORED : inventory.status, qty: inventory.qty + pickedQty, uomValue: inventory.uomValue + pickedUomValue, lockedQty: (inventory.lockedQty || 0) + pickedQty, lockedUomValue: (inventory.lockedUomValue || 0) + pickedUomValue }));
+            }
+            await tx.getRepository(order_inventory_1.OrderInventory).save(Object.assign(Object.assign({}, oi), { status: constants_1.ORDER_INVENTORY_STATUS.PENDING, orderProduct: null, releaseGood: null, deliveryOrder: null, bizplace: null, packedQty: 0, pickedQty: 0, pickedBy: null, pickedAt: null, pickedByUser: null, packedBy: null, packedAt: null, packedByUser: null, loadedBy: null, loadedAt: null, loadedByUser: null }));
+        }
+        else {
+            if ((_a = oi === null || oi === void 0 ? void 0 : oi.inventory) === null || _a === void 0 ? void 0 : _a.id) {
+                oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: oi.inventory.id });
+                await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, oi.inventory), { lockedQty: oi.inventory.lockedQty - oi.releaseQty, lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue, updater: user }));
+            }
+            await tx.getRepository(order_inventory_1.OrderInventory).delete({ id: oi.id });
         }
-        await tx.getRepository(order_inventory_1.OrderInventory).delete({ id: oi.id });
         if ((_b = oi === null || oi === void 0 ? void 0 : oi.orderProduct) === null || _b === void 0 ? void 0 : _b.id) {
             await tx.getRepository(order_product_1.OrderProduct).delete({ id: oi.orderProduct.id });
         }
@@ -578,14 +589,16 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
         }
         for (let oi of finalOrderInventories) {
             let generatedOI = Object.assign(new order_inventory_1.OrderInventory(), oi);
-            generatedOI = Object.assign(Object.assign({}, generatedOI), { domain: warehouseDomain, bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, creator: user, updater: user });
+            generatedOI = Object.assign(Object.assign({}, generatedOI), { domain: warehouseDomain, bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: oi.name || utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, creator: user, updater: user });
             await tx.getRepository(order_inventory_1.OrderInventory).save(Object.assign({}, generatedOI));
             // update inventory locked qty and uom value
-            await tx.getRepository(warehouse_base_1.Inventory).update({ id: oi.inventory.id }, {
-                lockedQty: (((_d = oi.inventory) === null || _d === void 0 ? void 0 : _d.lockedQty) || 0) + generatedOI.releaseQty,
-                lockedUomValue: (((_e = oi.inventory) === null || _e === void 0 ? void 0 : _e.lockedUomValue) || 0) + generatedOI.releaseUomValue,
-                updater: user
-            });
+            if (!oi.id) {
+                await tx.getRepository(warehouse_base_1.Inventory).update({ id: oi.inventory.id }, {
+                    lockedQty: (((_d = oi.inventory) === null || _d === void 0 ? void 0 : _d.lockedQty) || 0) + generatedOI.releaseQty,
+                    lockedUomValue: (((_e = oi.inventory) === null || _e === void 0 ? void 0 : _e.lockedUomValue) || 0) + generatedOI.releaseUomValue,
+                    updater: user
+                });
+            }
         }
         if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
             orderVass = await Promise.all(orderVass.map(async (orderVas) => {