@things-factory/sales-base 4.3.638 → 4.3.642

package/server/service/delivery-order/delivery-order-query.ts

@@ -1,36 +1,11 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root
-} from 'type-graphql'
-import {
-  EntityManager,
-  getRepository,
-  In,
-  Not,
-  Repository
-} from 'typeorm'
+import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { EntityManager, getRepository, In, Not, Repository } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import {
-  Product,
-  ProductDetail
-} from '@things-factory/product-base'
-import {
-  buildQuery,
-  convertListParams,
-  Domain,
-  Filter,
-  ListParam,
-  Pagination,
-  Sorting
-} from '@things-factory/shell'
+import { Product, ProductDetail } from '@things-factory/product-base'
+import { buildQuery, convertListParams, Domain, Filter, ListParam, Pagination, Sorting } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
 
 import { ORDER_STATUS } from '../../constants'
@@ -130,6 +105,7 @@ export class DeliveryOrderQuery {
       qb.leftJoinAndSelect('do.releaseGood', 'releaseGood')
       qb.leftJoinAndSelect('do.transportDriver', 'td')
       qb.leftJoinAndSelect('do.transportVehicle', 'th')
+      qb.leftJoinAndSelect('releaseGood.lastMileDelivery', 'lmd')
       qb.leftJoin(
         subQuery => {
           return subQuery
@@ -177,6 +153,25 @@ export class DeliveryOrderQuery {
       qb.orderBy(sort)
 
       let [items, total] = await qb.getManyAndCount()
+
+      items = items.map(itm => {
+        let refNo2 = itm.refNo2 // default
+        if (
+          itm.releaseGood.lastMileDelivery &&
+          itm.releaseGood.lastMileDelivery.isTms === true &&
+          itm.releaseGood.lastMileDelivery.platform === 'VERSA_FLEET'
+        ) {
+          refNo2 = itm.truckNo ? itm.truckNo : itm.releaseGood?.vehicleNo
+        }
+        return {
+          ...itm,
+          releaseGood: {
+            ...itm.releaseGood,
+            refNo2
+          }
+        }
+      })
+
       if (orderProductsApiFilter?.value) {
         items = await Promise.all(
           items.map(async itm => {

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

@@ -224,7 +224,7 @@ export class DeliveryOrder {
   @Column({ nullable: true })
   @Field({ nullable: true })
   billingAddress: String
-  
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   billingAddress2: String
@@ -257,6 +257,10 @@ export class DeliveryOrder {
   @Field({ nullable: true })
   billingCity: String
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  taskId: string
+
   @CreateDateColumn()
   @Field()
   createdAt: Date

package/server/service/inventory-check-item/inventory-check-item-types.ts

@@ -19,7 +19,22 @@ export class NewInventoryCheckItem {
   name: string
 
   @Field({ nullable: true })
-  status: string
+  countNo?: number
+
+  @Field(type => Float, { nullable: true })
+  originQty?: number
+
+  @Field(type => Float, { nullable: true })
+  inspectedQty?: number
+
+  @Field(type => Float, { nullable: true })
+  originUomValue?: number
+
+  @Field(type => Float, { nullable: true })
+  inspectedUomValue?: number
+
+  @Field({ nullable: true })
+  status?: string
 
   @Field(type => InventoryPatch, { nullable: true })
   inventory: InventoryPatch
@@ -42,6 +57,27 @@ export class InventoryCheckItemPatch {
   @Field({ nullable: true })
   name: string
 
+  @Field({ nullable: true })
+  countNo?: number
+
+  @Field(type => Float, { nullable: true })
+  originQty?: number
+
+  @Field(type => Float, { nullable: true })
+  inspectedQty?: number
+
+  @Field(type => Float, { nullable: true })
+  originUomValue?: number
+
+  @Field(type => Float, { nullable: true })
+  inspectedUomValue?: number
+
+  @Field({ nullable: true })
+  status: string
+
+  @Field({ nullable: true })
+  cuFlag: string
+
   @Field(type => ObjectRef, { nullable: true })
   inventory: ObjectRef
 
@@ -51,12 +87,6 @@ export class InventoryCheckItemPatch {
   @Field({ nullable: true })
   batchIdRef: string
 
-  @Field(type => Int, { nullable: true })
-  inspectedQty: number
-
-  @Field(type => Float, { nullable: true })
-  inspectedUomValue: number
-
   @Field(type => ObjectRef, { nullable: true })
   inspectedLocation: ObjectRef
 
@@ -71,7 +101,4 @@ export class InventoryCheckItemPatch {
 
   @Field({ nullable: true })
   productDetailId: string
-
-  @Field({ nullable: true })
-  status: string
 }

package/server/service/inventory-check-item/inventory-check-item.ts

@@ -64,19 +64,67 @@ export class InventoryCheckItem {
   @Field({ nullable: true })
   countNo: 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 })
   originQty: 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 })
   inspectedQty: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   originUomValue: number
 
-  @Column({ nullable: true, type: 'float' })
+  @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 })
   inspectedUomValue: number
 

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

@@ -294,8 +294,12 @@ export class OrderInventoryQuery {
           value: releaseGood.id,
           relation: true
         })
+      } else {
+        // If no matching release good is found, return empty result
+        return { items: [], total: 0 }
       }
     }
+
     const qb: SelectQueryBuilder<OrderInventory> = getRepository(OrderInventory).createQueryBuilder('oi')
     buildQuery(qb, params, context)
 
@@ -327,6 +331,7 @@ export class OrderInventoryQuery {
         productName: item.inventory.product.name,
         productSKU: item.inventory.product.sku,
         productBrand: item.inventory.product.brand,
+        isInventoryDecimal: item.inventory.product.isInventoryDecimal,
         packingSize: item.inventory.packingSize
       }
     })

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

@@ -68,16 +68,16 @@ export class NewOrderInventory {
   @Field({ nullable: true })
   releaseOrderId: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   releaseQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   pickedQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   sortedQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packedQty: number
 
   @Field(type => Float, { nullable: true })
@@ -104,13 +104,13 @@ export class NewOrderInventory {
   @Field({ nullable: true })
   existingRow: boolean
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   returnQty: number
 
   @Field(type => Float, { nullable: true })
   returnUomValue: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   returnToLocationQty: number
 
   @Field(type => Float, { nullable: true })
@@ -146,7 +146,7 @@ export class OrderInventoryPatch {
   @Field(type => ObjectRef, { nullable: true })
   inventory: ObjectRef
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   inspectedQty: number
 
   @Field(type => Float, { nullable: true })
@@ -188,19 +188,19 @@ export class OrderInventoryPatch {
   @Field({ nullable: true })
   extraJsonData: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   releaseQty: number
 
   @Field({ nullable: true })
   serialNumber: string
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   sortedQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   pickedQty: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packedQty: number
 
   @Field({ nullable: true })
@@ -221,7 +221,7 @@ export class OrderInventoryPatch {
   @Field(type => Float, { nullable: true })
   returnUomValue: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   actualPackQty: number
 
   @Field(type => Int, { nullable: true })

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