@things-factory/operato-hub 4.3.385 → 4.3.387

package/server/routers/api/restful-apis/v1/warehouse/add-release-order.ts

@@ -159,7 +159,7 @@ router.post(
         await checkExistingOrder(releaseGood, customerBizplace, bodyReq?.checkDuplicationValidation, context, tx)
 
         // massage data
-        massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context)
+        massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context) //double check this function
 
         // validation
         await Promise.all(
@@ -202,6 +202,7 @@ router.post(
             console.log()
           })
         )
+        // use product id 
 
         // assignment
         // console.time('assign')
@@ -612,7 +613,7 @@ async function massageOrderItems(
   //combine any repeated skus
   inputOrderProducts = inputOrderProducts.reduce((acc, itm, idx) => {
     let { sku, refCode } = itm.product
-    let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount } = itm
+    let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount, uom } = itm
 
     if (!sku && !refCode) {
       throw new ApiError('E01', 'sku or refCode not found')
@@ -628,7 +629,8 @@ async function massageOrderItems(
         itm?.sku == sku?.trim() &&
         itm?.refCode == refCode?.trim() &&
         itm?.packingType == packingType?.trim() &&
-        itm?.packingSize == packingSize
+        itm?.packingSize == packingSize && 
+        itm?.uom == uom
     )
 
     if (existingIndex >= 0 && releaseQty > 0) {
@@ -641,7 +643,8 @@ async function massageOrderItems(
         packingSize: packingSize,
         releaseQty: releaseQty,
         sellingPrice: sellingPrice,
-        paidAmount: paidAmount
+        paidAmount: paidAmount,
+        uom: uom
       })
     }
 
@@ -652,6 +655,7 @@ async function massageOrderItems(
   await Promise.all(
     inputOrderProducts.map(async inputOrderItem => {
       const sku: string = inputOrderItem.sku
+      const uom: string = inputOrderItem?.uom
       const refCode: string = inputOrderItem.refCode
       const packingType: string = inputOrderItem.packingType
       const packingSize: string = inputOrderItem.packingSize
@@ -748,26 +752,26 @@ async function massageOrderItems(
         const foundProductBundle: ProductBundle = await qb.getOne()
 
         if (foundProductBundle) {
-          let orderProduct: OrderProduct
-
-          // to be further enhanced
-          // let orderProduct = {
-          //   productBundle: foundProductBundle,
-          //   refCode,
-          //   packingType: foundProductBundle.packingType,
-          //   packingSize: packingSize || 1,
-          //   uom: inputOrderItem?.uom,
-          //   releaseQty: inputOrderItem.releaseQty,
-          //   releaseUomValue: inputOrderItem.releaseQty,
-          //   packQty: 0,
-          //   actualPackQty: 0,
-          //   palletQty: 0,
-          //   actualPalletQty: 0,
-          //   orderInventories: [],
-          //   type: 'RELEASE_OF_GOODS',
-          //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
-          //   batchId: '-'
-          // }
+          //let orderProduct: OrderProduct
+
+          //to be further enhanced
+          let orderProduct = {
+            productBundle: foundProductBundle,
+            refCode,
+            packingType: foundProductBundle.packingType,
+            packingSize: packingSize || 1,
+            uom: inputOrderItem?.uom,
+            releaseQty: inputOrderItem.releaseQty,
+            releaseUomValue: inputOrderItem.releaseQty,
+            packQty: 0,
+            actualPackQty: 0,
+            palletQty: 0,
+            actualPalletQty: 0,
+            orderInventories: [],
+            type: 'RELEASE_OF_GOODS',
+            status: ORDER_PRODUCT_STATUS.ASSIGNED,
+            batchId: '-'
+          }
 
           const bundleProductSettings: any[] = foundProductBundle.productBundleSettings
           bundleProductSettings.map(bundleProductSetting => {
@@ -793,22 +797,21 @@ async function massageOrderItems(
               status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
             }
 
-            orderProduct = Object.assign(new OrderProduct(), newOrderInventory)
+            // orderProduct = Object.assign(new OrderProduct(), newOrderInventory)
 
-            orderProduct = {
-              ...orderProduct,
-              refCode,
-              packingType: foundProductBundle.packingType,
-              packingSize: packingSize || 1,
-              orderInventories: [],
-              status: ORDER_PRODUCT_STATUS.ASSIGNED,
-              batchId: '-'
-            }
+            // orderProduct = {
+            //   ...orderProduct,
+            //   refCode,
+            //   packingType: foundProductBundle.packingType,
+            //   packingSize: packingSize || 1,
+            //   orderInventories: [],
+            //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
+            //   batchId: '-'
+            // }
 
             orderProduct.orderInventories.push(newOrderInventory)
-
-            orderProducts.push(orderProduct)
           })
+          orderProducts.push(orderProduct)
         } else {
           if (sku && refCode) {
             throw new ApiError('E04', t(`error.sku ${sku} and refCode ${refCode} not exist in product / bundle master`))
@@ -892,228 +895,234 @@ async function assignToInventory(
 
     let assignedOrderInventories = []
 
-    const orderInventory = orderProduct.orderInventories[0]
+    const orderInventory = orderProduct.orderInventories
+    let productBundle = orderProduct?.productBundle
+
     let sortings: any = []
 
-    if (worksheetPickingAssignment?.value !== 'true') {
-      switch (orderInventory.product.pickingStrategy) {
-        case 'LIFO':
-          sortings.push({ name: 'iv.created_at', desc: true })
-          if (pickingProductSetting?.value) {
-            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+    for(let oiIdx = 0 ; oiIdx < orderInventory.length ; oiIdx++){
+      if (worksheetPickingAssignment?.value !== 'true') {
+        switch (orderInventory[oiIdx].product.pickingStrategy) {
+          case 'LIFO':
+            sortings.push({ name: 'iv.created_at', desc: true })
+            if (pickingProductSetting?.value) {
+              for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+              }
+            } else {
+              sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
             }
-          } else {
-            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
-          }
-
-          break
-        case 'FEFO':
-          sortings.push({ name: 'iv.expiration_date', desc: false }, { name: 'iv.created_at', desc: false })
-          if (pickingProductSetting?.value) {
-            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+  
+            break
+          case 'FEFO':
+            sortings.push({ name: 'iv.expiration_date', desc: false }, { name: 'iv.created_at', desc: false })
+            if (pickingProductSetting?.value) {
+              for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+              }
+            } else {
+              sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
             }
-          } else {
-            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
-          }
-
-          break
-        case 'FMFO':
-          sortings.push({ name: 'iv.manufacture_date', desc: false }, { name: 'iv.created_at', desc: false })
-          if (pickingProductSetting?.value) {
-            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+  
+            break
+          case 'FMFO':
+            sortings.push({ name: 'iv.manufacture_date', desc: false }, { name: 'iv.created_at', desc: false })
+            if (pickingProductSetting?.value) {
+              for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+              }
+            } else {
+              sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
             }
-          } else {
-            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
-          }
-
-          break
-        case 'LOCATION':
-          if (pickingProductSetting?.value) {
-            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+  
+            break
+          case 'LOCATION':
+            if (pickingProductSetting?.value) {
+              for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+              }
+            } else {
+              sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
             }
-          } else {
-            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false })
-          }
-
-          break
-        //Every other case includes 'FIFO' will be applicable for this case
-        default:
-          sortings.push({ name: 'iv.created_at', desc: false })
-          if (pickingProductSetting?.value) {
-            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-              sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+  
+            break
+          //Every other case includes 'FIFO' will be applicable for this case
+          default:
+            sortings.push({ name: 'iv.created_at', desc: false })
+            if (pickingProductSetting?.value) {
+              for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false })
+              }
+            } else {
+              sortings.push({ name: 'loc.name', desc: false })
+              sortings.push({ name: 'iv.pallet_id', desc: false })
             }
-          } else {
-            sortings.push({ name: 'loc.name', desc: false })
-            sortings.push({ name: 'iv.pallet_id', desc: false })
-          }
-          break
-      }
-
-      let queryFilters = []
-
-      let queryStrings = queryFilters.reduce(
-        (acc, itm, idx, arr) => {
-          acc.values.push(itm.filters)
-
-          switch (itm?.operator) {
-            case 'notin':
-            case 'in':
-              acc.query.push(
-                `${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filtes
-                  .map((itm, idx) => {
-                    return `$${acc.values.length + 1}`
-                  })
-                  .join(',')})`
-              )
-              break
-
-            default:
-              acc.query.push(`${itm.query} ${itm?.operator ? itm.operator : '='} $${acc.values.length + 1}`)
-              break
-          }
-          acc.query.push(`${itm.query} ${itm?.operator ? itm.operator : '='} $${acc.values.length + 1}`)
-        },
-        {
-          query: [],
-          values: []
+            break
         }
-      )
-
-      let sortQuery = sortings
-        .map(itm => {
-          return `${itm.name} ${itm.desc ? 'DESC' : 'ASC'}`
-        })
-        .join(`,`)
-
-      let updatedInventories = await tx.getRepository(Inventory).query(
-        `
-        update inventories tgt set locked_qty = coalesce(locked_qty,0) + src.reserve_qty, 
-        locked_uom_value = coalesce(locked_uom_value,0) + src.reserve_uom_value,
-        updated_at = NOW(),
-        updater_id = $1
-        from (
-          select "id", "pallet_id","carton_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year",
-          "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (	
-            select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at", 
-            "release_qty", "release_uom_value", lock_amount, 
-            case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
-            from (
-              select *,
-              (
-                case when (qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0)) < 0 then 0
-                else qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0) end
-              ) as available_qty,
-              sum(qty - locked_qty - release_qty - unassigned_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
+  
+        let queryFilters = []
+  
+        let queryStrings = queryFilters.reduce(
+          (acc, itm, idx, arr) => {
+            acc.values.push(itm.filters)
+  
+            switch (itm?.operator) {
+              case 'notin':
+              case 'in':
+                acc.query.push(
+                  `${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filtes
+                    .map((itm, idx) => {
+                      return `$${acc.values.length + 1}`
+                    })
+                    .join(',')})`
+                )
+                break
+  
+              default:
+                acc.query.push(`${itm.query} ${itm?.operator ? itm.operator : '='} $${acc.values.length + 1}`)
+                break
+            }
+            acc.query.push(`${itm.query} ${itm?.operator ? itm.operator : '='} $${acc.values.length + 1}`)
+          },
+          {
+            query: [],
+            values: []
+          }
+        )
+  
+        let sortQuery = sortings
+          .map(itm => {
+            return `${itm.name} ${itm.desc ? 'DESC' : 'ASC'}`
+          })
+          .join(`,`)
+  
+        let updatedInventories = await tx.getRepository(Inventory).query(
+          `
+          update inventories tgt set locked_qty = coalesce(locked_qty,0) + src.reserve_qty, 
+          locked_uom_value = coalesce(locked_uom_value,0) + src.reserve_uom_value,
+          updated_at = NOW(),
+          updater_id = $1
+          from (
+            select "id", "pallet_id","carton_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year",
+            "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (	
+              select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at", 
+              "release_qty", "release_uom_value", lock_amount, 
+              case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
               from (
-                SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${
-          orderInventory.packingSize
-        }' as packing_size,
-                null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, 0 as unassigned_uom_value, 0 as unassigned_qty, null as created_at,
-                '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
-                UNION
+                select *,
                 (
-                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${
-                    sortQuery ? ', ' + sortQuery : ''
-                  }) as sort_seq, 
-                  iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
-                  iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
-                  iv.manufacture_year, iv.carton_id, iv.uom_value, 
-                  coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, greatest(coalesce(iv.locked_qty,0),0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, greatest(coalesce(pds.unassigned_qty,0),0) as unassigned_qty, 
-                  iv.created_at, 0 as release_qty, 0 as release_uom_value
-                  FROM "inventories" "iv" 
-                  LEFT JOIN "product_detail_stocks" "pds" ON "pds"."product_detail_id" = "iv"."product_detail_id"
-                  INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
-                  INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
-                  INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
-                  WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
-                   "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
-                  AND "iv"."obsolete" = false AND 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
-                  ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
-                  ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
-                )
-              ) dt1
-            ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
-          ) dt3 where sort_seq > 0
-        ) src where src.id = tgt.id
-        returning 
-          tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit", 
-          tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year", 
-          tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`,
-        [
-          user.id,
-          domain.id,
-          customerBizplace.id,
-          orderInventory.packingType,
-          orderInventory.packingSize,
-          orderInventory.product.id,
-          INVENTORY_STATUS.STORED,
-          LOCATION_TYPE.QUARANTINE,
-          LOCATION_TYPE.RESERVE,
-          LOCATION_TYPE.STORAGE,
-          ...queryStrings.values
-        ]
-      )
-
-      console.log({
-        params: {
-          user: user.id || '',
-          domain: domain.id || '',
-          bizplace: customerBizplace.id || '',
-          packingType: orderInventory.packingType || '',
-          packingSize: orderInventory.packingSize || '',
-          productId: orderInventory.product.id || ''
-        },
-        result: updatedInventories[0] || '',
-        location: 'add-release-order unstable assignInventory',
-        time: new Date()
-      })
-
-      let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
-        return acc + inv.reserve_qty
-      }, 0)
+                  case when (qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0)) < 0 then 0
+                  else qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0) end
+                ) as available_qty,
+                sum(qty - locked_qty - release_qty - unassigned_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
+                from (
+                  SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
+                  null as unit, '${orderInventory[oiIdx].uom}' as uom, '${orderInventory[oiIdx].packingType}' as packing_type, '${
+            orderInventory[oiIdx].packingSize
+          }' as packing_size,
+                  null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, 0 as unassigned_uom_value, 0 as unassigned_qty, null as created_at,
+                  '${orderInventory[oiIdx].releaseQty}' as release_qty, '${orderInventory[oiIdx].releaseUomValue}' as release_uom_value
+                  UNION
+                  (
+                    SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${
+                      sortQuery ? ', ' + sortQuery : ''
+                    }) as sort_seq, 
+                    iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
+                    iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
+                    iv.manufacture_year, iv.carton_id, iv.uom_value, 
+                    coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, greatest(coalesce(iv.locked_qty,0),0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, greatest(coalesce(pds.unassigned_qty,0),0) as unassigned_qty, 
+                    iv.created_at, 0 as release_qty, 0 as release_uom_value
+                    FROM "inventories" "iv" 
+                    LEFT JOIN "product_detail_stocks" "pds" ON "pds"."product_detail_id" = "iv"."product_detail_id"
+                    INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
+                    INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
+                    INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
+                    WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
+                     "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
+                    AND "iv"."obsolete" = false AND 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
+                    ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
+                    ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
+                  )
+                ) dt1
+              ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
+            ) dt3 where sort_seq > 0
+          ) src where src.id = tgt.id
+          returning 
+            tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit", 
+            tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year", 
+            tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`,
+          [
+            user.id,
+            domain.id,
+            customerBizplace.id,
+            orderInventory[oiIdx].packingType,
+            orderInventory[oiIdx].packingSize,
+            orderInventory[oiIdx].product.id,
+            INVENTORY_STATUS.STORED,
+            LOCATION_TYPE.QUARANTINE,
+            LOCATION_TYPE.RESERVE,
+            LOCATION_TYPE.STORAGE,
+            ...queryStrings.values
+          ]
+        )
+  
+        console.log({
+          params: {
+            user: user.id || '',
+            domain: domain.id || '',
+            bizplace: customerBizplace.id || '',
+            packingType: orderInventory[oiIdx].packingType || '',
+            packingSize: orderInventory[oiIdx].packingSize || '',
+            productId: orderInventory[oiIdx].product.id || ''
+          },
+          result: updatedInventories[0] || '',
+          location: 'add-release-order unstable assignInventory',
+          time: new Date()
+        })
+  
+        let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
+          return acc + inv.reserve_qty
+        }, 0)
 
