@things-factory/sales-base 3.7.1 → 3.7.6

package/server/utils/inventory-util.ts

@@ -67,7 +67,8 @@ export const InventoryUtil = {
               oi.product_id,
               p.name AS product_name,
               oi.packing_type,
-              oi.packing_size
+              oi.packing_size,
+              oi.uom
             FROM
               order_inventories oi
             LEFT JOIN
@@ -80,12 +81,14 @@ export const InventoryUtil = {
               AND oi.product_id NOTNULL
               AND oi.packing_type NOTNULL
               AND oi.packing_size NOTNULL
+              AND oi.inventory_id IS NULL
             GROUP BY
               oi.batch_id,
               oi.batch_id_ref,
               oi.product_id,
               oi.packing_type,
               oi.packing_size,
+              oi.uom,
               p.name
           )
           SELECT
@@ -104,7 +107,7 @@ export const InventoryUtil = {
           FROM
             inventories i
             LEFT JOIN products p ON i.product_id = p.id
-            LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size
+            LEFT JOIN oi ON i.batch_id = oi.batch_id AND p.name = oi.product_name AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
             LEFT JOIN (
               SELECT pbs.product_id, SUM(pbs.bundle_qty * src.release_qty) AS bundle_product_release_qty, SUM(pbs.bundle_qty * src.release_uom_value) AS bundle_product_release_uom_value 
               FROM product_bundle_settings pbs
@@ -189,14 +192,15 @@ export const InventoryUtil = {
           product_id: x.product.id,
           batch_id: x.batchId,
           packing_type: x.packingType,
-          release_qty: x.releaseQty
+          release_qty: x.releaseQty,
+          uom: x.uom
         }
       })
     )
 
     let resultQb = await trxMgr.query(
       `
-      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.release_qty as "releaseQty",
+      select joi.product_id as "productId", joi.batch_id as "batchId", joi.packing_type as "packingType", joi.uom as "uom", joi.release_qty as "releaseQty",
       sum(i.qty - coalesce(i.locked_qty,0)) - coalesce(
       (
         select sum(oi.release_qty) from order_inventories oi 
@@ -205,6 +209,7 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
       ),0) as "availableQty",
@@ -216,16 +221,18 @@ export const InventoryUtil = {
         and oi.product_id = joi.product_id
         and oi.batch_id = joi.batch_id
         and oi.packing_type = joi.packing_type
+        and oi.uom = joi.uom
         and oi.domain_id = $1
         and oi.bizplace_id = $2
-      ),0) as "availableUomValue", i.uom
+      ),0) as "availableUomValue"
       from json_populate_recordset(NULL::order_inventories,'${json_oi}') joi
       left join inventories i on joi.product_id = i.product_id 
       and joi.batch_id = i.batch_id
       and joi.packing_type = i.packing_type and i.status ='STORED'
+      and joi.uom = i.uom
       and i.domain_id = $1
       and i.bizplace_id = $2
-      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, i.uom
+      group by joi.product_id, joi.batch_id, joi.packing_type, joi.release_qty, joi.uom
     `,
       [warehouseDomain.id, partnerBizplace.id]
     )
@@ -325,6 +332,10 @@ async function getConditions(
             whereClause += `AND LOWER("batchId") LIKE '${value.toLowerCase()}'`
             break
 
+          case 'batchIdRef':
+            whereClause += `AND LOWER("batchIdRef") LIKE '${value.toLowerCase()}'`
+            break
+
           case 'productName':
             const products: Product[] = await trxMgr.getRepository(Product).find({
               select: ['id'],
@@ -409,19 +420,19 @@ async function getConditions(
           case 'batch_product':
             productWhereClause += `
               AND (i.batch_id, p.id, i.packing_type) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map(
-                (v: { batchId: string; productId: string; packingType: string }) =>
-                  `('${v.batchId}', '${v.productId}', '${v.packingType}')`
-              )
-              .join()})
+                .map(
+                  (v: { batchId: string; productId: string; packingType: string }) =>
+                    `('${v.batchId}', '${v.productId}', '${v.packingType}')`
+                )
+                .join()})
             `
             break
 
           case 'batch_bundle':
             bundleWhereClause += `
               ${bundleWhereClause == '' ? 'WHERE' : 'AND'} pb.id ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
-              .map((v: { productId: string }) => `('${v.productId}')`)
-              .join()})
+                .map((v: { productId: string }) => `('${v.productId}')`)
+                .join()})
             `
             break
         }