@things-factory/worksheet-base 4.3.641 → 4.3.643

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

@@ -71,70 +71,76 @@ export const proceedExtraProductsResolver = {
       )
 
       if (editedApprovedProducts?.length > 0) {
-        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
+        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
+            })
           })
-        })
+        )
       }
 
       if (addedApprovedProducts?.length > 0) {
-        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
+        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
+            })
           })
-        })
+        )
       }
 
       debug('approved and updated order product', updatedOrderProducts)

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

@@ -379,7 +379,7 @@ export const Mutation = /* GraphQL */ `
     palletId: String
     cartonId: String
     locationName: String!
-    releaseQty: Int!
+    releaseQty: Float!
     binLocation: String
     serialNumber: String
     toteNo: String
@@ -393,7 +393,7 @@ export const Mutation = /* GraphQL */ `
     binLocation: String
     serialNumber: String
     toteNo: String
-    pickingQty: Int
+    pickingQty: Float
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   replenishmentPicking (
@@ -403,7 +403,7 @@ export const Mutation = /* GraphQL */ `
     cartonId: String!
     binLocation: String
     serialNumber: String
-    pickingQty: Int
+    pickingQty: Float
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -444,7 +444,7 @@ export const Mutation = /* GraphQL */ `
     palletId: String!
     locationName: String
     binLocationName: String
-    releaseQty: Int!
+    releaseQty: Float!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductBatchPicking (
@@ -454,21 +454,21 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     inventory: InventoryPatch!
     binLocationName: String
-    pickingQty: Int
+    pickingQty: Float
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   crossDockPicking (
     worksheetDetailName: String!
     worksheetType: String!
     palletId: String!
-    releaseQty: Int!
+    releaseQty: Float!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
 
   inspectingPallet ( 
     worksheetDetailName: String!
     inspectedBatchNo: String!
-    inspectedQty: Int!
+    inspectedQty: Float!
     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: Int!
+    inspectedQty: Float!
     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: Int!
+    inspectedQty: Float!
     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: Int!
+    inspectedQty: Float!
     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: Int!
+    inspectedQty: Float!
     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: Int
-    actualPackQty: Int
+    packQty: Float
+    actualPackQty: Float
     adjustedPalletQty: Int
     adjustedBatchId: String
     sku: String
-    qty: Int
+    qty: Float
     uom: String
     uomValue: Float
     releaseQty: Float
@@ -33,13 +33,14 @@ export const WorksheetDetailInfo = 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
@@ -65,7 +66,7 @@ export const WorksheetDetailInfo = gql`
     relatedInvCheckItem: InventoryCheckItem
     targetInventoryCheckItem: InventoryCheckItem
     releaseGood: ReleaseGood
-    actualQty: Int
+    actualQty: Float
     actualUomValue: Float
     manufactureDate: String
     binRemarks: String