@things-factory/sales-base 4.3.508 → 4.3.510

package/server/service/order-inventory/order-inventory-query.ts

@@ -381,23 +381,64 @@ export class OrderInventoryQuery {
 
       await tx.query(
         `
-          create temp table temp_route_label ON COMMIT drop as (
-            select distinct(ot.name) as "toteNumber", oi.id, rg3.name as "releaseGoodName",rg3.ref_no,rg3.ref_no_2,rg3.ref_no_3, (case when ot.name is null then oi.release_qty else null end) as "releaseQty", 
-            (case when ot.name is null then p.sku else null end) as "productSKU", (case when ot.name is null then p.name else null end) as "productName", 
-            (case when ot.name is null and oi.bin_location_id is not null then l.name else null end) as "binNumber", rg3.route_id as "routeId", rg3.store_id as "storeId", 
-            rg3.store_name as "storeName", rg3.stop_id as "stopId",(case when ot.name is null then l2."name" else null end )as "locationName",
-            rg3.created_at as "createdAt", pd.packing_type as "packingType", pd.packing_size as "packingSize" from order_inventories oi 
-            inner join release_goods rg3 on rg3.id = oi.release_good_id
-            inner join products p on p.id = oi.product_id
-            inner join product_details pd on pd.product_id = p.id
-            inner join inventories i on i.id = oi.inventory_id 
-            left join locations l on l.id = oi.bin_location_id 
-            left join locations l2 on l2.id = i.location_id 
-            left join order_tote_items oti on oti.order_inventory_id = oi.id
-            left join order_totes ot on ot.id = oti.order_tote_id
-            where oi.release_good_id in 
-              (${releaseOrderId.length > 0 ? releaseOrderId?.map(itm => `'${itm.id}'`).join(',') : null})
-          )
+       create temp table temp_route_label ON COMMIT drop as ( 
+          SELECT 
+            DISTINCT(ot.name) AS "toteNumber", 
+            rg3.id AS "releaseGoodId",
+            rg3.name AS "releaseGoodName",
+            rg3.ref_no, 
+            rg3.ref_no_2, 
+            rg3.ref_no_3, 
+            rg3.route_id AS "routeId", 
+            rg3.store_id AS "storeId", 
+            rg3.store_name AS "storeName", 
+            rg3.stop_id AS "stopId", 
+            rg3.created_at AS "createdAt", 
+            pd.packing_type AS "packingType", 
+            pd.packing_size AS "packingSize", 
+            oi.product_id AS "productId",
+            oi.product_detail_id AS "productDetailId",
+            SUM(CASE WHEN ot.name IS NULL THEN oi.release_qty ELSE 0 END) AS "releaseQty",
+            CASE WHEN ot.name IS NULL THEN p.sku ELSE NULL END AS "productSKU",
+            CASE WHEN ot.name IS NULL THEN p.name ELSE NULL END AS "productName",
+            CASE WHEN ot.name IS NULL AND oi.bin_location_id IS NOT NULL THEN l.name ELSE NULL END AS "binNumber",
+            CASE WHEN ot.name IS NULL THEN l2."name" ELSE NULL END AS "locationName"
+          FROM 
+            order_inventories oi
+            INNER JOIN release_goods rg3 ON rg3.id = oi.release_good_id
+            INNER JOIN products p ON p.id = oi.product_id
+            INNER JOIN product_details pd ON pd.product_id = p.id
+            INNER JOIN inventories i ON i.id = oi.inventory_id
+            LEFT JOIN locations l ON l.id = oi.bin_location_id
+            LEFT JOIN locations l2 ON l2.id = i.location_id
+            LEFT JOIN order_tote_items oti ON oti.order_inventory_id = oi.id
+            LEFT JOIN order_totes ot ON ot.id = oti.order_tote_id
+          WHERE 
+            oi.release_good_id IN (${
+              releaseOrderId.length > 0 ? releaseOrderId?.map(itm => `'${itm.id}'`).join(',') : null
+            })
+          GROUP BY 
+            ot.name, 
+            rg3.id,
+            rg3.name, 
+            rg3.ref_no, 
+            rg3.ref_no_2, 
+            rg3.ref_no_3, 
+            rg3.route_id, 
+            rg3.store_id, 
+            rg3.store_name, 
+            rg3.stop_id, 
+            rg3.created_at, 
+            pd.packing_type, 
+            pd.packing_size,
+            oi.product_id,
+            oi.product_detail_id,
+            oi.bin_location_id,
+            l.name,
+            l2."name",
+            p.sku,
+            p.name
+        )
         `
       )
 
@@ -528,7 +569,13 @@ export class OrderInventoryQuery {
       )
 
       items = items.reduce((prev, curr) => {
-        let foundItemIndex = prev.findIndex(items => items.id == curr.id)
+        let foundItemIndex = prev.findIndex(
+          items =>
+            items.productSKU == curr.productSKU &&
+            items.releaseGoodId == curr.releaseGoodId &&
+            items.locationName == curr.locationName
+        )
+
         if (foundItemIndex >= 0) {
           let object = { packingType: curr.packingType, packingSize: curr.packingSize }
           prev[foundItemIndex].productDetails.push(object)

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

@@ -1626,7 +1626,12 @@ export async function bulkGenerateReleaseGood(
           locationSortingRules,
           bizplace,
           warehouseDomain,
-          tx
+          tx,
+          oi.batchId,
+          '',
+          null,
+          oi.cartonId,
+          oi.expirationDate
         )
 
         finalOrderInventories.push(
@@ -1898,7 +1903,10 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
             packingSize: item.packingSize,
             uom: item.uom,
             releaseQty: item.releaseQty,
-            releaseUomValue: item.releaseUomValue
+            releaseUomValue: item.releaseUomValue,
+            batchId: item?.batchId || null,
+            cartonId: item?.cartonId || null,
+            expirationDate: item?.expirationDate || null
           }
         ]
       })

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

@@ -933,11 +933,13 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       `,
     [json_oi, companyBizplaceId.id]
   )
+  const useDetailedQuery = rawReleaseGoods.some(raw => raw.batchId || raw.cartonId || raw.expirationDate)
 
   let availableItems = await tx.query(
     `
-        WITH inv AS (
+      WITH inv AS (
         SELECT i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom,
+          ${useDetailedQuery ? ' i.batch_id, i.carton_id, i.expiration_date,' : ''}
           SUM(i.qty - COALESCE(i.locked_qty, 0)) - COALESCE(
             (
               SELECT SUM(oi.release_qty) FROM order_inventories oi 
@@ -961,8 +963,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
               AND oi.bizplace_id = $2
             ), 0) as "remain_uom_value"
         FROM inventories i
-        LEFT JOIN locations l
-        ON i.location_id = l.id
+        LEFT JOIN locations l ON i.location_id = l.id
         INNER JOIN (
           SELECT rrg.product_id, rrg.product_detail_id, rrg.sku, rrg.product_info, rrg.packing_type, rrg.packing_size, rrg.uom 
           FROM raw_release_goods rrg
@@ -978,8 +979,9 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
         AND i.obsolete = false
         AND i.transfer_qty <= 0
         AND i.transfer_uom_value <= 0
-        GROUP BY i.product_id, foo.product_detail_id, foo.sku,foo.product_info, i.packing_type, i.packing_size, i.uom
-        ORDER BY foo.sku, remain_qty
+        GROUP BY i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom
+        ${useDetailedQuery ? ', i.batch_id, i.carton_id, i.expiration_date' : ''}
+        ORDER BY foo.sku, remain_qty DESC
       ) SELECT * FROM inv WHERE remain_qty > 0
       `,
     [domain.id, bizplaceId, LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
@@ -997,7 +999,10 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       packingSize: Number(item.packing_size || 0),
       uom: item.uom,
       remainQty: item.remain_qty,
-      remainUomValue: item.remain_uom_value
+      remainUomValue: item.remain_uom_value,
+      batchId: item.batch_id ? item.batch_id : null,
+      cartonId: item.carton_id ? item.carton_id : null,
+      expirationDate: item.expiration_date ? _getStdDateStr(new Date(item.expiration_date)) : null
     }
   })
 
@@ -1006,9 +1011,26 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
 
 function _extractData(rawData, validatedData) {
   return rawData.map(raw => {
-    const idx = validatedData.findIndex(val => {
-      const comparison = ['packingType', 'packingSize', 'uom']
+    let errMsg
+    let comparison = ['packingType', 'packingSize', 'uom']
+    let data = validatedData
+    if (raw.batchId) {
+      data = data.filter(val => val.batchId === raw.batchId)
+      comparison.push('batchId')
+      if (!data.length) errMsg = errMsg ? errMsg : 'batch no not matched'
+    }
+    if (raw.cartonId) {
+      data = data.filter(val => val.cartonId === raw.cartonId)
+      comparison.push('cartonId')
+      if (!data.length) errMsg = errMsg ? errMsg : 'carton id not matched'
+    }
+    if (raw.expirationDate) {
+      data = data.filter(val => val.expirationDate === raw.expirationDate)
+      comparison.push('expirationDate')
+      if (!data.length) errMsg = errMsg ? errMsg : 'expiration date not matched'
+    }
 
+    const idx = data.findIndex(val => {
       let a: any = {},
         b: any = {}
 
@@ -1031,32 +1053,32 @@ function _extractData(rawData, validatedData) {
     if (idx >= 0) {
       // assign qty to rawData as much as possible
       releaseUomValue =
-        (Math.round((validatedData[idx]?.remainUomValue / validatedData[idx]?.remainQty) * 100) / 100) * raw.releaseQty
+        (Math.round((data[idx]?.remainUomValue / data[idx]?.remainQty) * 100) / 100) * raw.releaseQty
 
       raw.assignedQty =
-        validatedData[idx].remainQty >= raw.releaseQty
+        data[idx].remainQty >= raw.releaseQty
           ? raw.releaseQty > 0
             ? raw.releaseQty
             : 0
-          : validatedData[idx].remainQty
+          : data[idx].remainQty
 
       raw.assignedUomValue =
-        validatedData[idx].remainUomValue >= releaseUomValue
+        data[idx].remainUomValue >= releaseUomValue
           ? releaseUomValue > 0
             ? releaseUomValue
             : 0
-          : validatedData[idx].remainUomValue
+          : data[idx].remainUomValue
 
       // deduct qty & uomValue from validateData
-      validatedData[idx].remainQty -= raw.assignedQty
-      validatedData[idx].remainUomValue -= raw.assignedUomValue
-
-      raw.productId = validatedData[idx].productId
-      raw.productDetailId = validatedData[idx].productDetailId
-      raw.productInfo = validatedData[idx].productInfo
-      raw.packingType = validatedData[idx].packingType
-      raw.packingSize = validatedData[idx].packingSize
-      raw.uom = validatedData[idx].uom
+      data[idx].remainQty -= raw.assignedQty
+      data[idx].remainUomValue -= raw.assignedUomValue
+
+      raw.productId = data[idx].productId
+      raw.productDetailId = data[idx].productDetailId
+      raw.productInfo = data[idx].productInfo
+      raw.packingType = data[idx].packingType
+      raw.packingSize = data[idx].packingSize
+      raw.uom = data.uom
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0
@@ -1069,7 +1091,8 @@ function _extractData(rawData, validatedData) {
       ...raw,
       releaseUomValue,
       errorMsg:
-        !raw.productId || !raw.productDetailId
+        errMsg ? errMsg
+        : !raw.productId || !raw.productDetailId
           ? 'inventory or product not found'
           : raw.releaseQty <= 0 || raw.releaseQty % 1 !== 0
             ? 'invalid release qty'

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

@@ -415,6 +415,11 @@ export class NewReleaseGood {
   @Field({ nullable: true })
   paidAmount: number
 
+  @Field({ nullable: true })
+  batchId: string
+
+  @Field({ nullable: true })
+  cartonId: string
 }
 
 @InputType()

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

@@ -479,6 +479,9 @@ export class ReleaseGood {
   @Field({ nullable: true })
   batchId: string
 
+  @Field({ nullable: true })
+  cartonId: string
+
   @Field({ nullable: true })
   packingType: string
 

package/server/utils/inventory-util.ts

@@ -626,7 +626,9 @@ export const InventoryUtil = {
     trxMgr: EntityManager,
     batchId?: string,
     preferLocation: string = null,
-    recall: boolean = null
+    recall: boolean = null,
+    cartonId?: string,
+    expirationDate?: Date
   ): Promise<OrderInventory[]> {
     let strictProduct = 'false'
 
@@ -681,7 +683,15 @@ export const InventoryUtil = {
       })
 
     if (batchId) {
-      qb.andWhere('"iv"."batch_id" = :batchId', { batchId: batchId })
+      qb.andWhere('"iv"."batch_id" = :batchId', { batchId })
+    }
+
+    if (cartonId) {
+      qb.andWhere('"iv"."carton_id" = :cartonId', { cartonId })
+    }
+
+    if (expirationDate) {
+      qb.andWhere('"iv"."expiration_date" = :expirationDate', { expirationDate })
     }
 
     if (preferLocation) {