@things-factory/operato-hub 4.3.248 → 4.3.250

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

@@ -35,11 +35,12 @@ import {
   OrderProduct,
   ReleaseGood,
   SellercraftController,
-  ShippingOrder
+  ShippingOrder,
+  ORDER_METHOD
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, LOCATION_TYPE } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, LOCATION_TYPE, ProductDetailStock } from '@things-factory/warehouse-base'
 
 import { businessMiddleware, loggingMiddleware, validationMiddleware } from '../middlewares'
 import { ApiError, ApiErrorHandler, throwInternalServerError } from '../utils/error-util'
@@ -78,6 +79,10 @@ router.post(
           relations: ['domain']
         })
 
+        const worksheetPickingAssignment: Setting = await tx.getRepository(Setting).findOne({
+          where: { domain, category: 'id-rule', name: 'enable-worksheet-picking-activation-assignment' }
+        })
+
         // conditional validation
         if (bodyReq.ownTransport && !bodyReq.collectionOrderNo) throw new ApiError('E03', 'collectionOrderNo')
         if (bodyReq.exportOption && !bodyReq.shippingOrder) throw new ApiError('E03', 'shippingOrder')
@@ -141,7 +146,8 @@ router.post(
             to: bodyReq?.shippingOrder?.to,
             containerArrivalDate: bodyReq?.shippingOrder.containerArrivalDate,
             containerLeavingDate: bodyReq?.shippingOrder.containerLeavingDate
-          }
+          },
+          assignedInventory: worksheetPickingAssignment?.value == 'true' ? false : true
         }
 
         // check existing order
@@ -194,12 +200,25 @@ router.post(
 
         // assignment
         // console.time('assign')
-        let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx)
+        let assignedOrderProducts = await assignToInventory(
+          massagedData.orderProducts,
+          customerBizplace,
+          context,
+          tx,
+          worksheetPickingAssignment
+        )
         // console.timeEnd('assign')
 
         // create order
         // console.time('save')