-      if (orderProduct.releaseQty != totalAssigned) {
-        throw new ApiError('E01', 'INSUFFICIENT_STOCK')
-      }
+        let opReleaseQty = productBundle ? orderInventory[oiIdx].releaseQty : orderProduct.releaseQty
 
-      updatedInventories[0].forEach(inv => {
-        let oi = {
-          ...orderInventory,
-          inventory: { id: inv.id },
-          uom: inv.uom,
-          packingType: inv.packing_type,
-          batchId: inv.batch_id,
-          releaseQty: inv.reserve_qty,
-          releaseUomValue: inv.reserve_uom_value,
-          pickedQty: 0,
-          packedQty: 0,
-          type: ORDER_TYPES.RELEASE_OF_GOODS,
-          status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET,
-          domain: { id: domain.id },
-          bizplace: { id: customerBizplace.id }
+        if (opReleaseQty != totalAssigned) {
+          throw new ApiError('E01', 'INSUFFICIENT_STOCK')
         }
-
-        assignedOrderInventories.push(oi)
-      })
-
-      orderProducts[opIdx].orderInventories = assignedOrderInventories
-    } else {
-      await tx
-        .getRepository(ProductDetailStock)
-        .createQueryBuilder()
-        .update(ProductDetailStock)
-        .set({
-          unassignedQty: () => `"unassigned_qty" + ${orderInventory.releaseQty}`,
-          unassignedUomValue: () => `"unassigned_uom_value" + ${orderInventory.releaseUomValue}`
+  
+        updatedInventories[0].forEach(inv => {
+          let oi = {
+            ...orderInventory[oiIdx],
+            inventory: { id: inv.id },
+            uom: inv.uom,
+            packingType: inv.packing_type,
+            batchId: inv.batch_id,
+            releaseQty: inv.reserve_qty,
+            releaseUomValue: inv.reserve_uom_value,
+            pickedQty: 0,
+            packedQty: 0,
+            type: ORDER_TYPES.RELEASE_OF_GOODS,
+            status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET,
+            domain: { id: domain.id },
+            bizplace: { id: customerBizplace.id }
+          }
+  
+          assignedOrderInventories.push(oi)
         })
-        .where({ productDetail: orderInventory.productDetail.id })
-        .execute()
+  
+        orderProducts[opIdx].orderInventories = assignedOrderInventories
+      } else {
+        await tx
+          .getRepository(ProductDetailStock)
+          .createQueryBuilder()
+          .update(ProductDetailStock)
+          .set({
+            unassignedQty: () => `"unassigned_qty" + ${orderInventory[oiIdx].releaseQty}`,
+            unassignedUomValue: () => `"unassigned_uom_value" + ${orderInventory[oiIdx].releaseUomValue}`
+          })
+          .where({ productDetail: orderInventory[oiIdx].productDetail.id })
+          .execute()
+      }
     }
   }
 

