@things-factory/worksheet-base 4.3.641 → 4.3.642

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js

@@ -21,12 +21,12 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
     expirationDate: String
     palletQty: Int
     actualPalletQty: Int
-    packQty: Int
-    actualPackQty: Int
+    packQty: Float
+    actualPackQty: Float
     adjustedPalletQty: Int
     adjustedBatchId: String
     sku: String
-    qty: Int
+    qty: Float
     uom: String
     uomValue: Float
     releaseQty: Float
@@ -35,13 +35,14 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
     sortedQty: Float
     releaseUomValue: Float
     inspectedBatchNo: String
-    originQty: Int
+    originQty: Float
     originUomValue: Float
     originExpirationDate: String
-    inspectedQty: Int
+    inspectedQty: Float
     inspectedUomValue: Float
     inspectedExpirationDate: String
     inspectedLocation: Location
+    isInventoryDecimal: Boolean
     operationGuide: String
     set: Int
     targetType: String
@@ -67,7 +68,7 @@ exports.WorksheetDetailInfo = (0, apollo_server_koa_1.gql) `
     relatedInvCheckItem: InventoryCheckItem
     targetInventoryCheckItem: InventoryCheckItem
     releaseGood: ReleaseGood
-    actualQty: Int
+    actualQty: Float
     actualUomValue: Float
     manufactureDate: String
     binRemarks: String

package/dist-server/graphql/types/worksheet/worksheet-detail-info.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiFrC,CAAA"}
+{"version":3,"file":"worksheet-detail-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-detail-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,mBAAmB,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkFrC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.641",
+  "version": "4.3.642",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,24 +26,24 @@
     "@things-factory/auth-base": "^4.3.591",
     "@things-factory/biz-base": "^4.3.595",
     "@things-factory/document-template-base": "^4.3.591",
-    "@things-factory/id-rule-base": "^4.3.638",
-    "@things-factory/integration-accounting": "^4.3.639",
+    "@things-factory/id-rule-base": "^4.3.642",
+    "@things-factory/integration-accounting": "^4.3.642",
     "@things-factory/integration-base": "^4.3.616",
-    "@things-factory/integration-lmd": "^4.3.639",
-    "@things-factory/integration-marketplace": "^4.3.639",
-    "@things-factory/integration-powrup": "^4.3.639",
-    "@things-factory/integration-sellercraft": "^4.3.639",
-    "@things-factory/integration-sftp": "^4.3.638",
-    "@things-factory/marketplace-base": "^4.3.639",
+    "@things-factory/integration-lmd": "^4.3.642",
+    "@things-factory/integration-marketplace": "^4.3.642",
+    "@things-factory/integration-powrup": "^4.3.642",
+    "@things-factory/integration-sellercraft": "^4.3.642",
+    "@things-factory/integration-sftp": "^4.3.642",
+    "@things-factory/marketplace-base": "^4.3.642",
     "@things-factory/notification": "^4.3.609",
-    "@things-factory/sales-base": "^4.3.639",
+    "@things-factory/sales-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",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "e888b1da2aa27b44ba23004f657159d825c6d1c6"
+  "gitHead": "7796a1553e51d21f017f3746f80f25cae9e1c695"
 }

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -122,9 +122,13 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     let productDetail: ProductDetail = Boolean(arrivalNotice)
       ? targetProduct.productDetail
       : targetOrderInventory.productDetail
-    let qty: number = inventory.qty
+    let qty: number = Number(inventory.qty)
     let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : originInventory.uom
 
+    if (isNaN(qty) || qty <= 0) {
+      throw new Error('Invalid quantity value')
+    }
+
     if (!inventory?.palletId) {
       if (!inventory?.cartonId) {
         throw new Error('missing carton Id')
@@ -158,7 +162,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       zone: location.zone,
       location: location,
       expirationDate: inventory?.expirationDate ? new Date(inventory.expirationDate) : undefined,
-      status: INVENTORY_STATUS.UNLOADED
+      status: INVENTORY_STATUS.UNLOADED,
+      qty: qty
     }
 
     if (inventory.reusablePallet?.id) {
@@ -191,10 +196,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           (Boolean(arrivalNotice)
             ? targetProduct.uomValue
             : targetOrderInventory.returnUomValue / targetOrderInventory.returnQty) *
-          100
-      ) / 100
+          1000
+      ) / 1000
 
-    // case 1: Arrival Notice -> Update Order Product
     if (arrivalNotice) {
       newInventory = {
         ...newInventory,
@@ -219,11 +223,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       const updateOP = {
         id: targetProduct.id,
         actualPalletQty: ++targetProduct.actualPalletQty,
-        actualPackQty: targetProduct.actualPackQty + qty,
+        actualPackQty: Number(targetProduct.actualPackQty || 0) + qty,
         status: ORDER_PRODUCT_STATUS.UNLOADED,
         productDetail: productDetail
       }
-
       // targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADED
       // targetProduct.productDetail = productDetail
       await this.updateOrderTargets([updateOP], OrderProduct)
@@ -388,8 +391,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
             (Boolean(arrivalNotice)
               ? targetProduct.uomValue
               : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
-        ) / 100
+            1000
+        ) / 1000
       newInventory.manufactureDate = manufactureDate
       newInventory.refOrderId = orderId
       newInventory.unitCost = unitCost
@@ -418,7 +421,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           : qty
       }
       foundInventory = await this.trxMgr.getRepository(Inventory).save(newInventory)
-      
+
       //refer to scanUnload
       newInventory = await this.transactionInventory(
         newInventory,
@@ -427,7 +430,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         newInventory.uomValue,
         INVENTORY_TRANSACTION_TYPE.UNLOADING
       )
-      
     } else {
       const updatedQty: number = foundInventory.qty + qty
       foundInventory.expirationDate = foundInventory.expirationDate ? new Date(foundInventory.expirationDate) : null
@@ -438,19 +440,18 @@ export class UnloadingWorksheetController extends VasWorksheetController {
             (Boolean(arrivalNotice)
               ? targetProduct.uomValue
               : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
-        ) / 100
-        
-              //refer to scanUnload
-              foundInventory = await this.  transactionInventory(
-                foundInventory,
-              Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
-              foundInventory.qty,
-              foundInventory.uomValue,
-              INVENTORY_TRANSACTION_TYPE.UNLOADING
-            )
+            1000
+        ) / 1000
+
+      //refer to scanUnload
+      foundInventory = await this.transactionInventory(
+        foundInventory,
+        Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
+        foundInventory.qty,
+        foundInventory.uomValue,
+        INVENTORY_TRANSACTION_TYPE.UNLOADING
+      )
 
-            
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
       foundInventory = await this.trxMgr.getRepository(Inventory).save(foundInventory)
@@ -618,8 +619,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
             (Boolean(arrivalNotice)
               ? targetProduct.uomValue
               : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
-        ) / 100
+            1000
+        ) / 1000
       newInventory.manufactureDate = manufactureDate
       newInventory.refOrderId = orderId
       newInventory.unitCost = unitCost
@@ -658,8 +659,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
             (Boolean(arrivalNotice)
               ? targetProduct.uomValue
               : targetInventory.returnUomValue / targetInventory.returnQty) *
-            100
-        ) / 100
+            1000
+        ) / 1000
       foundInventory.productDetail = productDetail
       if (arrivalNotice) targetProduct.actualPackQty = targetProduct.actualPackQty + qty
       else if (returnOrder) targetInventory.actualPackQty = targetInventory.actualPackQty + qty
@@ -802,7 +803,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
         } else {
           targetProduct.actualPackQty -= qty
-          // targetProduct.actualPalletQty--
         }
         targetProduct.updater = this.user
         await this.updateOrderTargets([targetProduct])
@@ -828,7 +828,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
         } else {
           targetInventory.actualPackQty--
-          // targetInventory.actualPalletQty--
         }
         targetInventory.updater = this.user
         await this.updateOrderTargets([targetInventory])
@@ -846,8 +845,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
               (Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE)
                 ? targetProduct.uomValue
                 : targetInventory.returnUomValue) *
-              100
-          ) / 100
+              1000
+          ) / 1000
         inventory.updater = this.user
         await this.trxMgr.getRepository(Inventory).save(inventory)
 
@@ -933,8 +932,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
           (Boolean(arrivalNotice)
             ? targetProduct.uomValue
             : targetInventory.returnUomValue / targetInventory.returnQty) *
-          100
-      ) / 100
+          1000
+      ) / 1000
     await this.trxMgr
       .getRepository(Inventory)
       .update({ id: inventory.id }, { qty: inventory.qty, uomValue: inventory.uomValue })
@@ -988,20 +987,6 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         .getRepository(OrderProduct)
         .update({ id: In(targetProductsId) }, { status: ORDER_PRODUCT_STATUS.UNLOADING, updater: this.user })
 
-      // const targetProducts: OrderProduct[] = worksheetDetails.map((wsd: WorksheetDetail) => {
-      //   let targetProduct: OrderProduct = wsd.targetProduct
-
-      //   if (!targetProduct.palletQty) {
-      //     const { palletQty }: { palletQty: number } = this.findMatchedWSD(wsd.name, unloadingWorksheetDetails)
-      //     targetProduct.palletQty = palletQty
-      //   }
-      //   targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
-      //   targetProduct.updater = this.user
-
-      //   return targetProduct
-      // })
-      // await this.updateOrderTargets(targetProducts)
-
       arrivalNotice.status = ORDER_STATUS.PROCESSING
       arrivalNotice.updater = this.user
       this.updateRefOrder(arrivalNotice)

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -800,7 +800,7 @@ export class CycleCountWorksheetController extends WorksheetController {
 
       await this.trxMgr.getRepository(InventoryCheckItem).update(checkItem.id, {
         inspectedQty: checkItem.inspectedQty,
-        inspectedUomValue: checkItem.inspectedUomValue,
+        inspectedUomValue: checkItem.inspectedQty * productDetail.uomValue,
         inspectedBatchNo: checkItem.inspectedBatchNo,
         inspectedExpirationDate: checkItem.inspectedExpirationDate,
         inspectedLocation: checkItem.inspectedLocation,
@@ -1021,6 +1021,11 @@ export class CycleCountWorksheetController extends WorksheetController {
       where: { id: productId }
     })
 
+    // Check if quantity has decimals and validate against product settings
+    if (inspectedQty % 1 !== 0 && !product.isInventoryDecimal) {
+      throw new Error('Decimal quantities are not allowed for this product')
+    }
+
     const total = await this.trxMgr.getRepository(Inventory).count({
       createdAt: MoreThan(new Date(year, month, date))
     })

package/server/controllers/outbound/packing-worksheet-controller.ts

@@ -368,15 +368,19 @@ export class PackingWorksheetController extends VasWorksheetController {
       const inventory: Inventory = orderInventory.inventory
       const releaseQty: number = orderInventory.releaseQty
 
-      const matchingProduct = await this.getDirectQty(
-        {
-          ...productDetail,
-          product: product
-        },
-        productBarcode,
-        packedQty
-      )
-      packedQty = matchingProduct.qty
+      if (product.isInventoryDecimal) {
+        packedQty = orderInventory.releaseQty
+      } else {
+        const matchingProduct = await this.getDirectQty(
+          {
+            ...productDetail,
+            product: product
+          },
+          productBarcode,
+          packedQty
+        )
+        packedQty = matchingProduct.qty
+      }
 
       // Validation: PackQty cannot be more than ReleaseQty
       if (packedQty + orderInventory.packedQty > orderInventory.releaseQty) {
@@ -448,15 +452,23 @@ export class PackingWorksheetController extends VasWorksheetController {
       let updateOrderPackageItem = (
         await this.trxMgr.getRepository(OrderPackageItem).query(
           `
