@things-factory/sales-base 4.3.770 → 4.3.772

package/server/service/release-good/release-good-mutation.ts

@@ -476,14 +476,19 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
   await Promise.all(
     foundOIs.map(async (oi: OrderInventory) => {
       if (oi?.inventory?.id) {
-        oi.inventory = await tx.getRepository(Inventory).findOne(oi.inventory.id)
-
-        await tx.getRepository(Inventory).save({
-          ...oi.inventory,
-          lockedQty: safeDecimalOperation(oi.inventory.lockedQty, oi.releaseQty, 'subtract'),
-          lockedUomValue: safeDecimalOperation(oi.inventory.lockedUomValue, oi.releaseUomValue, 'subtract'),
-          updater: user
-        })
+        await tx
+          .getRepository(Inventory)
+          .createQueryBuilder()
+          .update(Inventory)
+          .set({
+            lockedQty: () => `GREATEST(COALESCE("locked_qty", 0) - :releaseQty::numeric, 0)`,
+            lockedUomValue: () => `GREATEST(COALESCE("locked_uom_value", 0) - :releaseUomValue::numeric, 0)`,
+            updater: user
+          })
+          .setParameter('releaseQty', oi.releaseQty)
+          .setParameter('releaseUomValue', oi.releaseUomValue)
+          .where('id = :id', { id: oi.inventory.id })
+          .execute()
       }
 
       await tx.getRepository(OrderInventory).delete({ id: oi.id })
@@ -505,9 +510,11 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
           .createQueryBuilder()
           .update(ProductDetailStock)
           .set({
-            unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}`,
-            unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}`
+            unassignedQty: () => `GREATEST("unassigned_qty" - :releaseQty::numeric, 0)`,
+            unassignedUomValue: () => `GREATEST("unassigned_uom_value" - :releaseUomValue::numeric, 0)`
           })
+          .setParameter('releaseQty', op.releaseQty)
+          .setParameter('releaseUomValue', op.releaseUomValue)
           .where({ productDetail: op.productDetail.id })
           .execute()
 
@@ -1131,20 +1138,37 @@ export async function generateReleaseGoodFunction(
       if (worksheetPickingAssignment?.value !== 'true' || oi.inventory?.id) {
         await tx.getRepository(OrderInventory).save({ ...oi, name: OrderNoGenerator.orderInventory() })
 
-        await tx.getRepository(Inventory).update(oi.inventory.id, {
-          lockedQty: (oi.inventory?.lockedQty || 0) + oi.releaseQty,
-          lockedUomValue: (oi.inventory?.lockedUomValue || 0) + oi.releaseUomValue,
-          updater: user
-        })
+        const lockResult = await tx
+          .getRepository(Inventory)
+          .createQueryBuilder()
+          .update(Inventory)
+          .set({
+            lockedQty: () => `COALESCE("locked_qty", 0) + :releaseQty::numeric`,
+            lockedUomValue: () => `COALESCE("locked_uom_value", 0) + :releaseUomValue::numeric`,
+            updater: 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 ${oi.product?.sku || 'unknown product'}`)
+        }
       } else {
         await tx
           .getRepository(ProductDetailStock)
           .createQueryBuilder()
           .update(ProductDetailStock)
           .set({
-            unassignedQty: () => `"unassigned_qty" + ${oi.releaseQty}`,
-            unassignedUomValue: () => `"unassigned_uom_value" + ${oi.releaseUomValue}`
+            unassignedQty: () => `"unassigned_qty" + :releaseQty::numeric`,
+            unassignedUomValue: () => `"unassigned_uom_value" + :releaseUomValue::numeric`
           })
+          .setParameter('releaseQty', oi.releaseQty)
+          .setParameter('releaseUomValue', oi.releaseUomValue)
           .where({ productDetail: oi.productDetail.id })
           .execute()
       }
@@ -1971,10 +1995,12 @@ export async function bulkGenerateReleaseGood(
           .createQueryBuilder()
           .update(Inventory)
           .set({
-            lockedQty: () => `COALESCE("locked_qty",0) + ${generatedOI.releaseQty}`,
-            lockedUomValue: () => `COALESCE("locked_uom_value",0) + ${generatedOI.releaseUomValue}`,
+            lockedQty: () => `COALESCE("locked_qty",0) + :releaseQty::numeric`,
+            lockedUomValue: () => `COALESCE("locked_uom_value",0) + :releaseUomValue::numeric`,
             updater: user
           })
+          .setParameter('releaseQty', generatedOI.releaseQty)
+          .setParameter('releaseUomValue', generatedOI.releaseUomValue)
           .where(`id = :id AND qty >= COALESCE(locked_qty,0) + :newQty`, {
             id: oi.inventory.id,
             newQty: generatedOI.releaseQty
@@ -1990,9 +2016,11 @@ export async function bulkGenerateReleaseGood(
           .createQueryBuilder()
           .update(ProductDetailStock)
           .set({
-            unassignedQty: () => `"unassigned_qty" + ${generatedOI.releaseQty}`,
-            unassignedUomValue: () => `"unassigned_uom_value" + ${generatedOI.releaseUomValue}`
+            unassignedQty: () => `"unassigned_qty" + :releaseQty::numeric`,
+            unassignedUomValue: () => `"unassigned_uom_value" + :releaseUomValue::numeric`
           })
+          .setParameter('releaseQty', generatedOI.releaseQty)
+          .setParameter('releaseUomValue', generatedOI.releaseUomValue)
           .where({ productDetail: oi.productDetail ? oi.productDetail.id : oi.productDetailId })
           .execute()
       }

package/server/service/release-good/release-good-query.ts

@@ -1133,7 +1133,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.uom = foo.uom
         AND i.domain_id = $1
         AND i.bizplace_id = $2
-        WHERE l.type NOT IN ($3, $4)
+        WHERE l.type NOT IN ($3, $4, $8)
         AND i.status = 'STORED'
         AND i.obsolete = false
         AND i.transfer_qty <= 0
@@ -1166,7 +1166,8 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       LOCATION_TYPE.RESERVE,
       uniqueWarehouseCodes.length === 1 ? uniqueWarehouseCodes[0] : null,
       uniqueBatchIds.length === 1 ? uniqueBatchIds[0] : null,
-      releaseShelfLifeOverride
+      releaseShelfLifeOverride,
+      LOCATION_TYPE.DAMAGE
     ]
   )
 

package/server/utils/inventory-util.ts

@@ -949,7 +949,7 @@ export const InventoryUtil = {
 
     let locationTypes = [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
 
-    if (recall === false) {
+    if (recall !== true) {
       locationTypes.push(LOCATION_TYPE.DAMAGE)
     }
 
@@ -1413,7 +1413,8 @@ export function _composeTargetInventories(
 
   let orderInventories: Partial<OrderInventory[]> = []
   let idx = 0
-  while (compReleaseQty < record.releaseQty) {
+  const EPSILON = 1e-6
+  while (compReleaseQty + EPSILON < record.releaseQty && idx < inventories.length) {
     const inventory = inventories[idx]
     const {
       packingType,
@@ -1466,5 +1467,9 @@ export function _composeTargetInventories(
     idx++
   }
 
+  if (orderInventories.length === 0) {
+    throw new Error(`no inventories could be allocated for ${product?.sku}`)
+  }
+
   return orderInventories
 }