@things-factory/worksheet-base 4.3.637 → 4.3.639

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

@@ -1,11 +1,20 @@
-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) {
@@ -34,7 +43,6 @@ 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')
@@ -108,8 +116,7 @@ export const batchPickingWorksheetResolver = {
             id: item?.productId,
             name: item?.productName,
             description: item?.productDescription,
-            sku: item?.productSku,
-            isInventoryDecimal: item?.isInventoryDecimal
+            sku: item?.productSku
           },
           qty: item?.qty,
           releaseQty: item.releaseQty,
@@ -128,8 +135,7 @@ export const batchPickingWorksheetResolver = {
               id: item?.productId,
               name: item?.productName,
               description: item?.productDescription,
-              sku: item?.productSku,
-              isInventoryDecimal: item?.isInventoryDecimal
+              sku: item?.productSku
             },
             productDetail: {
               id: item?.productDetailId

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

@@ -24,8 +24,8 @@ import {
   ProductDetailStock,
   WebspertController
 } from '@things-factory/warehouse-base'
-
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { getTmsService } from '@things-factory/integration-lmd'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {
@@ -72,8 +72,8 @@ export const confirmCancellationReleaseOrder = {
               .createQueryBuilder()
               .update(Inventory)
               .set({
-                qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}::numeric`,
-                uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}::numeric`,
+                qty: () => `COALESCE("qty", 0) + ${orderInventory.releaseQty}`,
+                uomValue: () => `COALESCE("uom_value", 0) + ${orderInventory.releaseUomValue}`,
                 status: INVENTORY_STATUS.STORED,
                 updater: user
               })
@@ -111,12 +111,25 @@ export const confirmCancellationReleaseOrder = {
               .createQueryBuilder()
               .update(Inventory)
               .set({
-                lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}::numeric`,
-                lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}::numeric`,
+                lockedQty: () => `COALESCE("locked_qty", 0) - ${orderInventory.releaseQty}`,
+                lockedUomValue: () => `COALESCE("locked_uom_value", 0) - ${orderInventory.releaseUomValue}`,
                 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
@@ -258,8 +271,8 @@ export const confirmCancellationReleaseOrder = {
           .createQueryBuilder()
           .update(ProductDetailStock)
           .set({
-            unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}::numeric`,
-            unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}::numeric`
+            unassignedQty: () => `"unassigned_qty" - ${op.releaseQty}`,
+            unassignedUomValue: () => `"unassigned_uom_value" - ${op.releaseUomValue}`
           })
           .where({ productDetail: op.productDetail.id })
           .execute()
@@ -268,6 +281,12 @@ export const confirmCancellationReleaseOrder = {
 
     await updateStockForOrderInventories(targetOIs, releaseGood, domain, user, tx)
 
+    if (releaseGood.lastMileDelivery.isTms && releaseGood.lastMileDelivery.status === 'active') {
+      const tmsService = getTmsService(releaseGood.lastMileDelivery.platform)
+
+      tmsService.cancelShipment(releaseGood)
+    }
+
     return
   }
 }

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

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

package/server/graphql/resolvers/worksheet/proceed-extra-products.ts

@@ -71,76 +71,70 @@ export const proceedExtraProductsResolver = {
       )
 
       if (editedApprovedProducts?.length > 0) {
-        await Promise.all(
-          editedApprovedProducts.map(async (editedApprovedProd: OrderProduct) => {
-            const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-              (op: OrderProduct) => op.id === editedApprovedProd.id
-            )
-
-            updatedOrderProducts.push({
-              ...selectedOrderProduct,
-              batchId: selectedOrderProduct?.adjustedBatchId
-                ? selectedOrderProduct.adjustedBatchId
-                : selectedOrderProduct.batchId,
-              batchIdRef: selectedOrderProduct?.adjustedBatchIdRef
-                ? selectedOrderProduct.adjustedBatchIdRef
-                : selectedOrderProduct.batchIdRef,
-              packingType: selectedOrderProduct?.adjustedPackingType
-                ? selectedOrderProduct.adjustedPackingType
-                : selectedOrderProduct.packingType,
-              packQty: selectedOrderProduct?.adjustedPackQty
-                ? selectedOrderProduct.adjustedPackQty
-                : selectedOrderProduct.packQty,
-              uom: selectedOrderProduct?.adjustedUom ? selectedOrderProduct.adjustedUom : selectedOrderProduct.uom,
-              uomValue: selectedOrderProduct?.adjustedUomValue
-                ? selectedOrderProduct.adjustedUomValue
-                : selectedOrderProduct.uomValue,
-              totalUomValue:
-                selectedOrderProduct?.adjustedTotalUomValue || selectedOrderProduct?.adjustedTotalUomValue === ''
-                  ? selectedOrderProduct.adjustedTotalUomValue
-                  : selectedOrderProduct.totalUomValue,
-              palletQty: selectedOrderProduct?.adjustedPalletQty
-                ? selectedOrderProduct.adjustedPalletQty
-                : selectedOrderProduct.palletQty,
-              unitPrice: selectedOrderProduct?.adjustedUnitPrice
-                ? selectedOrderProduct.adjustedUnitPrice
-                : selectedOrderProduct.unitPrice,
-              status:
-                worksheet.status === WORKSHEET_STATUS.DEACTIVATED
-                  ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
-                  : ORDER_PRODUCT_STATUS.UNLOADING,
-              updater: user
-            })
+        editedApprovedProducts.map((editedApprovedProd: OrderProduct) => {
+          const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
+            (op: OrderProduct) => op.id === editedApprovedProd.id
+          )
+
+          updatedOrderProducts.push({
+            ...selectedOrderProduct,
+            batchId: selectedOrderProduct?.adjustedBatchId
+              ? selectedOrderProduct.adjustedBatchId
+              : selectedOrderProduct.batchId,
+            batchIdRef: selectedOrderProduct?.adjustedBatchIdRef
+              ? selectedOrderProduct.adjustedBatchIdRef
+              : selectedOrderProduct.batchIdRef,
+            packingType: selectedOrderProduct?.adjustedPackingType
+              ? selectedOrderProduct.adjustedPackingType
+              : selectedOrderProduct.packingType,
+            packQty: selectedOrderProduct?.adjustedPackQty != null 
+              ? selectedOrderProduct.adjustedPackQty
+              : selectedOrderProduct.packQty,
+            uom: selectedOrderProduct?.adjustedUom ? selectedOrderProduct.adjustedUom : selectedOrderProduct.uom,
+            uomValue: selectedOrderProduct?.adjustedUomValue
+              ? selectedOrderProduct.adjustedUomValue
+              : selectedOrderProduct.uomValue,
+            totalUomValue: (selectedOrderProduct?.adjustedTotalUomValue || selectedOrderProduct?.adjustedTotalUomValue === '')
+              ? selectedOrderProduct.adjustedTotalUomValue
+              : selectedOrderProduct.totalUomValue,
+            palletQty: selectedOrderProduct?.adjustedPalletQty
+              ? selectedOrderProduct.adjustedPalletQty
+              : selectedOrderProduct.palletQty,
+            unitPrice: selectedOrderProduct?.adjustedUnitPrice
+              ? selectedOrderProduct.adjustedUnitPrice
+              : selectedOrderProduct.unitPrice,
+            status:
+              worksheet.status === WORKSHEET_STATUS.DEACTIVATED
+                ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
+                : ORDER_PRODUCT_STATUS.UNLOADING,
+            updater: user
           })
-        )
+        })
       }
 
       if (addedApprovedProducts?.length > 0) {
-        await Promise.all(
-          addedApprovedProducts.map(async (addedApprovedProd: OrderProduct) => {
-            const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-              (op: OrderProduct) => op.id === addedApprovedProd.id
-            )
-
-            updatedOrderProducts.push({
-              ...selectedOrderProduct,
-              batchId: selectedOrderProduct.adjustedBatchId,
-              batchIdRef: selectedOrderProduct.adjustedBatchIdRef,
-              packingType: selectedOrderProduct.adjustedPackingType,
-              packQty: selectedOrderProduct.adjustedPackQty,
-              uom: selectedOrderProduct.adjustedUom,
-              uomValue: selectedOrderProduct.adjustedUomValue,
-              totalUomValue: selectedOrderProduct.adjustedTotalUomValue,
-              palletQty: selectedOrderProduct.adjustedPalletQty,
-              unitPrice: selectedOrderProduct.adjustedUnitPrice,
-              status:
-                worksheet.status === WORKSHEET_STATUS.DEACTIVATED
-                  ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
-                  : ORDER_PRODUCT_STATUS.UNLOADING,
-              updater: user
-            })
+        addedApprovedProducts.map((addedApprovedProd: OrderProduct) => {
+          const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
+            (op: OrderProduct) => op.id === addedApprovedProd.id
+          )
+          updatedOrderProducts.push({
+            ...selectedOrderProduct,
+            batchId: selectedOrderProduct.adjustedBatchId,
+            batchIdRef: selectedOrderProduct.adjustedBatchIdRef,
+            packingType: selectedOrderProduct.adjustedPackingType,
+            packQty: selectedOrderProduct.adjustedPackQty,
+            uom: selectedOrderProduct.adjustedUom,
+            uomValue: selectedOrderProduct.adjustedUomValue,
+            totalUomValue: selectedOrderProduct.adjustedTotalUomValue,
+            palletQty: selectedOrderProduct.adjustedPalletQty,
+            unitPrice: selectedOrderProduct.adjustedUnitPrice,
+            status:
+              worksheet.status === WORKSHEET_STATUS.DEACTIVATED
+                ? ORDER_PRODUCT_STATUS.READY_TO_UNLOAD
+                : ORDER_PRODUCT_STATUS.UNLOADING,
+            updater: user
           })
-        )
+        })
       }
 
       debug('approved and updated order product', updatedOrderProducts)

package/server/graphql/resolvers/worksheet/worksheet.ts

@@ -1,18 +1,10 @@
 import { Equal, getRepository, Not } from 'typeorm'
 
 import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
-import {
-  ArrivalNotice,
-  ORDER_INVENTORY_STATUS,
-  OrderInventory,
-  OrderProduct,
-  OrderVas,
-  ReleaseGood
-} from '@things-factory/sales-base'
+import { ORDER_INVENTORY_STATUS, OrderInventory, OrderProduct, OrderVas } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS, InventoryHistory } from '@things-factory/warehouse-base'
-import { Bizplace } from '@things-factory/biz-base'
 
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
@@ -39,38 +31,80 @@ export const worksheetResolver = {
 
     let worksheetRelations: string[] = []
 
-    const otherWorksheetTypes = [
-      'PICKING',
-      'BATCH_PICKING',
-      'LOADING',
-      'PACKING',
-      'PICKING_REPLENISHMENT',
-      'SORTING',
-      'WAREHOUSE_RETURN',
-      'PUTAWAY_RETURN',
-      'UNLOADING_RETURN',
-      'PUTAWAY_REPLENISHMENT',
-      'VAS'
-    ]
-
-    if (thisWorksheet?.type === 'UNLOADING') {
-      worksheetRelations.push('worksheetDetails')
-    } else if (otherWorksheetTypes.includes(thisWorksheet?.type)) {
-      worksheetRelations.push(
-        'domain',
-        'bizplace',
-        'bufferLocation',
-        'arrivalNotice',
-        'releaseGood',
-        'replenishment',
-        'returnOrder',
-        'inventoryCheck',
-        'vasOrder',
-        'assignee',
-        'worksheetDetails',
-        'creator',
-        'updater'
-      )
+    switch (thisWorksheet?.type) {
+      case 'PICKING':
+      case 'BATCH_PICKING':
+      case 'LOADING':
+      case 'PACKING':
+      case 'PICKING_REPLENISHMENT':
+      case 'SORTING':
+      case 'WAREHOUSE_RETURN':
+      case 'PUTAWAY_RETURN':
+      case 'UNLOADING_RETURN':
+      case 'PUTAWAY_REPLENISHMENT':
+      case 'VAS':
+        worksheetRelations.push(
+          'domain',
+          'bizplace',
+          'bizplace.domain',
+          'bufferLocation',
+          'bufferLocation.warehouse',
+          'arrivalNotice',
+          'arrivalNotice.releaseGood',
+          'releaseGood',
+          'releaseGood.arrivalNotice',
+          'releaseGood.shippingOrder',
+          'releaseGood.orderPackages',
+          'releaseGood.orderProducts',
+          'releaseGood.orderProducts.product',
+          'replenishment',
+          'returnOrder',
+          'inventoryCheck',
+          'vasOrder',
+          'assignee',
+          'worksheetDetails',
+          'worksheetDetails.targetProduct',
+          'worksheetDetails.targetProduct.product',
+          'worksheetDetails.targetProduct.releaseGood',
+          'worksheetDetails.targetInventory',
+          'worksheetDetails.targetInventory.bizplace',
+          'worksheetDetails.targetInventory.releaseGood',
+          'worksheetDetails.targetInventory.product',
+          'worksheetDetails.targetInventory.inventory',
+          'worksheetDetails.targetInventory.inventory.product',
+          'worksheetDetails.targetInventory.inventory.warehouse',
+          'worksheetDetails.targetInventory.inventory.location',
+          'worksheetDetails.targetVas',
+          'worksheetDetails.targetVas.product',
+          'worksheetDetails.targetVas.newProduct',
+          'worksheetDetails.targetVas.newProductDetail',
+          'worksheetDetails.targetVas.orderVasItems',
+          'worksheetDetails.targetVas.orderVasItems.vas',
+          'creator',
+          'updater'
+        )
+        break
+
+      case 'UNLOADING':
+        worksheetRelations.push(
+          'worksheetDetails',
+          'worksheetDetails.toLocation',
+          'worksheetDetails.targetProduct',
+          'worksheetDetails.targetProduct.product',
+          'worksheetDetails.targetProduct.releaseGood',
+          'worksheetDetails.targetVas.product',
+          'worksheetDetails.targetVas.newProduct',
+          'worksheetDetails.targetVas.newProductDetail',
+          'worksheetDetails.targetVas.orderVasItems',
+          'worksheetDetails.targetVas.orderVasItems.vas',
+          'worksheetDetails.targetInventory.releaseGood',
+          'worksheetDetails.targetInventory.inspectedLocation'
+        )
+        break
+
+      default:
+        // Default case if the name doesn't match any defined case
+        break
     }
 
     worksheet = (await getRepository(Worksheet).findOne({
@@ -81,82 +115,7 @@ export const worksheetResolver = {
       relations: worksheetRelations
     })) as WorksheetInterface
 
-    if (worksheet) {
-      if (thisWorksheet.type === 'UNLOADING') {
-        worksheet.worksheetDetails = await getRepository(WorksheetDetail).find({
-          where: {
-            domain,
-            worksheet: worksheet.id
-          },
-          relations: [
-            'toLocation',
-            'targetProduct',
-            'targetProduct.product',
-            'targetProduct.releaseGood',
-            'targetVas.product',
-            'targetVas.newProduct',
-            'targetVas.newProductDetail',
-            'targetVas.orderVasItems',
-            'targetVas.orderVasItems.vas',
-            'targetInventory.releaseGood',
-            'targetInventory.inspectedLocation'
-          ]
-        })
-      } else if (otherWorksheetTypes.includes(thisWorksheet.type)) {
-        const [bizplace, bufferLocation, arrivalNotice, releaseGood, worksheetDetails] = await Promise.all([
-          getRepository(Bizplace).findOne({
-            where: { id: worksheet.bizplace.id },
-            relations: ['domain']
-          }),
-          worksheet.bufferLocation
-            ? getRepository(Inventory).findOne({
-                where: { id: worksheet.bufferLocation.id },
-                relations: ['warehouse']
-              })
-            : null,
-          worksheet.arrivalNotice
-            ? getRepository(ArrivalNotice).findOne({
-                where: { id: worksheet.arrivalNotice.id },
-                relations: ['releaseGood']
-              })
-            : null,
-          worksheet.releaseGood
-            ? getRepository(ReleaseGood).findOne({
-                where: { id: worksheet.releaseGood.id },
-                relations: ['arrivalNotice', 'shippingOrder', 'orderPackages', 'orderProducts', 'orderProducts.product']
-              })
-            : null,
-          getRepository(WorksheetDetail).find({
-            where: { domain, worksheet: worksheet.id },
-            relations: [
-              'targetProduct',
-              'targetProduct.product',
-              'targetProduct.releaseGood',
-              'targetInventory',
-              'targetInventory.bizplace',
-              'targetInventory.releaseGood',
-              'targetInventory.product',
-              'targetInventory.inventory',
-              'targetInventory.inventory.product',
-              'targetInventory.inventory.warehouse',
-              'targetInventory.inventory.location',
-              'targetVas',
-              'targetVas.product',
-              'targetVas.newProduct',
-              'targetVas.newProductDetail',
-              'targetVas.orderVasItems',
-              'targetVas.orderVasItems.vas'
-            ]
-          })
-        ])
-
-        worksheet.bizplace = bizplace
-        worksheet.bufferLocation = bufferLocation
-        worksheet.arrivalNotice = arrivalNotice
-        worksheet.releaseGood = releaseGood
-        worksheet.worksheetDetails = worksheetDetails
-      }
-    } else {
+    if (!worksheet) {
       worksheet = (await getRepository(Worksheet).findOne({
         where: {
           domain,

package/server/graphql/types/worksheet/index.ts

@@ -379,7 +379,7 @@ export const Mutation = /* GraphQL */ `
     palletId: String
     cartonId: String
     locationName: String!
-    releaseQty: Float!
+    releaseQty: Int!
     binLocation: String
     serialNumber: String
     toteNo: String
@@ -393,7 +393,7 @@ export const Mutation = /* GraphQL */ `
     binLocation: String
     serialNumber: String
     toteNo: String
-    pickingQty: Float
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   replenishmentPicking (
@@ -403,7 +403,7 @@ export const Mutation = /* GraphQL */ `
     cartonId: String!
     binLocation: String
     serialNumber: String
-    pickingQty: Float
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -444,7 +444,7 @@ export const Mutation = /* GraphQL */ `
     palletId: String!
     locationName: String
     binLocationName: String
-    releaseQty: Float!
+    releaseQty: Int!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductBatchPicking (
@@ -454,21 +454,21 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     inventory: InventoryPatch!
     binLocationName: String
-    pickingQty: Float
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   crossDockPicking (
     worksheetDetailName: String!
     worksheetType: String!
     palletId: String!
-    releaseQty: Float!
+    releaseQty: Int!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
 
   inspectingPallet ( 
     worksheetDetailName: String!
     inspectedBatchNo: String!
-    inspectedQty: Float!
+    inspectedQty: Int!
     inspectedUomValue: Float!
     inspectedExpirationDate: Date
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -479,7 +479,7 @@ export const Mutation = /* GraphQL */ `
     batchId: String!
     locationId: String!
     inspectedBatchNo: String!
-    inspectedQty: Float!
+    inspectedQty: Int!
     inspectedUomValue: Float!
     inspectedExpirationDate: Date
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -511,7 +511,7 @@ export const Mutation = /* GraphQL */ `
   relocateInventory (
     worksheetDetailName: String!
     inspectedBatchNo: String!
-    inspectedQty: Float!
+    inspectedQty: Int!
     inspectedUomValue: Float!
     inspectedLocationName: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -522,7 +522,7 @@ export const Mutation = /* GraphQL */ `
     batchId: String!
     locationId: String!
     inspectedBatchNo: String!
-    inspectedQty: Float!
+    inspectedQty: Int!
     inspectedUomValue: Float!
     inspectedLocationName: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -533,7 +533,7 @@ export const Mutation = /* GraphQL */ `
     productDetailId: String!
     productId: String!
     inspectedBatchNo: String!
-    inspectedQty: Float!
+    inspectedQty: Int!
     inspectedUomValue: Float!
     countNo: Int!
     inspectedExpirationDate: Date

package/server/graphql/types/worksheet/worksheet-detail-info.ts

@@ -19,12 +19,12 @@ export const WorksheetDetailInfo = gql`
     expirationDate: String
     palletQty: Int
     actualPalletQty: Int
-    packQty: Float
-    actualPackQty: Float
+    packQty: Int
+    actualPackQty: Int
     adjustedPalletQty: Int
     adjustedBatchId: String
     sku: String
-    qty: Float
+    qty: Int
     uom: String
     uomValue: Float
     releaseQty: Float
@@ -33,14 +33,13 @@ export const WorksheetDetailInfo = gql`
     sortedQty: Float
     releaseUomValue: Float
     inspectedBatchNo: String
-    originQty: Float
+    originQty: Int
     originUomValue: Float
     originExpirationDate: String
-    inspectedQty: Float
+    inspectedQty: Int
     inspectedUomValue: Float
     inspectedExpirationDate: String
     inspectedLocation: Location
-    isInventoryDecimal: Boolean
     operationGuide: String
     set: Int
     targetType: String
@@ -66,7 +65,7 @@ export const WorksheetDetailInfo = gql`
     relatedInvCheckItem: InventoryCheckItem
     targetInventoryCheckItem: InventoryCheckItem
     releaseGood: ReleaseGood
-    actualQty: Float
+    actualQty: Int
     actualUomValue: Float
     manufactureDate: String
     binRemarks: String