@things-factory/worksheet-base 4.3.697 → 4.3.700

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.697",
+  "version": "4.3.700",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,27 +24,27 @@
   },
   "dependencies": {
     "@things-factory/auth-base": "^4.3.695",
-    "@things-factory/biz-base": "^4.3.695",
+    "@things-factory/biz-base": "^4.3.700",
     "@things-factory/document-template-base": "^4.3.695",
     "@things-factory/id-rule-base": "^4.3.695",
-    "@things-factory/integration-accounting": "^4.3.695",
+    "@things-factory/integration-accounting": "^4.3.700",
     "@things-factory/integration-base": "^4.3.695",
-    "@things-factory/integration-lmd": "^4.3.695",
-    "@things-factory/integration-marketplace": "^4.3.695",
-    "@things-factory/integration-powrup": "^4.3.695",
-    "@things-factory/integration-sellercraft": "^4.3.695",
-    "@things-factory/integration-sftp": "^4.3.695",
-    "@things-factory/marketplace-base": "^4.3.695",
+    "@things-factory/integration-lmd": "^4.3.700",
+    "@things-factory/integration-marketplace": "^4.3.700",
+    "@things-factory/integration-powrup": "^4.3.700",
+    "@things-factory/integration-sellercraft": "^4.3.700",
+    "@things-factory/integration-sftp": "^4.3.700",
+    "@things-factory/marketplace-base": "^4.3.700",
     "@things-factory/notification": "^4.3.695",
-    "@things-factory/sales-base": "^4.3.697",
+    "@things-factory/sales-base": "^4.3.700",
     "@things-factory/setting-base": "^4.3.695",
     "@things-factory/shell": "^4.3.695",
-    "@things-factory/transport-base": "^4.3.695",
-    "@things-factory/warehouse-base": "^4.3.695",
+    "@things-factory/transport-base": "^4.3.700",
+    "@things-factory/warehouse-base": "^4.3.700",
     "@things-factory/worksheet-ui": "^4.3.695",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "6ceb3dfb7cd0068636370f501e5043d41d82cdf8"
+  "gitHead": "f1b712fc8f3a7b7b5136204e4c4fd6bfad0e766e"
 }

package/server/controllers/inbound/putaway-returning-worksheet-controller.ts

@@ -81,8 +81,10 @@ export class PutawayReturningWorksheetController extends VasWorksheetController
       targetInventory.product = inventory.product
       targetInventory.packingType = inventory.productDetail.packingType
       targetInventory.productDetail = inventory.productDetail
+      targetInventory.refItemId = inventory.otherRef
       targetInventory.creator = this.user
       targetInventory.updater = this.user
+      targetInventory.actualPackQty = inventory.qty
       targetInventory = await this.trxMgr.getRepository(OrderInventory).save(targetInventory)
 
       worksheet.worksheetDetails = await this.createWorksheetDetails(

package/server/controllers/inbound/putaway-worksheet-controller.ts

@@ -140,9 +140,24 @@ export class PutawayWorksheetController extends VasWorksheetController {
     }
 
     // Allowed types (ranking is used for recommendation; validation enforces allowed set)
-    const allowedTypes = [LOCATION_TYPE.STORAGE, LOCATION_TYPE.SHELF, LOCATION_TYPE.FLOOR]
+    // QUARANTINE and DAMAGE are allowed but skip stacking/homogeneity validation
+    const allowedTypes = [
+      LOCATION_TYPE.STORAGE,
+      LOCATION_TYPE.SHELF,
+      LOCATION_TYPE.FLOOR,
+      LOCATION_TYPE.QUARANTINE,
+      LOCATION_TYPE.DAMAGE
+    ]
     if (!allowedTypes.includes(location.type as any)) {
-      throw new Error('Scanned location type is not allowed for putaway (allowed: STORAGE, SHELF, FLOOR)')
+      throw new Error(
+        'Scanned location type is not allowed for putaway (allowed: STORAGE, SHELF, FLOOR, QUARANTINE, DAMAGE)'
+      )
+    }
+
+    // Skip stacking limit and homogeneity checks for QUARANTINE and DAMAGE locations
+    // Users can scan anything freely into these location types
+    if (location.type === LOCATION_TYPE.QUARANTINE || location.type === LOCATION_TYPE.DAMAGE) {
+      return
     }
 
     // Stacking limits

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -246,7 +246,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         uomValue: uomValue,
         unitCost: targetOrderInventory.unitCost,
         orderInventoryId: targetOrderInventory?.id,
-        refInventory: targetOrderInventory?.inventory
+        refInventory: targetOrderInventory?.inventory,
+        otherRef: targetOrderInventory.refItemId
       }
 
       const updateOI = {
@@ -401,6 +402,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       }
       newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
       newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
+      newInventory.otherRef = Boolean(returnOrder) ? targetInventory.refItemId : null
       newInventory.warehouse = warehouse
       newInventory.location = location
       newInventory.zone = zone
