@things-factory/sales-base 4.3.639 → 4.3.643

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

@@ -48,11 +48,11 @@ export class DraftReleaseGoodQuery {
       const skuFilter = params.filters.find(param => param.name === 'sku')
       const orderFilter = params.filters.find(param => param.name === 'name')
       const priorityDeliveryFilter = params.filters.find(param => param.name === 'priorityDelivery')
-      const fromDateParam = new Date (params.filters.find(param => param.name === 'fromDate').value)
+      const fromDateParam = new Date(params.filters.find(param => param.name === 'fromDate').value)
       const toDateParam = new Date(params.filters.find(param => param.name === 'toDate').value)
 
       const fromDateFilter = fromDateParam.toISOString()
-      const toDateFilter =  new Date(toDateParam.setDate(toDateParam.getDate() + 1)).toISOString()
+      const toDateFilter = new Date(toDateParam.setDate(toDateParam.getDate() + 1)).toISOString()
 
       let bizplaceIds = []
       if (!bizplaceFilter) {
@@ -68,13 +68,16 @@ export class DraftReleaseGoodQuery {
           .filter(res => res !== '%')
           .join('')
 
-        products = "{" + removeSymbol
-          .toLowerCase()
-          .split(',')
-          .map(prod => {
-            return '"%' + prod.trim().replace(/'/g, "''") + '%"'
-          })
-          .join(',') + "}"
+        products =
+          '{' +
+          removeSymbol
+            .toLowerCase()
+            .split(',')
+            .map(prod => {
+              return '"%' + prod.trim().replace(/'/g, "''") + '%"'
+            })
+            .join(',') +
+          '}'
       }
 
       let orderInfos
@@ -84,30 +87,34 @@ export class DraftReleaseGoodQuery {
           .filter(res => res !== '%')
           .join('')
 
-          orderInfos = "{" + removeSymbol
-          .toLowerCase()
-          .split(',')
-          .map(prod => {
-            return '"%' + prod.trim().replace(/'/g, "''") + '%"'
-          })
-          .join(',') + "}"
+        orderInfos =
+          '{' +
+          removeSymbol
+            .toLowerCase()
+            .split(',')
+            .map(prod => {
+              return '"%' + prod.trim().replace(/'/g, "''") + '%"'
+            })
+            .join(',') +
+          '}'
       }
 
       const arrChildSortData = ['bizplace', 'creator']
-      const camelToSnakeCase = (str) => str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`);
-      const handleOrderBy = (params) => {
+      const camelToSnakeCase = str => str.replace(/[A-Z]/g, letter => `_${letter.toLowerCase()}`)
+      const handleOrderBy = params => {
         if (!params.sortings || params.sortings.length === 0) {
-          return 'rank ASC, drg.created_at DESC';
+          return 'rank ASC, drg.created_at DESC'
         }
-      
-        return params.sortings.map(sort => {
-          const field = arrChildSortData.indexOf(sort.name) >= 0
-            ? `${sort.name}.name`
-            : `drg.${camelToSnakeCase(sort.name)}`;
-          const direction = sort.desc ? 'DESC' : 'ASC';
-          return `${field} ${direction}`;
-        }).join(', ');
-      };
+
+        return params.sortings
+          .map(sort => {
+            const field =
+              arrChildSortData.indexOf(sort.name) >= 0 ? `${sort.name}.name` : `drg.${camelToSnakeCase(sort.name)}`
+            const direction = sort.desc ? 'DESC' : 'ASC'
+            return `${field} ${direction}`
+          })
+          .join(', ')
+      }
 
       const sort = handleOrderBy(params)
 
@@ -127,7 +134,7 @@ export class DraftReleaseGoodQuery {
           sort,
           params.pagination?.limit || 50
         ]
-      );
+      )
 
       let newPlatformCode
       let uniqueItems = await removeDuplicates(items)
@@ -182,7 +189,7 @@ export class DraftReleaseGoodQuery {
         }
       })
 
-      let total = (await tx.query(
+      let total = await tx.query(
         `SELECT COUNT(*) FROM get_draft_release_goods($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)`,
         [
           domain.id,
@@ -198,7 +205,7 @@ export class DraftReleaseGoodQuery {
           sort,
           null
         ]
-      ))
+      )
       total = total[0].count
       return { items, settingValue, total }
     } catch (error) {
@@ -314,7 +321,7 @@ export async function getDraftReleaseGoodFunction(_: any, context: any, id?: any
             status:
               itm.status === DRAFT_RELEASE_ORDER_STATUS.PARTIAL_RELEASED
                 ? DRAFT_RELEASE_ORDER_STATUS.PARTIAL_RELEASED
-                : foundProductInv?.transferQty
+                : foundProductInv?.transferQty > 0
                 ? DRAFT_RELEASE_ORDER_STATUS.TRANSFER
                 : (foundProductInv?.remainQty || 0) < itm.releaseQty
                 ? DRAFT_RELEASE_ORDER_STATUS.INSUFFICIENT
@@ -356,16 +363,16 @@ export async function getDraftReleaseGoodFunction(_: any, context: any, id?: any
       })
       .flat()
 
-      // sort by status
-      result.orderProducts.sort((a, b) => {
-        const statusOrder = {
-          'DRAFT': 1,
-          'PARTIAL RELEASED': 2,
-          'INSUFFICIENT': 3,
-        }
-      
-        return statusOrder[a.status] - statusOrder[b.status];
-      })
+    // sort by status
+    result.orderProducts.sort((a, b) => {
+      const statusOrder = {
+        DRAFT: 1,
+        'PARTIAL RELEASED': 2,
+        INSUFFICIENT: 3
+      }
+
+      return statusOrder[a.status] - statusOrder[b.status]
+    })
 
     const foundAttachments: Attachment[] = await tx.getRepository(Attachment).find({
       where: {

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
 }