@things-factory/sales-base 4.3.248 → 4.3.249

package/server/utils/inventory-util.ts

@@ -1,29 +1,10 @@
-import {
-  EntityManager,
-  Equal,
-  getRepository,
-  In,
-  Not,
-  Raw,
-  Repository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { EntityManager, Equal, getRepository, In, Not, Raw, Repository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
-import {
-  Product,
-  ProductBundle,
-  ProductDetail
-} from '@things-factory/product-base'
-import {
-  PartnerSetting,
-  Setting
-} from '@things-factory/setting-base'
-import {
-  Domain,
-  ListParam
-} from '@things-factory/shell'
+import { Product, ProductBundle, ProductDetail } from '@things-factory/product-base'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import { Domain, ListParam } from '@things-factory/shell'
 import {
   generateInventoryHistory,
   Inventory,
@@ -122,14 +103,15 @@ export const InventoryUtil = {
               coalesce(p.brand, '') AS "productBrand",
               p.id AS "productId",
               pd.id AS "productDetailId",
-              COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)),0) AS "remainQty",
-              COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)),0) AS "remainUomValue",
-              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)), ' ', pd.uom) AS "remainUomValueWithUom",
+              COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)),0) AS "remainQty",
+              COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)),0) AS "remainUomValue",
+              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)), ' ', pd.uom) AS "remainUomValueWithUom",
               COALESCE(SUM(COALESCE(i.transfer_qty, 0)), 0) AS "transferQty",
               COALESCE(SUM(COALESCE(i.transfer_uom_value, 0)), 0) AS "transferUomValue",
               'SINGLE' AS "groupType"
             FROM products p
             INNER join product_details pd on pd.product_id = p.id
+            LEFT JOIN product_detail_stocks pds on pds.product_detail_id = pd.id
             LEFT JOIN (
               SELECT i.* FROM inventories i 
               INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id
@@ -175,13 +157,14 @@ export const InventoryUtil = {
             FROM product_bundles pb
             LEFT JOIN (
               SELECT pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
-              (SUM(COALESCE(i2.qty, 0)) - SUM(COALESCE(i2.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
-              (SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
+              (SUM(COALESCE(i2.qty, 0)) - SUM(COALESCE(i2.locked_qty, 0)) - SUM(COALESCE(pds2.unassigned_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
+              (SUM(COALESCE(i2.uom_value, 0)) - SUM(COALESCE(i2.locked_uom_value, 0)) - SUM(COALESCE(pds2.unassigned_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
               (SUM(COALESCE(i2.transfer_qty, 0)) / min(pbs.bundle_qty)) AS "transferQty",
               (SUM(COALESCE(i2.transfer_uom_value, 0)) / min(pbs.bundle_qty)) AS "transferUomValue",
               pbs.product_detail_id
               FROM product_bundle_settings pbs 
               LEFT JOIN inventories i2 ON i2.product_id = pbs.product_id AND i2.domain_id = $1 AND i2.status = 'STORED'
+              LEFT JOIN product_detail_stocks pds2 ON pds2.product_detail_id = pbs.product_detail_id
               INNER JOIN locations l2 ON i2.location_id = l2.id                
               LEFT JOIN oi ON oi.product_id = i2.product_id
               WHERE l2.type NOT IN ('${LOCATION_TYPE.QUARANTINE}', '${LOCATION_TYPE.RESERVE}')
@@ -305,13 +288,14 @@ export const InventoryUtil = {
               coalesce(p.brand, '') AS "productBrand",
               p.id AS "productId",
               i.product_detail_id AS "productDetailId",
-              SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) AS "remainQty",
-              SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) AS "remainUomValue",
-              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)), ' ', i.uom) AS "remainUomValueWithUom",
+              SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0)) - MAX(COALESCE(bp.bundle_product_release_qty, 0)) - SUM(COALESCE(pds.unassigned_qty, 0))  AS "remainQty",
+              SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)) AS "remainUomValue",
+              concat(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)) - MAX(COALESCE(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value)), ' ', i.uom) AS "remainUomValueWithUom",
               'SINGLE' AS "groupType"
             FROM
               inventories i
               LEFT JOIN products p ON i.product_id = p.id
+              LEFT JOIN product_detail_stocks pds ON pds.product_detail_id = i.product_detail_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 AND i.uom = oi.uom
               LEFT JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id
               LEFT JOIN (
@@ -535,7 +519,7 @@ export const InventoryUtil = {
       validOrderInventories.map(x => {
         return {
           product_detail_id: x.productDetail.id,
-          batch_id: x.batchId.replace(`'`,`''`),
+          batch_id: x.batchId.replace(`'`, `''`),
           release_qty: x.releaseQty,
           uom: x.uom
         }
@@ -652,11 +636,10 @@ export const InventoryUtil = {
     })
 
     if (partnerStrictProductSelectionSetting) strictProduct = partnerStrictProductSelectionSetting.value
-    
-    
+
     let locationTypes = [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
 
-    if(recall === false){
+    if (recall === false) {
       locationTypes.push(LOCATION_TYPE.DAMAGE)
     }
 
@@ -812,7 +795,7 @@ async function getConditions(
     WHERE pb.status = 'ACTIVATED'
   `
 
-  let whereClause = hasRemainingQty ? ` WHERE "remainQty" > 0` : ` WHERE 1 = 1`
+  let whereClause = hasRemainingQty ? ` WHERE "remainQty" > 0 ` : ` WHERE 1 = 1 `
 
   let productDetailWhereClause = ``
 
@@ -845,7 +828,7 @@ async function getConditions(
 
           case 'batchId':
             let batchId = `${value}`
-            whereClause += `AND LOWER("batchId") LIKE '${batchId.replace(`'`,`''`).toLowerCase()}'`
+            whereClause += `AND LOWER("batchId") LIKE '${batchId.replace(`'`, `''`).toLowerCase()}'`
             break
 
           case 'batchIdRef':
@@ -949,7 +932,7 @@ async function getConditions(
               AND (i.batch_id, p.id, i.packing_type, i.packing_size) ${operator === 'in' ? 'IN' : 'NOT IN'} (${value
               .map(
                 (v: { batchId: string; productId: string; packingType: string; packingSize: string }) =>
-                  `('${v.batchId.replace(`'`,`''`)}', '${v.productId}', '${v.packingType}', '${v.packingSize}')`
+                  `('${v.batchId.replace(`'`, `''`)}', '${v.productId}', '${v.packingType}', '${v.packingSize}')`
               )
               .join()})
             `
@@ -1117,6 +1100,7 @@ export function _composeTargetInventories(
     }
 
     orderInventories.push({
+      ...record,
       ...orderInventory,
       inventory,
       packingType,