@things-factory/sales-base 4.3.639 → 4.3.643

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,
@@ -303,6 +284,7 @@ export const InventoryUtil = {
                   COALESCE(p.sku, '') AS "productSKU",
                   COALESCE(p.brand, '') AS "productBrand",
                   p.id AS "productId",
+                  p.is_inventory_decimal AS "isInventoryDecimal",
                   i.product_detail_id AS "productDetailId",
                   SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_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(bp.bundle_product_release_uom_value, 0)) - SUM(COALESCE(pds.unassigned_uom_value, 0)) AS "remainUomValue",
@@ -330,8 +312,9 @@ export const InventoryUtil = {
               AND i.transfer_uom_value <= 0
               AND i.lock_inventory is not true
               AND CASE WHEN i.expiration_date IS NOT NULL AND p.min_outbound_shelf_life IS NOT NULL THEN CURRENT_DATE < i.expiration_date - p.min_outbound_shelf_life ELSE true END
-               ${cycleCountFilter ? 
-                  `AND i.id NOT IN (
+               ${
+                 cycleCountFilter
+                   ? `AND i.id NOT IN (
                     SELECT DISTINCT(ici.inventory_id) FROM worksheets w
                     INNER JOIN worksheet_details wd ON wd.worksheet_id = w.id
                     INNER JOIN inventory_check_items ici ON wd.target_inventory_check_item_id = ici.id
@@ -339,8 +322,9 @@ export const InventoryUtil = {
                     AND w.status != 'DONE'
                     AND w.bizplace_id IN (${bizplaceIds})
                     AND w.domain_id = '${domain.id}'
-                    )` : 
-                  `AND true`}
+                    )`
+                   : `AND true`
+               }
               ${productWhereClause}
               GROUP BY
                   i.product_detail_id,
@@ -361,6 +345,7 @@ export const InventoryUtil = {
                   pb.sku AS "productSKU",
                   'brand' AS "productBrand",
                   id AS "productId",
+                  false AS "isInventoryDecimal",
                   pbs.product_detail_id AS "productDetailId",
                   MIN(FLOOR(pbs."availableQty")) AS "remainQty", 
                   MIN(FLOOR(pbs."availableUomValue")) AS "remainUomValue", 
@@ -430,7 +415,7 @@ export const InventoryUtil = {
           } OFFSET $1 LIMIT $2`,
           [(params.pagination.page - 1) * params.pagination.limit, params.pagination.limit]
         )
-      } 
+      }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
 
@@ -440,7 +425,12 @@ export const InventoryUtil = {
     }
   },
 
-  async bizplaceInventoryProductGroupImport(bizplaces: Bizplace[], params: ListParam, context: any, trxMgr: EntityManager) {
+  async bizplaceInventoryProductGroupImport(
+    bizplaces: Bizplace[],
+    params: ListParam,
+    context: any,
+    trxMgr: EntityManager
+  ) {
     try {
       let filters = params.filters
       const { domain }: { domain: Domain } = context.state
@@ -463,12 +453,13 @@ export const InventoryUtil = {
                   COALESCE(p.sku, '') AS "productSKU",
                   COALESCE(p.brand, '') AS "productBrand",
                   p.id AS "productId",
+                  p.is_inventory_decimal AS "isInventoryDecimal",
                   i.product_detail_id AS "productDetailId",
                   p.picking_strategy AS "pickingStrategy",
                   i.created_at AS "createdAt", 
                   i.expiration_date AS "expirationDate", 
                   i.manufacture_date AS "manufactureDate", 
-                  l2.name AS "locationName",  
+                  l2.name AS "name",  
                   l2.zone AS "zone", 
                   l2.row AS "row", 
                   l2.column AS "column", 
@@ -526,12 +517,13 @@ export const InventoryUtil = {
                   pb.sku AS "productSKU",
                   'brand' AS "productBrand",
                   id AS "productId",
+                  false AS "isInventoryDecimal",
                   pbs.product_detail_id AS "productDetailId",
                   NULL AS "pickingStrategy",
                   NULL AS "createdAt",
                   NULL AS "expirationDate", 
                   NULL AS "manufactureDate",
-                  NULL AS "locationName",
+                  NULL AS "name",
                   NULL AS "zone",
                   NULL AS "row",
                   NULL AS "column",
@@ -570,36 +562,37 @@ export const InventoryUtil = {
       })
 
       const getLocationSortingClause = (inventoryAssignmentSetting: any) => {
-      let locationSortingRules: Array<{ name: string; desc: boolean }> = []
+        let locationSortingRules: Array<{ name: string; desc: boolean }> = []
 
-      if (inventoryAssignmentSetting) {
-        try {
-          let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
-          for (const key in locationSetting) {
-            locationSortingRules.push({ name: key, desc: locationSetting[key] !== 'ASC' }) 
+        if (inventoryAssignmentSetting) {
+          try {
+            let locationSetting = JSON.parse(inventoryAssignmentSetting.value)
+            for (const key in locationSetting) {
+              locationSortingRules.push({ name: key, desc: locationSetting[key] !== 'ASC' })
+            }
+          } catch (error) {
+            console.error('Invalid JSON in inventoryAssignmentSetting:', error)
           }
-        } catch (error) {
-          console.error("Invalid JSON in inventoryAssignmentSetting:", error)
         }
-      }
 
-      if (locationSortingRules.length) {
-        return locationSortingRules
-          .map(rule => `
+        if (locationSortingRules.length) {
+          return locationSortingRules
+            .map(
+              rule => `
             CASE
               WHEN "pickingStrategy" = 'LOCATION' THEN "${rule.name}"
             END ${rule.desc ? 'DESC' : 'ASC'}
-          `)
-          .join(',\n')
-      }
-
-      return `
-        CASE
-          WHEN "pickingStrategy" = 'LOCATION' THEN "locationName"
-        END ASC
-      `
-    }
+          `
+            )
+            .join(',\n')
+        }
 
+        return `
+          CASE
+            WHEN "pickingStrategy" = 'LOCATION' THEN "name"
+          END ASC
+        `
+      }
 
       await trxMgr.query(queryStrings, [domain.id])
 
@@ -608,7 +601,6 @@ export const InventoryUtil = {
       let items: any[] = []
 
       if (!params?.pagination) {
-
         const orderByClause = `
               ORDER BY
           ${getLocationSortingClause(inventoryAssignmentSetting)},
@@ -629,9 +621,7 @@ export const InventoryUtil = {
               ELSE NULL
           END ASC
           `
-        items = await trxMgr.query(
-          `select * from temp_inventory_product_group  ${orderByClause}`
-        )
+        items = await trxMgr.query(`select * from temp_inventory_product_group  ${orderByClause}`)
       }
 
       await trxMgr.query(`drop table temp_inventory_product_group`)
@@ -807,7 +797,7 @@ export const InventoryUtil = {
     )
 
     resultQb.forEach(itm => {
-      if (itm.releaseQty > itm.availableQty) {
+      if (parseFloat(itm.releaseQty) > parseFloat(itm.availableQty)) {
         throw new ValidationError({
           ...ValidationError.ERROR_CODES.RELEASE_QTY_OVER_LIMIT,
           detail: { data: JSON.stringify(resultQb) }
@@ -1336,7 +1326,7 @@ export function _composeTargetInventories(
     let orderInventory: OrderInventory = new OrderInventory()
 
     if (inventory.remainQty > leftReleaseQty) {
-      const uomValuePerQty: number = Math.round((inventory.remainUomValue / inventory.remainQty) * 100) / 100
+      const uomValuePerQty: number = Math.round((inventory.remainUomValue / inventory.remainQty) * 1000) / 1000
 
       compReleaseQty += leftReleaseQty
       compReleaseUomValue += leftReleaseUomValue
@@ -1344,7 +1334,7 @@ export function _composeTargetInventories(
       orderInventory = {
         ...orderInventory,
         releaseQty: leftReleaseQty,
-        releaseUomValue: Math.round(leftReleaseQty * uomValuePerQty * 100) / 100
+        releaseUomValue: Math.round(leftReleaseQty * uomValuePerQty * 1000) / 1000
       }
     } else {
       compReleaseQty += inventory.remainQty