-        update order_package_items tgt set 
-          packed_qty = coalesce(tgt.packed_qty,0) + 1, 
-          updated_at = $2, 
-          updater_id = $3, 
-          status = case when coalesce(tgt.packed_qty,0) + 1 = release_qty then 'DONE' else tgt.status end
-        where id= $1 
-        returning *;
-      `,
-          [orderPackageItem.id, updateDateTime, this.user.id]
+            UPDATE order_package_items tgt
+            SET 
+              packed_qty = CASE 
+                WHEN $5 = true THEN $4 
+                ELSE coalesce(tgt.packed_qty, 0) + 1
+              END,
+              updated_at = $2,
+              updater_id = $3,
+              status = CASE 
+                WHEN $5 = true AND $4 = release_qty THEN 'DONE'
+                WHEN $5 = false AND coalesce(tgt.packed_qty, 0) + 1 = release_qty THEN 'DONE'
+                ELSE tgt.status
+              END
+            WHERE id = $1
+            RETURNING *;
+          `,
+          [orderPackageItem.id, updateDateTime, this.user.id, packedQty, product.isInventoryDecimal]
         )
       )[0][0]
 

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -1114,7 +1114,7 @@ export class PickingWorksheetController extends VasWorksheetController {
               .where('id = :id', { id: worksheetDetailInfos.worksheetDetailId })
               .execute()
 
-            let releaseUomValue = Math.round((pickedUomValue / pickedQty) * releaseQty * 100) / 100
+            let releaseUomValue = Math.trunc((pickedUomValue / pickedQty) * releaseQty * 1000) / 1000
 
             let updateInvObj = {
               qty: () => `"qty" - ${releaseQty}`,
@@ -1586,9 +1586,12 @@ export class PickingWorksheetController extends VasWorksheetController {
 
       pickedQty = matchingProduct.qty
 
-      const sumOfReleaseQty: number = targetInventories
-        .map((oi: OrderInventory) => oi.releaseQty)
-        .reduce((a, b) => a + b, 0)
+      const sumOfReleaseQty: number = parseFloat(
+        targetInventories
+          .map((oi: OrderInventory) => oi.releaseQty)
+          .reduce((a, b) => a + b, 0)
+          .toFixed(3)
+      )
 
       const sumOfPickedQty: number =
         targetInventories.map((oi: OrderInventory) => oi.pickedQty).reduce((a, b) => a + b, 0) + pickedQty
@@ -1631,8 +1634,8 @@ export class PickingWorksheetController extends VasWorksheetController {
           targetReleaseQty > targetPickedQty &&
           pickedQty > 0
         ) {
-          let remainingAssignedQty: number = pickedQty - (targetReleaseQty - targetPickedQty) // -1, 0, 1
-          const gapQtyRemaining: number = targetReleaseQty - targetPickedQty // > 0
+            let remainingAssignedQty: number = Math.round((pickedQty - (targetReleaseQty - targetPickedQty)) * 1000) / 1000 // -1, 0, 1
+            const gapQtyRemaining: number = Math.round((targetReleaseQty - targetPickedQty) * 1000) / 1000 // > 0
 
           if (binLocationName && !targetInventory?.binLocation) {
             const binLocation: Location = await this.trxMgr.getRepository(Location).findOne({
@@ -1701,7 +1704,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           } else {
             await this.updateOrderTargets([targetInventory])
           }
-          pickedQty = pickedQty - (targetReleaseQty - targetPickedQty)
+            pickedQty = Math.round((pickedQty - (targetReleaseQty - targetPickedQty)) * 1000) / 1000
         }
       }
     } catch (error) {

package/server/controllers/outbound/returning-worksheet-controller.ts

@@ -235,7 +235,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
     const releaseGood: ReleaseGood = await this.findRefOrder(ReleaseGood, {
       domain: this.domain,
       name: releaseGoodNo,
-      status: In([ORDER_STATUS.PARTIAL_RETURN, ORDER_STATUS.PROCESSING, ORDER_STATUS.PARTIAL_PROCESSING])
+      status: In([ORDER_STATUS.PARTIAL_RETURN, ORDER_STATUS.LOADING, ORDER_STATUS.DONE, ORDER_STATUS.PROCESSING, ORDER_STATUS.PARTIAL_PROCESSING])
     })
 
     const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.WAREHOUSE_RETURN, [

package/server/controllers/outbound/sorting-worksheet-controller.ts

@@ -244,7 +244,13 @@ export class SortingWorksheetController extends VasWorksheetController {
     // validate matching product details based on scanned barcode
     if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-    let sortedQty: number = matchingProduct.qty
+    let sortedQty: number = 1
+    if (targetOrderInventory.product.isInventoryDecimal) {
+      sortedQty = targetOrderInventory.pickedQty
+    } else {
+      sortedQty = matchingProduct.qty
+    }
+    
     const releaseGood: ReleaseGood =
       orderInventories.length > 1
         ? orderInventories.find(item => item.productId === scanProductBarcode.productId)?.releaseGood

package/server/controllers/replenishment/replenishment-worksheet-controller.ts

@@ -457,7 +457,7 @@ export class ReplenishmentWorksheetController extends WorksheetController {
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       let inventory: Inventory = targetInventory.inventory
 
-      if (productBarcode) {
+      if (productBarcode && !inventory.product.isInventoryDecimal) {
         let matchingProduct = await this.getDirectQty(
           {
             ...inventory.productDetail,

package/server/graphql/resolvers/worksheet/batch-picking-worksheet.ts

@@ -1,20 +1,11 @@
-import {
-  getRepository,
-  SelectQueryBuilder
-} from 'typeorm'
+import { getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { InventoryChange } from '@things-factory/warehouse-base'
 
-import {
-  WORKSHEET_STATUS,
-  WORKSHEET_TYPE
-} from '../../../constants'
-import {
-  Worksheet,
-  WorksheetDetail
-} from '../../../entities'
+import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
+import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const batchPickingWorksheetResolver = {
   async batchPickingWorksheet(_: any, { taskNo, locationSortingRules }, context: any) {
@@ -43,6 +34,7 @@ export const batchPickingWorksheetResolver = {
       .addSelect('"PROD".name', 'productName')
       .addSelect('"PROD".sku', 'productSku')
       .addSelect('"PROD".description', 'productDescription')
+      .addSelect('"PROD".is_inventory_decimal', 'isInventoryDecimal')
       .addSelect('"PROD_DET".id', 'productDetailId')
       .addSelect('"INV".qty', 'qty')
       .addSelect('"INV".packing_type', 'packingType')
@@ -116,7 +108,8 @@ export const batchPickingWorksheetResolver = {
             id: item?.productId,
             name: item?.productName,
             description: item?.productDescription,
-            sku: item?.productSku
+            sku: item?.productSku,
+            isInventoryDecimal: item?.isInventoryDecimal
           },
           qty: item?.qty,
           releaseQty: item.releaseQty,
@@ -135,7 +128,8 @@ export const batchPickingWorksheetResolver = {
               id: item?.productId,
               name: item?.productName,
               description: item?.productDescription,
-              sku: item?.productSku
+              sku: item?.productSku,
+              isInventoryDecimal: item?.isInventoryDecimal
             },
             productDetail: {
               id: item?.productDetailId

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -72,8 +72,8 @@ export const confirmCancellationReleaseOrder = {
               .createQueryBuilder()
               .update(Inventory)
               .set({
-                qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
-                uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
+                qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}::numeric`,
+                uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}::numeric`,
                 status: INVENTORY_STATUS.STORED,
                 updater: user
               })
@@ -111,25 +111,12 @@ export const confirmCancellationReleaseOrder = {
               .createQueryBuilder()
               .update(Inventory)
               .set({
-                lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}`,
-                lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}`,
+                lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}::numeric`,
+                lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}::numeric`,
                 updater: user
               })
               .where('id = :id', { id: inventory.id })
               .execute()
-
-            // @ChrisLim-git commented for further review as it causes qty to add into inventory
-            // await tx
-            //   .createQueryBuilder()
-            //   .update(Inventory)
-            //   .set({
-            //     qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
-            //     uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
-            //     status: INVENTORY_STATUS.STORED,
-            //     updater: user
-            //   })
-            //   .where('id = :id', { id: inventory.id })
-            //   .execute()
           }
 
           return orderInventory
@@ -271,8 +258,8 @@ export const confirmCancellationReleaseOrder = {
           .createQueryBuilder()
           .update(ProductDetailStock)
           .set({
-            unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}`,
-            unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}`
+            unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}::numeric`,
+            unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}::numeric`
           })
           .where({ productDetail: op.productDetail.id })
           .execute()

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -180,7 +180,8 @@ export const inventoriesByPalletResolver = {
             productSKU: item.product.sku,
             productBrand: item.product.brand,
             productId: item.product.id,
-            productDetailId: item.productDetail.id
+            productDetailId: item.productDetail.id,
+            isInventoryDecimal: item.product.isInventoryDecimal,
           }
         })
       )