@things-factory/sales-base 4.3.639 → 4.3.642

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-base",
-  "version": "4.3.639",
+  "version": "4.3.642",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,18 +27,18 @@
     "@things-factory/auth-base": "^4.3.591",
     "@things-factory/biz-base": "^4.3.595",
     "@things-factory/code-base": "^4.3.591",
-    "@things-factory/integration-accounting": "^4.3.639",
+    "@things-factory/integration-accounting": "^4.3.642",
     "@things-factory/integration-base": "^4.3.616",
-    "@things-factory/integration-lmd": "^4.3.639",
-    "@things-factory/integration-powrup": "^4.3.639",
-    "@things-factory/integration-sftp": "^4.3.638",
+    "@things-factory/integration-lmd": "^4.3.642",
+    "@things-factory/integration-powrup": "^4.3.642",
+    "@things-factory/integration-sftp": "^4.3.642",
     "@things-factory/notification": "^4.3.609",
-    "@things-factory/product-base": "^4.3.638",
+    "@things-factory/product-base": "^4.3.642",
     "@things-factory/setting-base": "^4.3.609",
     "@things-factory/shell": "^4.3.591",
     "@things-factory/transport-base": "^4.3.631",
-    "@things-factory/warehouse-base": "^4.3.639",
+    "@things-factory/warehouse-base": "^4.3.642",
     "axios": "1.7.7"
   },
-  "gitHead": "8808061cb4d7f06a456589405f750c8513e7501a"
+  "gitHead": "7796a1553e51d21f017f3746f80f25cae9e1c695"
 }

package/server/service/arrival-notice/arrival-notice-mutation.ts

@@ -551,7 +551,44 @@ export async function generateArrivalNoticeFunction(
   } else if (arrivalNotice.warehouseId) myBizplace = await getOutletBizplace(arrivalNotice.warehouseId)
   else myBizplace = await getMyBizplace(domain, user)
 
