@things-factory/sales-base 4.3.639 → 4.3.643

package/server/service/order-package-item/order-package-item.ts

@@ -70,11 +70,35 @@ export class OrderPackageItem {
   @Field({ nullable: true })
   status?: string
 
-  @Column({ nullable: true })
+  @Column({
+    type: 'decimal',
+    scale: 3,
+    nullable: true,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   releaseQty: number
 
-  @Column({ nullable: true })
+  @Column({
+    type: 'decimal',
+    scale: 3,
+    nullable: true,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   packedQty: number
 

package/server/service/order-product/order-product-types.ts

@@ -132,25 +132,25 @@ export class OrderProductPatch {
   @Field(type => Float, { nullable: true })
   unpackUomValue: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   unpackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   palletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPalletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPalletQty: number
 
   @Field({ nullable: true })
@@ -162,7 +162,7 @@ export class OrderProductPatch {
   @Field({ nullable: true })
   totalUomValue: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   releaseQty: number
 
   @Field(type => Float, { nullable: true })
@@ -282,37 +282,37 @@ export class NewOrderProduct {
   @Field(type => Float, { nullable: true })
   unpackUomValue: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   unpackQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   palletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPalletQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   adjustedPalletQty: number
 
   @Field({ nullable: true })
-  palletId: string
+  adjustedTotalUomValue: string
 
   @Field({ nullable: true })
-  adjustedTotalUomValue: string
+  palletId: string
 
   @Field({ nullable: true })
   totalUomValue: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   releaseQty: number
 
   @Field(type => Float, { nullable: true })

package/server/service/order-product/order-product.ts

@@ -254,25 +254,101 @@ export class OrderProduct {
   @Field({ nullable: true })
   adjustedUomValue: number
 
-  @Column('float', { nullable: true })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
+  @Field({ nullable: true })
+  unpackQty: number
+
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   unpackUomValue: number
 
-  @Column()
-  @Field()
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
+  @Field({ nullable: true })
   packQty: number
 
-  @Column({ nullable: true })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   adjustedPackQty: number
 
-  @Column({ nullable: true })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   actualPackQty: number
 
-  @Column('float', { nullable: true })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
-  unpackQty: number
+  releaseUomValue: number
 
   @Column('float', { nullable: true })
   @Field({ nullable: true })
@@ -326,14 +402,22 @@ export class OrderProduct {
   @Field({ nullable: true })
   adjustedTotalUomValue: string
 
-  @Column({ nullable: true })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   releaseQty: number
 
-  @Column({ nullable: true, type: 'float' })
-  @Field({ nullable: true })
-  releaseUomValue: number
-
   @Column({ nullable: true })
   @Field({ nullable: true })
   remark: string

package/server/service/order-tote-item/order-tote-item-types.ts

@@ -1,4 +1,4 @@
-import { Field, InputType, Int, ObjectType } from 'type-graphql'
+import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
 
 import { ObjectRef } from '@things-factory/shell'
 
@@ -30,7 +30,7 @@ export class NewOrderToteItem {
   @Field(type => ObjectRef, { nullable: true })
   orderTote: ObjectRef
 
-  @Field(type => Int)
+  @Field(type => Float, { nullable: true })
   qty: number
 }
 
@@ -51,6 +51,6 @@ export class OrderToteItemPatch {
   @Field(type => ObjectRef, { nullable: true })
   orderTote: ObjectRef
 
-  @Field(type => Int)
+  @Field(type => Float, { nullable: true })
   qty: number
 }

package/server/service/order-tote-item/order-tote-item.ts

@@ -47,7 +47,20 @@ export class OrderToteItem {
   @RelationId((orderToteItem: OrderToteItem) => orderToteItem.orderTote)
   orderToteId: string
 
-  @Column('int')
+  @Column({
+    type: 'decimal',
+    scale: 3,
+    default: 0,
+    nullable: true,
+    transformer: {
+      to: (value: string | null) => value,
+      from: (value: string | null) => {
+        if (value === null || value === undefined) return null
+        const parsed = parseFloat(value)
+        return isNaN(parsed) ? null : parsed
+      }
+    }
+  })
   @Field({ nullable: true })
   qty?: number
 

package/server/service/others/other-query.ts

@@ -212,11 +212,11 @@ export class OtherQuery {
         productDetail: availableItem ? { id: availableItem.productDetailId } : null,
         inventory: availableItem
           ? {
-              ...availableItem,
-              remainQty: availableItem ? availableItem.remainQty : null,
-              remainUomValue: availableItem ? availableItem.remainUomValue : null,
-              remainUomValueWithUom: availableItem ? availableItem.remainUomValueWithUom : ''
-            }
+          ...availableItem,
+          remainQty: availableItem.remainQty,
+          remainUomValue: availableItem.remainUomValue,
+          remainUomValueWithUom: availableItem.remainUomValueWithUom || ''
+        }
           : null,
         productId: availableItem ? availableItem.productId : null,
         productDetailID: availableItem ? availableItem.productDetailId : null,
@@ -231,13 +231,13 @@ export class OtherQuery {
         packingType: availableItem ? availableItem.packingType : orderInventory.packingType,
         packingSize: availableItem ? availableItem.packingSize : 1,
         releaseQty: orderInventory.releaseQty
-          ? Number.isInteger(orderInventory.releaseQty)
+          ? !Number.isNaN(orderInventory.releaseQty)
             ? orderInventory.releaseQty
             : null
           : null,
         releaseUomValue: availableItem
-          ? Number.isInteger(orderInventory.releaseQty)
-            ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(2))
+          ? !Number.isNaN(orderInventory.releaseQty)
+            ? parseFloat((orderInventory.releaseQty * packageUomValue).toFixed(3))
             : null
           : null,
         groupType: availableItem ? availableItem.groupType : null,

package/server/service/others/other-types.ts

@@ -37,22 +37,25 @@ export class InventoryProductGroup {
   @Field({ nullable: true })
   productBrand: string
 
+  @Field({ nullable: true })
+  isInventoryDecimal: boolean
+
   @Field({ nullable: true })
   packingType: string
 
   @Field(type => Float, { nullable: true })
   packingSize: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   totalQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   totalLockedQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   totalLockedUomValue: number
 
   @Field(type => Int, { nullable: true })

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 })