@things-factory/worksheet-base 4.3.159 → 4.3.162

package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts

@@ -10,7 +10,7 @@ import {
   OrderProduct
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory } from '@things-factory/warehouse-base'
+import { generateInventoryHistory, Inventory, INVENTORY_TRANSACTION_TYPE } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
@@ -62,6 +62,7 @@ export async function regenerateReleaseGoodWorksheetDetails(
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.inventory',
       'worksheetDetails.targetInventory.product',
+      'worksheetDetails.targetInventory.binLocation',
       'worksheetDetails.targetInventory.releaseGood',
       'worksheetDetails.targetInventory.orderProduct',
       'worksheetDetails.targetInventory.bizplace'
@@ -73,21 +74,49 @@ export async function regenerateReleaseGoodWorksheetDetails(
     if (targetInv.orderProductId === orderProductId) return wsd.id
   })
 
+  let binLocations: any = []
+
   // TODO: Update prev inventory locked qty and delete order inventories
   if (prevWSDs?.length) {
     const wsdIds: string[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.id)
     const prevOrderInvIds: string[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.targetInventory.id)
     const prevOrderInventories: OrderInventory[] = prevWSDs.map((wsd: WorksheetDetail) => wsd.targetInventory)
+    binLocations = prevOrderInventories.map(oi => {
+      return {
+        product: oi?.product,
+        binLocation: oi?.binLocation || null
+      }
+    })
     await Promise.all(
       prevOrderInventories.map(async prevOI => {
         if (prevOI?.inventory) {
-          await tx.getRepository(Inventory).update(
-            { id: prevOI.inventory.id },
-            {
-              lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
-              lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
-            }
-          )
+          if (prevOI.pickedQty == prevOI.releaseQty) {
+            await tx.getRepository(Inventory).update(
+              { id: prevOI.inventory.id },
+              {
+                qty: prevOI.inventory.qty + prevOI.releaseQty,
+                uomValue: prevOI.inventory.uomValue + prevOI.releaseUomValue
+              }
+            )
+
+            await generateInventoryHistory(
+              prevOI.inventory,
+              prevOI.releaseGood,
+              INVENTORY_TRANSACTION_TYPE.RETURN,
+              prevOI.releaseQty,
+              prevOI.releaseUomValue,
+              user,
+              tx
+            )
+          } else {
+            await tx.getRepository(Inventory).update(
+              { id: prevOI.inventory.id },
+              {
+                lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
+                lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
+              }
+            )
+          }
         }
       })
     )
@@ -122,6 +151,7 @@ export async function regenerateReleaseGoodWorksheetDetails(
         packingSize,
         orderProduct: targetProduct,
         refWorksheetId: worksheet.type == WORKSHEET_TYPE.BATCH_PICKING ? worksheet.id : null,
+        binLocation: binLocations?.length ? binLocations.find(bl => bl.product.id === productId)?.binLocation : null,
         creator: user,
         updater: user
       })

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

@@ -426,7 +426,7 @@ export const Mutation = /* GraphQL */ `
 
   completePicking (
     releaseGoodNo: String!
-  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+  ): Inventory @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeOrderSorting (
     releaseGoodNo: String!
@@ -443,7 +443,7 @@ export const Mutation = /* GraphQL */ `
 
   completeBatchPicking (
     taskNo: String!
-  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+  ): Inventory @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeInspection (
     inventoryCheckNo: String!

package/server/utils/inventory-util.ts

@@ -143,6 +143,10 @@ export async function inventoriesByStrategy(
     .andWhere('"LOC"."type" NOT IN (:...locationTypes)', {
       locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
     })
+    .andWhere('"INV"."obsolete" = false')
+    .andWhere(
+      'case when "INV"."expiration_date" is not null and "PROD"."shelf_life" is not null then CURRENT_DATE < "INV"."expiration_date" - "PROD"."shelf_life" else true end'
+    )
     .setParameters({
       domainId: domain.id,
       productId,
@@ -257,3 +261,35 @@ export async function isInventoryExpiring(inventory: Inventory): Promise<boolean
 
   return expiryDate < acceptBefore
 }
+
+export async function isInventoryObsolete(inventories: Inventory[]): Promise<any> {
+  if (inventories?.length < 1) throw new Error('No inventory id provided')
+
+  let obsoleteInventories = []
+
+  for (let i = 0; i < inventories.length; i++) {
+    let product: Product | undefined = inventories[i].product
+    if (!product) {
+      let inventory: Inventory = await getRepository(Inventory).findOne(inventories[i].id, {
+        relations: ['product']
+      })
+      product = inventory.product
+    }
+
+    let { expirationDate } = inventories[i]
+    const { shelfLife } = product
+
+    if (shelfLife && expirationDate) {
+      let date: Date = new Date()
+      expirationDate = new Date(expirationDate)
+
+      const releaseBefore: Date = new Date(expirationDate.setDate(expirationDate.getDate() - shelfLife))
+
+      if (date > releaseBefore) {
+        obsoleteInventories.push(inventories[i].id)
+      }
+    }
+  }
+
+  return obsoleteInventories
+}