@things-factory/sales-base 4.3.700 → 4.3.701

package/server/utils/inventory-util.ts

@@ -78,8 +78,6 @@ export const InventoryUtil = {
         }
       }
 
-      // optional override for outbound shelf life (from ContactPoint deliverTo)
-      const releaseShelfLifeOverrideFilter = filters.find(f => f.name === 'releaseShelfLifeOverride')
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group ON COMMIT DROP AS (
           SELECT * FROM (
@@ -165,19 +163,7 @@ export const InventoryUtil = {
             ) bp on i.product_id = bp.product_id
             WHERE i.bizplace_id IN (${bizplaceIds})
             AND i.lock_inventory is not true
-            AND case 
-              when i.expiration_date is not null 
-                then CURRENT_DATE < i.expiration_date - (
-                  case
-                    when $2::integer is not null and $2::integer > 0
-                      then $2::integer
-                    when p.min_outbound_shelf_life is not null
-                      then p.min_outbound_shelf_life
-                    else 0
-                  end
-                )
-              else true 
-            end
+            AND case when i.expiration_date is not null and p.min_outbound_shelf_life is not null then CURRENT_DATE < i.expiration_date - p.min_outbound_shelf_life else true end
               ${productDetailWhereClause}
               ${
                 productFilter
@@ -266,10 +252,7 @@ export const InventoryUtil = {
         )
       `
 
-      await trxMgr.query(queryStrings, [
-        domain.id,
-        releaseShelfLifeOverrideFilter ? releaseShelfLifeOverrideFilter.value : null
-      ])
+      await trxMgr.query(queryStrings, [domain.id])
 
       const [{ total }]: any = await trxMgr.query(`select count(*) as total from temp_inventory_product_group`)
       let items: any[] = []
@@ -312,7 +295,6 @@ export const InventoryUtil = {
       let cycleCountFilter = filters.find(filter => filter.name == 'cycleCount')?.value
 
       const _groupType = filters.find(res => res.name == 'groupType')
-      const releaseShelfLifeOverrideFilter = filters.find(filter => filter.name === 'releaseShelfLifeOverride')
       let queryStrings = `
         CREATE TEMP TABLE temp_inventory_product_group AS (
           SELECT * FROM (
@@ -353,7 +335,7 @@ export const InventoryUtil = {
               AND i.transfer_qty <= 0
               AND i.transfer_uom_value <= 0
               AND i.lock_inventory is not true
-              AND CASE WHEN i.expiration_date IS NOT NULL AND COALESCE($2::integer, p.min_outbound_shelf_life) IS NOT NULL THEN CURRENT_DATE < i.expiration_date - COALESCE($2::integer, p.min_outbound_shelf_life) ELSE true END
+              AND CASE WHEN i.expiration_date IS NOT NULL AND p.min_outbound_shelf_life IS NOT NULL THEN CURRENT_DATE < i.expiration_date - p.min_outbound_shelf_life ELSE true END
                ${
                  cycleCountFilter
                    ? `AND i.id NOT IN (
@@ -443,10 +425,7 @@ export const InventoryUtil = {
         })
       }
 
-      await trxMgr.query(queryStrings, [
-        domain.id,
-        releaseShelfLifeOverrideFilter ? releaseShelfLifeOverrideFilter.value : null
-      ])
+      await trxMgr.query(queryStrings, [domain.id])
 
       const [{ total }]: any = await trxMgr.query(
         `select count(*) as total from temp_inventory_product_group ${filterGroupTypeQuery ? filterGroupTypeQuery : ''}`
@@ -894,8 +873,7 @@ export const InventoryUtil = {
     recall: boolean = null,
     cartonId?: string,
     expirationDate?: Date,
-    warehouseName?: string,
-    outboundShelfLifeOverride?: number
+    warehouseName?: string
   ): Promise<OrderInventory[]> {
     let strictProduct = 'false'
 
@@ -940,15 +918,14 @@ export const InventoryUtil = {
       .andWhere('"iv"."transfer_uom_value" <= 0')
       .andWhere('"iv"."product_id" = :productId')
       .andWhere(
-        'case when "iv"."expiration_date" is not null then CURRENT_DATE < "iv"."expiration_date" - (case when :outboundShelfLifeOverride::integer is not null and :outboundShelfLifeOverride::integer > 0 then :outboundShelfLifeOverride::integer when "p"."min_outbound_shelf_life" is not null then "p"."min_outbound_shelf_life" else 0 end) else true end'
+        'case when "iv"."expiration_date" is not null and "p"."min_outbound_shelf_life" is not null then CURRENT_DATE < "iv"."expiration_date" - "p"."min_outbound_shelf_life" else true end'
       )
       .setParameters({
         domainId: domain.id,
         bizplaceId: customerBizplace.id,
         productId: product.id,
         status: INVENTORY_STATUS.STORED,
-        locationTypes,
-        outboundShelfLifeOverride: outboundShelfLifeOverride ?? null
+        locationTypes
       })
 
     if (batchId) {