@@ -629,6 +631,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       }
       newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null
       newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null
+      newInventory.otherRef = Boolean(returnOrder) ? targetInventory.refItemId : null
       newInventory.warehouse = warehouse
       newInventory.location = location
       newInventory.zone = zone

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -239,6 +239,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       'releaseGood',
       'releaseGood.bizplace',
       'releaseGood.domain',
+      'releaseGood.deliverTo',
       'releaseGood.lastMileDelivery',
       'releaseGood.bizplace.domain',
       'domain',
@@ -517,6 +518,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       'worksheetDetails.targetProduct.product',
       'worksheetDetails.targetProduct.productDetail',
       'worksheetDetails.targetProduct.releaseGood',
+      'worksheetDetails.targetProduct.releaseGood.deliverTo',
       'worksheetDetails.targetInventory',
       'worksheetDetails.targetInventory.releaseGood',
       'worksheetDetails.targetInventory.releaseGood.domain',
@@ -2423,6 +2425,11 @@ export class PickingWorksheetController extends VasWorksheetController {
         }
       }
 
+      // if deliverTo contact point exists and has releaseShelfLife, use it as override for outbound shelf life
+      const releaseShelfLife = (releaseGood?.deliverTo as any)?.releaseShelfLife
+      const outboundShelfLifeOverride =
+        releaseGood?.deliverTo && releaseShelfLife != null && releaseShelfLife !== 0 ? Number(releaseShelfLife) : null
+
       let assignedOrderInventories: OrderInventory[] = await InventoryUtil.autoAssignInventoryForRelease(
         op,
         op.productDetail.product,
@@ -2436,7 +2443,8 @@ export class PickingWorksheetController extends VasWorksheetController {
         undefined,
         undefined,
         undefined,
-        (op as any)?.warehouseCode
+        (op as any)?.warehouseCode,
+        outboundShelfLifeOverride
       )
 
       assignedOrderInventories = assignedOrderInventories.map(aoi => {
@@ -2522,7 +2530,11 @@ export class PickingWorksheetController extends VasWorksheetController {
           locationSortingRules: inventoryAssignmentSetting ? JSON.parse(inventoryAssignmentSetting.value) : false,
           pickingStrategy: orderProducts[i].product.pickingStrategy,
           warehouseName:
-            (orderProducts[i] as any)?.warehouseCode || (orderProducts[i] as any)?.warehouse?.name || undefined
+            (orderProducts[i] as any)?.warehouseCode || (orderProducts[i] as any)?.warehouse?.name || undefined,
+          releaseShelfLifeOverride: (() => {
+            const releaseShelfLife = (orderProducts[i]?.releaseGood as any)?.deliverTo?.releaseShelfLife
+            return releaseShelfLife != null && releaseShelfLife !== 0 ? Number(releaseShelfLife) : null
+          })()
         },
         this.domain,
         this.trxMgr

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

@@ -10,23 +10,29 @@ export const inventoriesByPalletResolver = {
     const { domain, user }: { domain: Domain; user: User } = context.state
     const params = { filters, pagination }
     try {
-    const bizplaceId = params.filters.find(x => x.name == 'bizplace_id')
-    const productFilters = params.filters.filter(x => x.name == 'productName')
-    const inventoriesFilters = params.filters.find(x => x.name == 'invFilter')
-    const recallFilters = params.filters.find(x => x.name === 'recall')
-    const skipLockCheckFilters = params.filters.find(x => x.name === 'skipLockCheck')
-    let skipLockCheck: Boolean =
-      skipLockCheckFilters && skipLockCheckFilters?.value ? skipLockCheckFilters?.value : false
-    const productFilterColumns = ['sku', 'brandSku', 'name', 'description', 'brand', 'subBrand']
-    params.filters = params.filters.filter(x => x.name != 'productName' && x.name != 'invFilter')
-    const batchIdFilters = params.filters.find(x => x.name == 'batchId')
-
-    if (!params.filters.find((filter: any) => filter.name === 'bizplace_id')) {
-      throw new Error('No Bizplace found')
-    }
+      const bizplaceId = params.filters.find(x => x.name == 'bizplace_id')
+      const releaseShelfLifeOverrideFilter = params.filters.find(x => x.name == 'releaseShelfLifeOverride')
+      const releaseShelfLifeOverride =
+        releaseShelfLifeOverrideFilter && releaseShelfLifeOverrideFilter.value != null
+          ? Number(releaseShelfLifeOverrideFilter.value)
+          : null
+      params.filters = params.filters.filter(x => x.name != 'releaseShelfLifeOverride')
+      const productFilters = params.filters.filter(x => x.name == 'productName')
+      const inventoriesFilters = params.filters.find(x => x.name == 'invFilter')
+      const recallFilters = params.filters.find(x => x.name === 'recall')
+      const skipLockCheckFilters = params.filters.find(x => x.name === 'skipLockCheck')
+      let skipLockCheck: Boolean =
+        skipLockCheckFilters && skipLockCheckFilters?.value ? skipLockCheckFilters?.value : false
+      const productFilterColumns = ['sku', 'brandSku', 'name', 'description', 'brand', 'subBrand']
+      params.filters = params.filters.filter(x => x.name != 'productName' && x.name != 'invFilter')
+      const batchIdFilters = params.filters.find(x => x.name == 'batchId')
+
+      if (!params.filters.find((filter: any) => filter.name === 'bizplace_id')) {
+        throw new Error('No Bizplace found')
+      }
 
-    const locationFilters = params.filters.find(x => x.name == 'locationName')
-    params.filters = params.filters.filter(x => x.name != 'locationName')
+      const locationFilters = params.filters.find(x => x.name == 'locationName')
+      params.filters = params.filters.filter(x => x.name != 'locationName')
 
       const qb: SelectQueryBuilder<Inventory> = getRepository(Inventory).createQueryBuilder('iv')
       buildQuery(qb, params, context)
@@ -43,7 +49,7 @@ export const inventoriesByPalletResolver = {
         .andWhere('iv.qty > 0')
         .andWhere('iv.transfer_qty <= 0')
         .andWhere('iv.transfer_uom_value <= 0')
-      .andWhere('iv.lock_inventory is not true')
+        .andWhere('iv.lock_inventory is not true')
         .andWhere(
           `location.type ${recallFilters?.value === true ? '' : 'NOT'} IN ('${LOCATION_TYPE.QUARANTINE}', '${
             LOCATION_TYPE.RESERVE
@@ -72,10 +78,8 @@ export const inventoriesByPalletResolver = {
       }
 
       if (inventoriesFilters?.value?.length > 0) {
-
         qb.andWhere('iv.id NOT IN (:...inventoriesIds)', {
           inventoriesIds: inventoriesFilters.value
-      
         })
       }
 
@@ -132,12 +136,14 @@ export const inventoriesByPalletResolver = {
           qb.andWhere(`iv.batch_id ilike '${batchIdFilters.value}'`)
         }
         qb.andWhere(
-          'iv.obsolete = true and case when iv.expiration_date is not null and product.min_outbound_shelf_life is not null then CURRENT_DATE > iv.expiration_date - product.min_outbound_shelf_life else true end)'
+          'iv.obsolete = true and case when iv.expiration_date is not null then CURRENT_DATE > iv.expiration_date - (case when :releaseOverride::integer is not null and :releaseOverride::integer > 0 then :releaseOverride::integer when product.min_outbound_shelf_life is not null then product.min_outbound_shelf_life else 0 end) else true end)',
+          { releaseOverride: releaseShelfLifeOverride ?? null }
         )
       } else {
         qb.andWhere('iv.obsolete = false')
         qb.andWhere(
-          'case when iv.expiration_date is not null and product.min_outbound_shelf_life is not null then CURRENT_DATE < iv.expiration_date - product.min_outbound_shelf_life else true end'
+          'case when iv.expiration_date is not null then CURRENT_DATE < iv.expiration_date - (case when :releaseOverride::integer is not null and :releaseOverride::integer > 0 then :releaseOverride::integer when product.min_outbound_shelf_life is not null then product.min_outbound_shelf_life else 0 end) else true end',
+          { releaseOverride: releaseShelfLifeOverride ?? null }
         )
       }
 
@@ -181,7 +187,7 @@ export const inventoriesByPalletResolver = {
             productBrand: item.product.brand,
             productId: item.product.id,
             productDetailId: item.productDetail.id,
-            isInventoryDecimal: item.product.isInventoryDecimal,
+            isInventoryDecimal: item.product.isInventoryDecimal
           }
         })
       )

package/server/utils/inventory-util.ts

@@ -121,7 +121,8 @@ export async function inventoriesByStrategy(
     uom,
     pickingStrategy,
     locationSortingRules,
-    warehouseName
+    warehouseName,
+    releaseShelfLifeOverride
   },
   domain: Domain,
   trxMgr: EntityManager
@@ -158,14 +159,15 @@ export async function inventoriesByStrategy(
     })
     .andWhere('"INV"."obsolete" = false')
     .andWhere(
-      'case when "INV"."expiration_date" is not null and "PROD"."min_outbound_shelf_life" is not null then CURRENT_DATE < "INV"."expiration_date" - "PROD"."min_outbound_shelf_life" else true end'
+      'case when "INV"."expiration_date" is not null then CURRENT_DATE < "INV"."expiration_date" - (case when :releaseShelfLifeOverride::integer is not null and :releaseShelfLifeOverride::integer > 0 then :releaseShelfLifeOverride::integer when "PROD"."min_outbound_shelf_life" is not null then "PROD"."min_outbound_shelf_life" else 0 end) else true end'
     )
     .setParameters({
       domainId: domain.id,
       productId,
       packingType,
       packingSize,
-      uom
+      uom,
+      releaseShelfLifeOverride: releaseShelfLifeOverride ?? null
     })
 
   if (batchId !== '') {