-        let result = await createReleaseGood(releaseGood, assignedOrderProducts, customerBizplace, context, tx)
+        let result = await createReleaseGood(
+          releaseGood,
+          assignedOrderProducts,
+          customerBizplace,
+          context,
+          tx,
+          worksheetPickingAssignment
+        )
         // console.timeEnd('save')
 
         let data = {
@@ -387,7 +406,8 @@ async function createReleaseGood(
   orderProducts: OrderProduct[],
   bizplace: Bizplace,
   context: any,
-  tx?: EntityManager
+  tx?: EntityManager,
+  worksheetPickingAssignment?: any
 ): Promise<ReleaseGood> {
   const { domain, user }: { domain: Domain; user: User } = context.state
   const settingRepo: Repository<Setting> = tx?.getRepository(Setting) || getRepository(Setting)
@@ -502,7 +522,9 @@ async function createReleaseGood(
     acceptedAt: new Date(),
     shippingOrder: shippingOrder ? shippingOrder : null,
     lastMileDelivery: lmd,
-    lmdOption: releaseGood.lmdOption
+    lmdOption: releaseGood.lmdOption,
+    assignedInventory: worksheetPickingAssignment?.value == 'true' ? false : true,
+    orderMethod: ORDER_METHOD.SELECT_BY_PRODUCT
   }
 
   let resultReleaseGood = await tx.getRepository(ReleaseGood).save(newReleaseGood)
@@ -521,26 +543,28 @@ async function createReleaseGood(
       })
       let result = await tx.getRepository(OrderProduct).save(orderProduct)
 
-      for (let oiIdx = 0; oiIdx < orderInventories.length; oiIdx++) {
-        let orderInventory = Object.assign(new OrderInventory(), {
-          ...orderInventories[oiIdx],
-          name: uuidv4(),
-          domain: domain,
-          bizplace: bizplace,
-          releaseGood: resultReleaseGood,
-          type: ORDER_TYPES.RELEASE_OF_GOODS,
-          status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
-        })
-        await tx.getRepository(OrderInventory).save(orderInventory)
-
-        combinedOrderInventories.push({
-          product: { name: orderInventory.product.name, sku: orderInventory.product.sku },
-          batchId: orderInventory.batchId,
-          packingType: orderInventory.packingType,
-          packingSize: orderInventory.packingSize,
-          releaseQty: orderInventory.releaseQty,
-          releaseUomValue: orderInventory.releaseUomValue
-        })
+      if (worksheetPickingAssignment.value !== 'true') {
+        for (let oiIdx = 0; oiIdx < orderInventories.length; oiIdx++) {
+          let orderInventory = Object.assign(new OrderInventory(), {
+            ...orderInventories[oiIdx],
+            name: uuidv4(),
+            domain: domain,
+            bizplace: bizplace,
+            releaseGood: resultReleaseGood,
+            type: ORDER_TYPES.RELEASE_OF_GOODS,
+            status: ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
+          })
+          await tx.getRepository(OrderInventory).save(orderInventory)
+
+          combinedOrderInventories.push({
+            product: { name: orderInventory.product.name, sku: orderInventory.product.sku },
+            batchId: orderInventory.batchId,
+            packingType: orderInventory.packingType,
+            packingSize: orderInventory.packingSize,
+            releaseQty: orderInventory.releaseQty,
+            releaseUomValue: orderInventory.releaseUomValue
+          })
+        }
       }
 
       return result
@@ -825,116 +849,125 @@ async function massageOrderItems(
   return { orderProducts, combinedItems }
 }
 
-async function assignToInventory(orderProducts: OrderProduct[], customerBizplace, context, tx) {
+async function assignToInventory(
+  orderProducts: OrderProduct[],
+  customerBizplace,
+  context,
+  tx,
+  worksheetPickingAssignment
+) {
   const { client, domain, user } = context.state
+
+  const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
+    where: { domain, name: 'rule-for-picking-product' }
+  })
+
   for (let opIdx = 0; opIdx < orderProducts.length; opIdx++) {
     let orderProduct = orderProducts[opIdx]
 
     let assignedOrderInventories = []
-    const pickingProductSetting: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-picking-product' }
-    })
 
     for (let oiIdx = 0; oiIdx < orderProducts[opIdx].orderInventories.length; oiIdx++) {
       const orderInventory = orderProduct.orderInventories[oiIdx]
       let sortings: any = []
 
-      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 })
+      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 })
+              }
+            } 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
-      }
+            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
 
-      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
+              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: []
           }
-          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 sortQuery = sortings
+          .map(itm => {
+            return `${itm.name} ${itm.desc ? 'DESC' : 'ASC'}`
+          })
+          .join(`,`)
 
-      let updatedInventories = await tx.getRepository(Inventory).query(
-        `
+        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(),
@@ -947,14 +980,14 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
             case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
             from (
               select *,
-              qty - locked_qty as available_qty,
-              sum(qty - locked_qty - release_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
+              qty - locked_qty - unassigned_qty 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.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, null as created_at,
+            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
                 (
@@ -964,9 +997,10 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
                   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, coalesce(iv.locked_qty,0) as locked_qty, iv.created_at,
-                  0 as release_qty, 0 as release_uom_value
+                  coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, coalesce(iv.locked_qty,0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, coalesce(pds.unassigned_qty,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"
@@ -984,51 +1018,63 @@ async function assignToInventory(orderProducts: OrderProduct[], customerBizplace
           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
-        ]
-      )
-
-      let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
-        return acc + inv.reserve_qty
-      }, 0)
+          [
+            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
+          ]
+        )
 
-      if (orderInventory.releaseQty != totalAssigned) {
-        throw new ApiError('E01', 'INSUFFICIENT_STOCK')
-      }
+        let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
+          return acc + inv.reserve_qty
+        }, 0)
 
-      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 (orderInventory.releaseQty != totalAssigned) {
+          throw new ApiError('E01', 'INSUFFICIENT_STOCK')
         }
 
-        assignedOrderInventories.push(oi)
-      })
-    }
+        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 }
+          }
 
-    orderProducts[opIdx].orderInventories = assignedOrderInventories
+          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}`
+          })
+          .where({ productDetail: orderInventory.productDetail.id })
+          .execute()
+      }
+    }
   }
 
   return orderProducts