package/server/routers/api/restful-apis/v1/warehouse/get-release-order-details.ts

@@ -35,6 +35,10 @@ router.get(
           'orderInventories',
           'orderInventories.product',
           'orderInventories.productDetail',
+          'orderInventories.orderProduct',
+          'orderInventories.orderProduct.productBundle',
+          'orderProducts',
+          'orderProducts.productBundle',
           'orderPackages',
           'orderPackages.orderPackageItems',
           'bizplace'
@@ -46,6 +50,7 @@ router.get(
       // create and format data response
       let orderInventories = []
       for (const orderInventory of releaseGood.orderInventories) {
+        let orderProduct = orderInventory.orderProduct
         const orderInventoriesDataPoint = {
           product: {
             sku: orderInventory.product.sku,
@@ -53,10 +58,16 @@ router.get(
               refCode: orderInventory.productDetail.refCode ? orderInventory.productDetail.refCode : null
             }
           },
+          orderProduct: {
+            productBundle: {
+              sku: orderProduct?.productBundle?.sku ? orderProduct?.productBundle?.sku  : null
+            },
+            releaseQty: orderProduct.releaseQty ? orderProduct.releaseQty : null
+          },
           batchId: orderInventory.batchId,
           packingType: orderInventory.packingType,
-          releaseQty: orderInventory.releaseQty,
-          packingSize: orderInventory.packingSize
+          packingSize: orderInventory.packingSize,
+          releaseQty: orderInventory.releaseQty
         }
         orderInventories.push(orderInventoriesDataPoint)
       }