@things-factory/worksheet-base 4.3.701 → 4.3.708

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/controllers/render-fm-grn.ts

@@ -26,15 +26,34 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
   // 2. find grn
   const foundGRN: GoodsReceivalNote = await getRepository(GoodsReceivalNote).findOne({
     where: { domain, name: grnNo },
-    relations: ['domain', 'bizplace', 'bizplace.domain', 'bizplace.company', 'arrivalNotice']
+    relations: [
+      'domain',
+      'bizplace',
+      'bizplace.domain',
+      'bizplace.company',
+      'arrivalNotice',
+      'arrivalNotice.creator',
+      'updater'
+    ]
   })
 
+  if (!foundGRN) {
+    throw new Error(`GRN not found for no: ${grnNo}`)
+  }
+
   // 3. find GAN
   const foundGAN: ArrivalNotice = foundGRN.arrivalNotice
   const ownRefNo = foundGAN.refNo
 
   const foundInventoryItem: InventoryItem[] = await getRepository(InventoryItem).query(
-    `select row_number() over (partition by p.sku) as "seq",p.sku,p.brand_sku, ii.serial_number from inventory_items ii left join products p on ii.product_id = p.id where inbound_order_id = '${foundGAN.id}' group by p.sku,ii.serial_number,p.brand_sku`
+    `select row_number() over (partition by p.sku) as "seq",
+            p.sku,
+            p.brand_sku,
+            ii.serial_number
+       from inventory_items ii
+       left join products p on ii.product_id = p.id
+      where inbound_order_id = '${foundGAN.id}'
+   group by p.sku, ii.serial_number, p.brand_sku`
   )
 
   // 4. find customer bizplace
@@ -51,27 +70,29 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     relations: ['company']
   })
 
-  const qbReducedInventory = getRepository(ReducedInventoryHistory)
+  // ReducedInventoryHistory -> ONE ROW PER PALLET
+  const inboundInventories: any[] = await getRepository(ReducedInventoryHistory)
     .createQueryBuilder('ivh')
-    .select('product_id', 'productId')
-    .addSelect('batch_id', 'batchId')
-    .addSelect('reusable_pallet_id', 'reusablePalletId')
-    .addSelect('packing_type', 'packingType')
-    .addSelect('sum(qty)', 'qty')
-    .addSelect('sum(uom_value)', 'uomValue')
-    .addSelect('uom', 'uom')
-    .addSelect('expiration_date', 'expiryDate')
-    .addSelect('count(distinct pallet_id)', 'pallet')
-    .addSelect(`string_agg(distinct pallet_id::varchar,', ' order by pallet_id::varchar)`, 'palletId')
+    .select('ivh.product_id', 'productId')
+    .addSelect('ivh.batch_id', 'batchId')
+    .addSelect('ivh.reusable_pallet_id', 'reusablePalletId')
+    .addSelect('ivh.packing_type', 'packingType')
+    .addSelect('ivh.uom', 'uom')
+    .addSelect('ivh.pallet_id', 'palletId')
+    .addSelect('ivh.expiration_date', 'expiryDate')
+    .addSelect('SUM(ivh.qty)', 'qty')
+    .addSelect('SUM(ivh.uom_value)', 'uomValue')
+    .addSelect('1', 'palletQty') // one pallet per row
     .where('ivh.domain_id = :domainId', { domainId: domain.id })
     .andWhere('ivh.ref_order_id = :refOrderId', { refOrderId: foundGAN.id })
     .andWhere(`ivh.transaction_type = 'UNLOADING'`)
-    .groupBy('reusable_pallet_id')
-    .addGroupBy('product_id')
-    .addGroupBy('batch_id')
-    .addGroupBy('packing_type')
-    .addGroupBy('uom')
-    .addGroupBy('expiration_date')
+    .groupBy('ivh.product_id')
+    .addGroupBy('ivh.batch_id')
+    .addGroupBy('ivh.reusable_pallet_id')
+    .addGroupBy('ivh.packing_type')
+    .addGroupBy('ivh.uom')
+    .addGroupBy('ivh.pallet_id')
+    .addGroupBy('ivh.expiration_date')
     .getRawMany()
 
   // 5. find domain contact point
