@things-factory/worksheet-base 4.3.33 → 4.3.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.33",
+  "version": "4.3.34",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,16 +29,16 @@
     "@things-factory/document-template-base": "^4.3.32",
     "@things-factory/id-rule-base": "^4.3.32",
     "@things-factory/integration-lmd": "^4.3.32",
-    "@things-factory/integration-marketplace": "^4.3.33",
-    "@things-factory/integration-sellercraft": "^4.3.33",
+    "@things-factory/integration-marketplace": "^4.3.34",
+    "@things-factory/integration-sellercraft": "^4.3.34",
     "@things-factory/integration-sftp": "^4.3.33",
-    "@things-factory/marketplace-base": "^4.3.33",
+    "@things-factory/marketplace-base": "^4.3.34",
     "@things-factory/notification": "^4.3.32",
-    "@things-factory/sales-base": "^4.3.33",
+    "@things-factory/sales-base": "^4.3.34",
     "@things-factory/setting-base": "^4.3.32",
     "@things-factory/shell": "^4.3.32",
     "@things-factory/transport-base": "^4.3.32",
-    "@things-factory/warehouse-base": "^4.3.33"
+    "@things-factory/warehouse-base": "^4.3.34"
   },
-  "gitHead": "e4f9100eef61d010cca0a9692f413f60be2e462c"
+  "gitHead": "feaae0d28d92c8eccb6b1ae8dbedd43c460e2d32"
 }

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

@@ -4,9 +4,10 @@ import { MarketplaceOrder, MarketplaceOrderShipping } from '@things-factory/mark
 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 { WORKSHEET_TYPE } from '../../../constants'
-import { Worksheet } from '../../../entities'
+import { Worksheet, WorksheetDetail } from '../../../entities'
 
 interface WorksheetInterface extends Worksheet {
   orderProducts: OrderProduct[]
@@ -109,6 +110,39 @@ export const worksheetResolver = {
         },
         relations: ['targetProduct']
       })
+
+      // update inventory data >> unloaded inventory history data
+      if (
+        worksheet.type === WORKSHEET_TYPE.PUTAWAY &&
+        worksheet.worksheetDetails.every(wsd => wsd.targetInventory.inventory)
+      ) {
+        worksheet.worksheetDetails = await Promise.all(
+          worksheet.worksheetDetails.map(async (wsd: WorksheetDetail) => {
+            let inventory: Inventory = wsd.targetInventory.inventory
+
+            let foundUnloadedHistory: InventoryHistory = await getRepository(InventoryHistory).findOne({
+              where: { inventory, refOrderId: worksheet.arrivalNotice.id, status: INVENTORY_STATUS.UNLOADED },
+              relations: ['location', 'product']
+            })
+
+            wsd.targetInventory.inventory = {
+              ...inventory,
+              qty: foundUnloadedHistory?.qty,
+              uomValue: foundUnloadedHistory?.uomValue,
+              location: foundUnloadedHistory?.location,
+              product: foundUnloadedHistory?.product,
+              cartonId: foundUnloadedHistory?.cartonId,
+              batchId: foundUnloadedHistory?.batchId,
+              batchIdRef: foundUnloadedHistory?.batchIdRef,
+              packingType: foundUnloadedHistory?.packingType,
+              packingSize: foundUnloadedHistory?.packingSize,
+              uom: foundUnloadedHistory?.uom
+            }
+
+            return wsd
+          })
+        )
+      }
     }
 
     if (worksheet.type === WORKSHEET_TYPE.BATCH_PICKING) {

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

@@ -6,6 +6,7 @@ import { DeliveryInfo } from './delivery-info'
 import { DeliveryOrderInfo } from './delivery-order-info'
 import { DeliveryWorksheet } from './delivery-worksheet'
 import { ExecutingWorksheet } from './executing-worksheet'
+import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 import { GoodsDeliveryNote } from './goods-delivery-note'
 import { InventoryCheckWorksheet } from './inventory-check-worksheet'
 import { LoadedWorksheetDetail } from './loaded-worksheet-detail'
@@ -22,7 +23,6 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
-import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -210,7 +210,7 @@ export const Mutation = /* GraphQL */ `
 
   cycleCountAdjustment (
     cycleCountNo: String!
-  ): Boolean @transaction
+  ): Boolean @privilege(category: "inventory_adjustment_approval", privilege: "mutation") @transaction
 
   undoUnloading (
     orderType: String!