@things-factory/worksheet-base 4.3.154 → 4.3.156

package/server/graphql/resolvers/worksheet/unloading-return/complete-unload-returning.ts

@@ -1,14 +1,12 @@
 import { EntityManager, In } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReturnOrder } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, INVENTORY_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
 import { PutawayReturningWorksheetController, UnloadingReturningWorksheetController } from '../../../../controllers'
-import { SellercraftController } from '../../../../controllers/ecommerce'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 
 export const completeUnloadReturningResolver = {
@@ -28,16 +26,6 @@ export const completeUnloadReturningResolver = {
       ]
     })
 
-    const customerDomain: Domain = returnOrder.bizplace.domain
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: customerDomain, status: SellercraftStatus.ACTIVE })
-
-    if (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.registerProductReturn(sellercraft, returnOrder)
-    }
-
     const putawayWSCtrl: PutawayReturningWorksheetController = new PutawayReturningWorksheetController(tx, domain, user)
     let putawayWorksheet: Worksheet
 

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

@@ -81,13 +81,23 @@ export async function regenerateReleaseGoodWorksheetDetails(
     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.pickedQty,
+                uomValue: prevOI.inventory.uomValue + prevOI.pickedUomValue
+              }
+            )
+          } else {
+            await tx.getRepository(Inventory).update(
+              { id: prevOI.inventory.id },
+              {
+                lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
+                lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
+              }
+            )
+          }
         }
       })
     )

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[0].product
+    if (!product) {
+      let inventory: Inventory = await getRepository(Inventory).findOne(inventories[0].id, {
+        relations: ['product']
+      })
+      product = inventory.product
+    }
+
+    let { expirationDate } = inventories[0]
+    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[0].id)
+      }
+    }
+  }
+
+  return obsoleteInventories
+}