@things-factory/sales-base 4.3.639 → 4.3.642

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

@@ -66,6 +66,40 @@ import { ReleaseGood } from './release-good'
 import { bulkReleaseGoodsAvailableItemsFunction } from './release-good-query'
 import { getTmsService } from '@things-factory/integration-lmd'
 
+// Utility function for safe decimal arithmetic
+function safeDecimalOperation(value1: number, value2: number, operation: 'add' | 'subtract' | 'multiply'): number {
+  // Convert to string with fixed precision to avoid floating point issues
+  const num1 = parseFloat(value1.toFixed(3))
+  const num2 = parseFloat(value2.toFixed(3))
+
+  let result: number
+  switch (operation) {
+    case 'add':
+      result = num1 + num2
+      break
+    case 'subtract':
+      result = num1 - num2
+      break
+    case 'multiply':
+      result = num1 * num2
+      break
+    default:
+      throw new Error('Invalid operation')
+  }
+
+  // Ensure result is within valid range and has correct precision
+  if (result < 0) {
+    throw new Error('Decimal value cannot be negative')
+  }
+
+  // Check if result exceeds maximum precision (10 digits total with 3 decimal places)
+  if (result > 9999999.999) {
+    throw new Error('Decimal value exceeds maximum allowed precision')
+  }
+
+  return parseFloat(result.toFixed(3))
+}
+
 @Resolver(ReleaseGood)
 export class ReleaseGoodMutation {
   @Directive('@privilege(category: "order_customer", privilege: "mutation")')
@@ -445,8 +479,8 @@ export async function deleteReleaseGood(tx: EntityManager, name: string, user: U
 
         await tx.getRepository(Inventory).save({
           ...oi.inventory,
-          lockedQty: oi.inventory.lockedQty - oi.releaseQty,
-          lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue,
+          lockedQty: safeDecimalOperation(oi.inventory.lockedQty, oi.releaseQty, 'subtract'),
+          lockedUomValue: safeDecimalOperation(oi.inventory.lockedUomValue, oi.releaseUomValue, 'subtract'),
           updater: user
         })
       }
@@ -813,8 +847,12 @@ export async function generateReleaseGoodFunction(
           pbSettings.forEach(pbs => {
             splitOI = {
               ...oi,
-              releaseQty: oi.releaseQty * pbs.bundleQty,
-              releaseUomValue: oi.releaseUomValue * pbs.bundleQty * pbs.product.primaryValue,
+              releaseQty: safeDecimalOperation(oi.releaseQty, pbs.bundleQty, 'multiply'),
+              releaseUomValue: safeDecimalOperation(
+                safeDecimalOperation(oi.releaseUomValue, pbs.bundleQty, 'multiply'),
+                pbs.product.primaryValue,
+                'multiply'
+              ),
               packingType: pbs.product.packingType,
               batchId: '',
               product: {
@@ -1414,8 +1452,8 @@ export async function rejectReleaseGood(
 
             await tx.getRepository(Inventory).save({
               ...oi.inventory,
-              lockedQty: oi.inventory.lockedQty - oi.releaseQty,
-              lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue,
+              lockedQty: safeDecimalOperation(oi.inventory.lockedQty, oi.releaseQty, 'subtract'),
+              lockedUomValue: safeDecimalOperation(oi.inventory.lockedUomValue, oi.releaseUomValue, 'subtract'),
               updater: user
             })
           }
@@ -1921,7 +1959,11 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
 
       // if there is duplicated SKU, merge them and sum up the releaseQty
       if (duplicateSkuIdx >= 0) {
-        releaseGoods[idx].orderInventories[duplicateSkuIdx].releaseQty += item.releaseQty
+        releaseGoods[idx].orderInventories[duplicateSkuIdx].releaseQty = safeDecimalOperation(
+          releaseGoods[idx].orderInventories[duplicateSkuIdx].releaseQty,
+          item.releaseQty,
+          'add'
+        )
       } else {
         releaseGoods[idx].orderInventories.push({
           sku: item.sku,
@@ -1929,8 +1971,8 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
           packingType: item.packingType,
           packingSize: item.packingSize,
           uom: item.uom,
-          releaseQty: item.releaseQty,
-          releaseUomValue: item.releaseUomValue
+          releaseQty: Math.round(parseFloat(item.releaseQty) * 1000) / 1000,
+          releaseUomValue: Math.round(parseFloat(item.releaseUomValue) * 1000) / 1000,
         })
       }
     } else {

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

@@ -970,7 +970,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
           packing_type VARCHAR(50),
           packing_size FLOAT,
           uom VARCHAR(10),
-          release_qty INT
+          release_qty NUMERIC(15,3)
         );
       `
   )
@@ -1027,9 +1027,11 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
               AND oi.uom = i.uom
               AND oi.domain_id = $1
               AND oi.bizplace_id = $2
-            ), 0) as "remain_uom_value"
+            ), 0) as "remain_uom_value",
+          p.is_inventory_decimal
         FROM inventories i
-        LEFT JOIN locations l ON i.location_id = l.id
+        INNER JOIN locations l ON i.location_id = l.id
+        LEFT JOIN products p ON i.product_id = p.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
@@ -1045,7 +1047,7 @@ 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
+        GROUP BY i.product_id, foo.product_detail_id, foo.sku, foo.product_info, i.packing_type, i.packing_size, i.uom, p.is_inventory_decimal
         ${useDetailedQuery ? ', i.batch_id, i.carton_id, i.expiration_date' : ''}
         ORDER BY foo.sku, remain_qty DESC
       ) SELECT * FROM inv WHERE remain_qty > 0
@@ -1056,7 +1058,7 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
   await tx.query(`DROP TABLE raw_release_goods`)
 
   availableItems = availableItems.map(item => {
-    return {
+    const mappedItem = {
       productId: item.product_id,
       productDetailId: item.product_detail_id,
       productInfo: item.product_info,
@@ -1068,8 +1070,10 @@ export async function bulkReleaseGoodsAvailableItemsFunction(
       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
+      expirationDate: item.expiration_date ? _getStdDateStr(new Date(item.expiration_date)) : null,
+      isInventoryDecimal: item.is_inventory_decimal === true
     }
+    return mappedItem
   })
 
   return _extractData(rawReleaseGoods, availableItems)
@@ -1120,17 +1124,25 @@ function _extractData(rawData, validatedData) {
     // if sku is matched, assign qty and product id
     if (idx >= 0) {
       // assign qty to rawData as much as possible
-      releaseUomValue = (Math.round((data[idx]?.remainUomValue / data[idx]?.remainQty) * 100) / 100) * raw.releaseQty
+      releaseUomValue = (Math.round((data[idx]?.remainUomValue / data[idx]?.remainQty) * 1000) / 1000) * raw.releaseQty
 
       raw.assignedQty =
-        data[idx].remainQty >= raw.releaseQty ? (raw.releaseQty > 0 ? raw.releaseQty : 0) : data[idx].remainQty
+        Math.round(
+          (data[idx].remainQty >= raw.releaseQty
+        ? raw.releaseQty > 0
+          ? raw.releaseQty
+          : 0
+        : data[idx].remainQty) * 1000
+        ) / 1000
 
       raw.assignedUomValue =
-        data[idx].remainUomValue >= releaseUomValue
-          ? releaseUomValue > 0
-            ? releaseUomValue
-            : 0
-          : data[idx].remainUomValue
+        Math.round(
+          (data[idx].remainUomValue >= releaseUomValue
+        ? releaseUomValue > 0
+          ? releaseUomValue
+          : 0
+        : data[idx].remainUomValue) * 1000
+        ) / 1000
 
       // deduct qty & uomValue from validateData
       data[idx].remainQty -= raw.assignedQty
@@ -1142,6 +1154,7 @@ function _extractData(rawData, validatedData) {
       raw.packingType = data[idx].packingType
       raw.packingSize = data[idx].packingSize
       raw.uom = data[idx].uom
+      raw.isInventoryDecimal = data[idx].isInventoryDecimal === true
     } else {
       raw.assignedQty = 0
       raw.assignedUomValue = 0
@@ -1162,9 +1175,12 @@ function _extractData(rawData, validatedData) {
         if (!raw.productId || !raw.productDetailId) {
           errors.push('inventory or product not found')
         }
-        if (raw.releaseQty <= 0 || raw.releaseQty % 1 !== 0) {
+        if (raw.releaseQty <= 0) {
           errors.push('invalid release qty')
         }
+        if (raw.releaseQty % 1 !== 0 && raw.isInventoryDecimal !== true) {
+          errors.push('decimal quantities are not allowed for this product')
+        }
         if (raw.assignedQty < raw.releaseQty) {
           errors.push('insufficient stock')
         }

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

@@ -99,7 +99,7 @@ export class InventoryInfos {
   @Field(type => Float, { nullable: true })
   packingSize?: number
 
-  @Field(type => Int, { nullable: false })
+  @Field(type => Float, { nullable: false })
   qty?: number
 
   @Field(type => Float, { nullable: true })

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