@@ -79,7 +100,6 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     where: { domain, bizplace: domainBizplace }
   })
 
-  // 5. find domain contact point
   const foundPartnerCP: ContactPoint = await getRepository(ContactPoint).findOne({
     where: { domain, bizplace: partnerBiz }
   })
@@ -98,7 +118,7 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
 
   const targetProducts: OrderProduct[] = await getRepository(OrderProduct).find({
     where: { domain, arrivalNotice: foundGAN, actualPalletQty: Not(IsNull()), actualPackQty: Not(IsNull()) },
-    relations: ['product']
+    relations: ['product', 'productDetail']
   })
 
   // 7. find grn template based on category
@@ -129,8 +149,6 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     }
   })
 
-  const inboundInventories: any[] = await qbReducedInventory
-
   const template = await STORAGE.readFile(foundTemplate.path, 'utf-8')
 
   let logo = null
@@ -148,28 +166,122 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     cop = 'data:' + foundSignature.mimetype + ';base64,' + (await STORAGE.readFile(foundCop.path, 'base64'))
   }
 
+  // serial number aggregation
   const filterInventoryItem = _.groupBy(foundInventoryItem, i => i.sku)
-
-  const tempIndexArr = []
-
-  const tempTotalQuantity = []
+  const tempIndexArr: number[] = []
+  const tempTotalQuantity: number[] = []
 
   Object.keys(filterInventoryItem).forEach(k => {
     const tempIndex = foundInventoryItem.findIndex(i => {
       return i.sku == k
     })
-
     tempIndexArr.push(tempIndex)
   })
 
   Object.values(filterInventoryItem).forEach(k => {
-    const tempQuantity = k.length
-
+    const tempQuantity = (k as any[]).length
     tempTotalQuantity.push(tempQuantity)
   })
 
   tempIndexArr.forEach((t, index) => {
-    if (t >= 0) foundInventoryItem[t].totalQuantity = tempTotalQuantity[index]
+    if (t >= 0) (foundInventoryItem[t] as any).totalQuantity = tempTotalQuantity[index]
+  })
+
+  // =========================
+  // Build pallet_list (per pallet)
+  // =========================
+
+  const pallet_list = inboundInventories.map((inv, idx) => {
+    const item = targetProducts.find(
+      tp =>
+        tp.product.id === inv.productId &&
+        tp.batchId === inv.batchId &&
+        tp.packingType === inv.packingType &&
+        tp.uom === inv.uom &&
+        tp.palletId === inv.palletId
+    )
+
+    const qty = Number(inv.qty) || (item ? item.actualPackQty : 0)
+    const uomValue = Number(inv.uomValue) || (item ? item.uomValue * qty : 0)
+    const volume = item && item.productDetail.volume ? item.productDetail.volume * qty : 0
+    const expiryDate = inv.expiryDate ? new Date(inv.expiryDate).toISOString().split('T')[0] : ''
+
+    return {
+      list_no: idx + 1,
+      _uomValue: uomValue, // internal for grouping later
+      product_sku: item ? `${item.product.sku}` : '',
+      product_brand_sku: item ? `${item.product.brandSku}` : '',
+      product_name: item ? `${item.product.name}(${item.product.description})` : '',
+      product_desc: item ? item.product.description : '',
+      product_nameOnly: item ? item.product.name : '',
+      product_type: inv.packingType,
+      product_size: item ? item.packingSize : null,
+      product_batch: inv.batchId,
+      product_volume: volume,
+      batch_id_ref: item?.batchIdRef || '',
+      pallet_id: inv.palletId,
+      pallet_qty: Number(inv.palletQty) || (item?.actualPalletQty ?? 1),
+      pack_qty: qty,
+      product_qty: qty,
+      discrepancy_qty: item ? item.packQty - item.actualPackQty : 0,
+      product_unit_uom_value: item ? `${Math.round(item.uomValue * 100) / 100}` : '',
+      product_total_uom_value: `${Math.round(uomValue * 100) / 100}`,
+      product_uom: inv.uom,
+      product_gross_weight: item ? item.product.grossWeight : null,
+      unit_price: item ? item.unitPrice : null,
+      expiry_date: expiryDate,
+      manufacture_date: item ? item.manufactureDate : null,
+      reusable_pallet_id: inv.reusablePalletId || '',
+      remark: item ? (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '') : ''
+    }
+  })
+
+  // =========================
+  // Build product_list (grouped view)
+  // =========================
+
+  const groupedByProduct = _.groupBy(pallet_list, pl =>
+    [
+      pl.product_sku,
+      pl.product_batch,
+      pl.product_type,
+      pl.product_uom,
+      pl.expiry_date // keep expiries separate; remove from key if you want to merge
+    ].join('|')
+  )
+
+  const product_list = Object.values(groupedByProduct).map((rows: any[], idx) => {
+    const first = rows[0]
+    const totalQty = rows.reduce((sum, r) => sum + (r.product_qty || 0), 0)
+    const totalPalletQty = rows.reduce((sum, r) => sum + (r.pallet_qty || 0), 0)
+    const totalUomValue = rows.reduce((sum, r) => sum + (r._uomValue || 0), 0)
+
+    return {
+      list_no: idx + 1,
+      product_sku: first.product_sku,
+      product_brand_sku: first.product_brand_sku,
+      product_name: first.product_name,
+      product_desc: first.product_desc,
+      product_nameOnly: first.product_nameOnly,
+      product_type: first.product_type,
+      product_size: first.product_size,
+      product_batch: first.product_batch,
+      product_volume: first.product_volume,
+      batch_id_ref: first.batch_id_ref,
+      pallet_qty: totalPalletQty,
+      pack_qty: totalQty,
+      product_qty: totalQty,
+      discrepancy_qty: first.discrepancy_qty, // per-product discrepancy if needed
+      product_unit_uom_value: first.product_unit_uom_value,
+      product_total_uom_value: `${Math.round(totalUomValue * 100) / 100}`,
+      product_uom: first.product_uom,
+      product_gross_weight: first.product_gross_weight,
+      unit_price: first.unit_price,
+      expiry_date: first.expiry_date,
+      manufacture_date: first.manufacture_date,
+      reusable_pallet_id: first.reusable_pallet_id,
+      remark: first.remark
+    }
   })
 
   const data = {
@@ -192,7 +304,11 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     warehouse_fax: foundCP.fax,
     warehouse_email: foundCP.email,
     order_no: foundGRN.name,
+    grn_received_by: foundGRN.updater.name,
+    grn_received_date: foundGRN.createdAt ? DateTimeConverter.date(foundGRN.createdAt) : '',
     gan_no: foundGAN.name,
+    gan_created_by: foundGAN.creator.name,
+    gan_created_date: foundGAN.createdAt ? DateTimeConverter.date(foundGAN.createdAt) : '',
     gan_accepted_at: foundGAN.acceptedAt ? DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
     unload_date: DateTimeConverter.date(foundWS.endedAt),
     ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
@@ -207,49 +323,8 @@ export async function renderFmGRN({ grnNo, timezoneOffSet }, context: any) {
     account_no: foundPartnerCP ? foundPartnerCP.accountNo : '',
     unloaded_by: foundWS ? foundWS.updater.name : '',
     putaway_by: foundPutawayWS ? foundPutawayWS.updater.name : '',
-    product_list: targetProducts
-      .reduce((acc, item) => {
-        acc.push(
-          ...inboundInventories
-            .filter(
-              ih =>
-                ih.productId == item.product.id &&
-                ih.batchId == item.batchId &&
-                ih.packingType == item.packingType &&
-                ih.uom == item.uom
-            )
-            .map(unloadInvHistory => {
-              return {
-                product_sku: `${item.product.sku}`,
-                product_brand_sku: `${item.product.brandSku}`,
-                product_name: `${item.product.name}(${item.product.description})`,
-                product_desc: item.product.description,
-                product_nameOnly: item.product.name,
-                product_type: item.packingType,
-                product_size: item.packingSize,
-                product_batch: item.batchId,
-                batch_id_ref: item?.batchIdRef ? item.batchIdRef : '',
-                pallet_qty: item.actualPalletQty,
-                product_qty: unloadInvHistory.qty || item.actualPackQty,
-                product_pack_qty: item.packQty,
-                descrepancy_qty: (unloadInvHistory.qty || item.actualPackQty) - item.packQty,
-                product_unit_uom_value: `${Math.round(item.uomValue * 100) / 100}`,
-                product_total_uom_value: `${
-                  Math.round((unloadInvHistory.uomValue || item.uomValue * item.actualPackQty) * 100) / 100
-                }`,
-                product_uom: `${unloadInvHistory.uom || item.uom}`,
-                product_gross_weight: item.product.grossWeight || null,
-                unit_price: item.unitPrice || null,
-                expiry_date: unloadInvHistory.expiryDate && unloadInvHistory.expiryDate != '' ? new Date(unloadInvHistory.expiryDate).toISOString().split('T')[0] : '',
-                manufacture_date: item.manufactureDate,
-                reusable_pallet_id: unloadInvHistory.reusablePalletId || '',
-                remark: (item.remark ? item.remark : '') + (item.issue ? ' [Issue]: ' + item.issue : '')
-              }
-            })
-        )
-        return acc
-      }, [])
-      .map((item, idx) => ({ list_no: idx + 1, ...item })),
+    pallet_list,
+    product_list,
     serialNumber: foundInventoryItem
   }
 

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,34 @@ 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 iv.expiration_date IS NOT NULL AND (
+            CASE
+              WHEN :releaseOverride::integer IS NOT NULL AND :releaseOverride::integer > 0 THEN
+                CURRENT_DATE >= iv.expiration_date - :releaseOverride::integer
+              WHEN product.min_outbound_shelf_life IS NOT NULL AND product.min_outbound_shelf_life > 0 THEN
+                CURRENT_DATE >= iv.expiration_date - product.min_outbound_shelf_life
+              ELSE
+                FALSE
+            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'
+          `(
+            iv.expiration_date IS NULL
+            OR
+            CASE
+              WHEN :releaseOverride::integer IS NOT NULL AND :releaseOverride::integer > 0 THEN
+                CURRENT_DATE < iv.expiration_date - :releaseOverride::integer
+              WHEN product.min_outbound_shelf_life IS NOT NULL AND product.min_outbound_shelf_life > 0 THEN
+                CURRENT_DATE < iv.expiration_date - product.min_outbound_shelf_life
+              ELSE
+                TRUE
+            END
+          )`,
+          { releaseOverride: releaseShelfLifeOverride ?? null }
         )
       }
 
@@ -181,7 +207,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,26 @@ 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'
+      `(
+        "INV"."expiration_date" IS NULL
+        OR
+        CASE
+          WHEN :releaseShelfLifeOverride::integer IS NOT NULL AND :releaseShelfLifeOverride::integer > 0 THEN
+            CURRENT_DATE < ("INV"."expiration_date" - :releaseShelfLifeOverride::integer)
+          WHEN "PROD"."min_outbound_shelf_life" IS NOT NULL AND "PROD"."min_outbound_shelf_life" > 0 THEN
+            CURRENT_DATE < ("INV"."expiration_date" - "PROD"."min_outbound_shelf_life")
+          ELSE
+            TRUE
+        END
+      )`
     )
     .setParameters({
       domainId: domain.id,
       productId,
       packingType,
       packingSize,
-      uom
+      uom,
+      releaseShelfLifeOverride: releaseShelfLifeOverride ?? null
     })
 
   if (batchId !== '') {