+  // Add validation for decimal quantities
   for (let patch of orderProducts) {
+    // Get product details to check isInventoryDecimal
+    const product = (await tx.getRepository(Product).findOne({
+      where: { id: patch.product.id }
+    })) as Product
+
+    if (!product) {
+      throw new Error(`Product not found for ID: ${patch.product.id}`)
+    }
+
+    // Validate packQty based on isInventoryDecimal flag
+    const validatePackQty = (qty: any): boolean => {
+      if (qty === null || qty === undefined) return true
+      const numQty = Number(qty)
+      if (isNaN(numQty)) return false
+
+      if (product.isInventoryDecimal) {
+        // For decimal products, check if decimal places <= 3
+        const decimalPlaces = (numQty.toString().split('.')[1] || '').length
+        return decimalPlaces <= 3
+      } else {
+        // For non-decimal products, check if it's a whole number
+        return numQty === Math.floor(numQty)
+      }
+    }
+
+    // Validate only packQty
+    if (!validatePackQty(patch.packQty)) {
+      throw new Error(
+        `Invalid pack quantity for product ${product.name} (SKU: ${product.sku}). ${
+          product.isInventoryDecimal
+            ? 'Decimal quantities must have at most 3 decimal places'
+            : 'Only whole numbers are allowed'
+        }`
+      )
+    }
+
     // Check for existing LotID in Inventory
     let foundInventoryPallet = await tx.getRepository(Inventory).findOne({
       where: {
@@ -1115,8 +1152,8 @@ export async function addArrivalNoticeProducts(
       packing_type: op.packingType,
       packing_size: op.packingSize,
       uom: op.uom,
-      uom_value: op.uomValue,
-      pack_qty: op.packQty,
+      uom_value: op.uomValue || 0,
+      pack_qty: op.packQty || 0,
       total_uom_value: op.totalUomValue,
       pallet_qty: op.palletQty,
       pallet_id: op.palletId,

package/server/service/arrival-notice/arrival-notice-query.ts

@@ -1,50 +1,15 @@
-import {
-  Arg,
-  Args,
-  Ctx,
-  Directive,
-  FieldResolver,
-  Query,
-  Resolver,
-  Root
-} from 'type-graphql'
-import {
-  EntityManager,
-  getRepository,
-  In,
-  SelectQueryBuilder
-} from 'typeorm'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
+import { EntityManager, getRepository, In, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
-import {
-  checkUserBelongsDomain,
-  User
-} from '@things-factory/auth-base'
-import {
-  Bizplace,
-  getCompanyBizplace,
-  getPermittedBizplaceIds
-} from '@things-factory/biz-base'
+import { checkUserBelongsDomain, User } from '@things-factory/auth-base'
+import { Bizplace, getCompanyBizplace, getPermittedBizplaceIds } from '@things-factory/biz-base'
 import { Setting } from '@things-factory/setting-base'
-import {
-  buildQuery,
-  Domain,
-  ListParam
-} from '@things-factory/shell'
-
-import {
-  ArrivalNoticeList,
-  NewArrivalNotice,
-  RawArrivalNotice
-} from '../'
-import {
-  ATTACHMENT_TYPE,
-  ORDER_STATUS
-} from '../../constants'
-import {
-  OrderInventory,
-  OrderProduct
-} from '../../service'
+import { buildQuery, Domain, ListParam } from '@things-factory/shell'
+
+import { ArrivalNoticeList, NewArrivalNotice, RawArrivalNotice } from '../'
+import { ATTACHMENT_TYPE, ORDER_STATUS } from '../../constants'
+import { OrderInventory, OrderProduct } from '../../service'
 import { convertExcelDateToISO } from '../../utils/datetime-util'
 import { ArrivalNotice } from './arrival-notice'
 
@@ -344,8 +309,8 @@ export class ArrivalNoticeQuery {
     @Arg('rawArrivalNotices', type => [NewArrivalNotice], { nullable: true }) rawArrivalNotices: NewArrivalNotice[],
     @Arg('bizplaceId', type => String) bizplaceId: string
   ): Promise<RawArrivalNotice[]> {
-    const {domain , tx}: {domain: Domain, tx: EntityManager} = context.state
-    return await validateBulkArrivalNoticesFunction(rawArrivalNotices, bizplaceId, domain,tx)
+    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    return await validateBulkArrivalNoticesFunction(rawArrivalNotices, bizplaceId, domain, tx)
   }
 
   @FieldResolver(type => Domain)
@@ -402,7 +367,7 @@ export async function validateBulkArrivalNoticesFunction(
       }
     })
   )
-  
+
   const enableLotIdInput: Setting = await trxMgr.getRepository(Setting).findOne({
     where: { domain, category: 'id-rule', name: 'enable-lot-id-input' }
   })
@@ -410,25 +375,25 @@ export async function validateBulkArrivalNoticesFunction(
   //check if palletId is entered but enablelotidinput setting is false
   let lotIdInputSettingChecker = ''
   if (rawArrivalNotices.some(record => record.palletId) && enableLotIdInput.value == 'false') {
-    lotIdInputSettingChecker = 'Please enable the setting to create orders with a custom Lot ID';
+    lotIdInputSettingChecker = 'Please enable the setting to create orders with a custom Lot ID'
   }
 
-    // uncomment this to show error message as popup 
-
-    // for (let item of rawArrivalNotices) {
-    //   if (item.palletId) {
-    //     const foundOrderProductsPallet = await trxMgr.getRepository(OrderProduct).findOne({
-    //       where: {
-    //         domain,
-    //         palletId: item.palletId
-    //       }
-    //     })
-  
-    //     if (foundOrderProductsPallet) {
-    //       throw new Error(('Lot ID is already in used. Please enter new Lot ID.'))
-    //     }
-    //   }
-    // }
+  // uncomment this to show error message as popup
+
+  // for (let item of rawArrivalNotices) {
+  //   if (item.palletId) {
+  //     const foundOrderProductsPallet = await trxMgr.getRepository(OrderProduct).findOne({
+  //       where: {
+  //         domain,
+  //         palletId: item.palletId
+  //       }
+  //     })
+
+  //     if (foundOrderProductsPallet) {
+  //       throw new Error(('Lot ID is already in used. Please enter new Lot ID.'))
+  //     }
+  //   }
+  // }
 
   await trxMgr.query(
     `
@@ -450,7 +415,7 @@ export async function validateBulkArrivalNoticesFunction(
         packing_type VARCHAR(50),
         packing_size INT,
         uom VARCHAR(10),
-        pack_qty INT,
+        pack_qty NUMERIC(19,3),
         pallet_qty INT,
         pallet_id VARCHAR(50),
         unit_price VARCHAR(50),
@@ -482,7 +447,7 @@ export async function validateBulkArrivalNoticesFunction(
         )
       )
     `,
-    [json_oi,domain.id]
+    [json_oi, domain.id]
   )
 
   await trxMgr.query(
@@ -612,6 +577,10 @@ export async function validateBulkArrivalNoticesFunction(
               WHEN f.pack_qty IS NULL OR f.pack_qty <= 0 THEN 'invalid pack qty,'
               ELSE ''
             END ||
+            CASE 
+              WHEN f.pack_qty % 1 != 0 AND NOT pr.is_inventory_decimal THEN 'decimal quantities are not allowed for this product,'
+              ELSE ''
+            END ||
             CASE 
               WHEN f.batch_id IS NULL THEN 'batch no. is required,'
               ELSE ''
@@ -659,12 +628,13 @@ export async function validateBulkArrivalNoticesFunction(
       FROM 
         temp_foo f
         LEFT JOIN temp_foo_duplicates d ON f.pallet_id = d.pallet_id
+        LEFT JOIN products pr ON pr.id = f.product_id
       ORDER BY f.ref_no, f.ref_no_2, f.ref_no_3, f.sku;
     `
   )
 
   await trxMgr.query('DROP TABLE raw_arrival_notices, temp_gan, temp_foo, temp_foo_duplicates, temp_used_pallet_ids')
-  
+
   return validatedItems.map(item => {
     return {
       refNo: item.ref_no,
@@ -694,7 +664,9 @@ export async function validateBulkArrivalNoticesFunction(
       palletId: item.pallet_id,
       unitPrice: item.unit_price,
       manufactureDate: item.manufacture_date,
-      errorMsg: lotIdInputSettingChecker ? lotIdInputSettingChecker + (item.error_msg ? ',' + item.error_msg : '') : item.error_msg
+      errorMsg: lotIdInputSettingChecker
+        ? lotIdInputSettingChecker + (item.error_msg ? ',' + item.error_msg : '')
+        : item.error_msg
     }
   })
 }

package/server/service/arrival-notice/arrival-notice-types.ts

@@ -1,5 +1,5 @@
 import { Field, Float, InputType, Int, ObjectType } from 'type-graphql'
-import {  OneToMany } from 'typeorm'
+import { OneToMany } from 'typeorm'
 
 import { ObjectRef } from '@things-factory/shell'
 
@@ -112,7 +112,7 @@ export class NewArrivalNotice {
   @Field(type => Float, { nullable: true })
   packingSize?: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packQty?: number
 
   @Field(type => Float, { nullable: true })
@@ -159,7 +159,7 @@ export class ArrivalNoticePatch {
 
   @Field({ nullable: true })
   ownTransport: boolean
-  
+
   @Field({ nullable: true })
   transportVehicle: string
 
@@ -292,7 +292,7 @@ export class RawArrivalNotice {
   @Field(type => Float, { nullable: true })
   packingSize?: number
 
-  @Field(type => Int, { nullable: true })
+  @Field(type => Float, { nullable: true })
   packQty?: number
 
   @Field(type => Float, { nullable: true })

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