@things-factory/sales-base 4.3.639 → 4.3.642

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

@@ -153,7 +153,18 @@ export class OrderInventory {
   @Field(type => User, { nullable: true })
   putawayBy: User
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   actualPackUomValue: number
 
@@ -229,7 +240,18 @@ export class OrderInventory {
   @Field({ nullable: true })
   originQty: 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 })
   inspectedQty: number
 
@@ -237,7 +259,18 @@ export class OrderInventory {
   @Field({ nullable: true })
   originUomValue: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   inspectedUomValue: number
 
@@ -270,23 +303,86 @@ export class OrderInventory {
   @RelationId((orderInventory: OrderInventory) => orderInventory.binLocation)
   binLocationId: string
 
-  @Column({ nullable: true, type: 'float' })
+  @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', default: 0 })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    default: 0,
+    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 })
   pickedQty: number
 
-  @Column({ nullable: true, type: 'float', default: 0 })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    default: 0,
+    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
 
-  @Column({ nullable: true, type: 'float', default: 0 })
+  @Column({
+    nullable: true,
+    type: 'decimal',
+    scale: 3,
+    default: 0,
+    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 })
   sortedQty: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   releaseUomValue: number
 
@@ -294,23 +390,82 @@ export class OrderInventory {
   @Field({ nullable: true })
   uom: string
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   returnQty: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   returnUomValue: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   returnToLocationQty: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   returnToLocationUomValue: 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
 
@@ -490,6 +645,9 @@ export class OrderInventory {
   @Field({ nullable: true })
   pickingBin: string
 
+  @Field({ nullable: true })
+  isInventoryDecimal: boolean
+
   @Field(type => [ProductDetail], { nullable: true })
   productDetails: ProductDetail[]
 }

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