@things-factory/sales-base 4.3.636 → 4.3.637

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

@@ -1,4 +1,4 @@
-import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+import { Field, Float, ID, InputType, Int, ObjectType } from 'type-graphql'
 
 import { OrderPackageItem } from './order-package-item'
 
@@ -9,6 +9,12 @@ export class NewOrderPackageItem {
 
   @Field({ nullable: true })
   status?: string
+
+  @Field(type => Float, { nullable: true })
+  releaseQty?: number
+
+  @Field(type => Float, { nullable: true })
+  packedQty?: number
 }
 
 @InputType()
@@ -19,9 +25,12 @@ export class OrderPackageItemPatch {
   @Field({ nullable: true })
   name?: string
 
-  @Field({ nullable: true })
+  @Field(type => Float, { nullable: true })
   releaseQty?: number
 
+  @Field(type => Float, { nullable: true })
+  packedQty?: number
+
   @Field({ nullable: true })
   status?: string
 
@@ -46,6 +55,6 @@ export class TrackingInformation {
   @Field(type => String)
   sku: string
 
-  @Field(type => String)
+  @Field(type => Float)
   releaseQty: number
 }

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,18 @@ export class OrderToteItem {
   @RelationId((orderToteItem: OrderToteItem) => orderToteItem.orderTote)
   orderToteId: string
 
-  @Column('int')
+  @Column({
+    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 })
   qty?: number
 

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

@@ -37,6 +37,9 @@ export class InventoryProductGroup {
   @Field({ nullable: true })
   productBrand: string
 
+  @Field({ nullable: true })
+  isInventoryDecimal: boolean
+
   @Field({ nullable: true })
   packingType: string
 

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

@@ -65,6 +65,40 @@ import { editVas } from '../vas'
 import { ReleaseGood } from './release-good'
 import { bulkReleaseGoodsAvailableItemsFunction } from './release-good-query'
 
+// 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")')
@@ -444,8 +478,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
         })
       }
@@ -806,8 +840,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: {
@@ -1397,8 +1435,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
             })
           }
@@ -1889,7 +1927,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,
@@ -1897,8 +1939,8 @@ function extractRawReleaseGoods(rawReleaseGoods): Partial<ReleaseGood[]> {
           packingType: item.packingType,
           packingSize: item.packingSize,
           uom: item.uom,
-          releaseQty: item.releaseQty,
-          releaseUomValue: item.releaseUomValue
+          releaseQty: parseFloat(item.releaseQty.toFixed(3)),
+          releaseUomValue: parseFloat(item.releaseUomValue.toFixed(3))
         })
       }
     } else {