npm - @things-factory/worksheet-base - Versions diffs - 4.3.705 → 4.3.723 - Mend

@things-factory/worksheet-base 4.3.705 → 4.3.723

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/dist-server/controllers/render-fm-grn.js +132 -58
package/dist-server/controllers/render-fm-grn.js.map +1 -1
package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js +22 -2
package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map +1 -1
package/dist-server/utils/inventory-util.js +12 -1
package/dist-server/utils/inventory-util.js.map +1 -1
package/package.json +21 -21
package/server/controllers/render-fm-grn.ts +149 -74
package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts +22 -2
package/server/utils/inventory-util.ts +12 -1

package/dist-server/controllers/render-fm-grn.js CHANGED Viewed

@@ -27,12 +27,30 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
     // 2. find grn
     const foundGRN = await (0, typeorm_1.getRepository)(sales_base_1.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 = foundGRN.arrivalNotice;
     const ownRefNo = foundGAN.refNo;
-    const foundInventoryItem = await (0, typeorm_1.getRepository)(warehouse_base_1.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`);
+    const foundInventoryItem = await (0, typeorm_1.getRepository)(warehouse_base_1.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`);
     // 4. find customer bizplace
     const partnerBiz = foundGRN.bizplace;
     const partnerDomain = await (0, typeorm_1.getRepository)(auth_base_1.Partner).findOne({
@@ -44,33 +62,34 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
         where: { domain: domainOwner },
         relations: ['company']
     });
-    const qbReducedInventory = (0, typeorm_1.getRepository)(warehouse_base_1.ReducedInventoryHistory)
+    // ReducedInventoryHistory -> ONE ROW PER PALLET
+    const inboundInventories = await (0, typeorm_1.getRepository)(warehouse_base_1.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
     const foundCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
         where: { domain, bizplace: domainBizplace }
     });
-    // 5. find domain contact point
     const foundPartnerCP = await (0, typeorm_1.getRepository)(biz_base_1.ContactPoint).findOne({
         where: { domain, bizplace: partnerBiz }
     });
@@ -86,7 +105,7 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
     });
     const targetProducts = await (0, typeorm_1.getRepository)(sales_base_1.OrderProduct).find({
         where: { domain, arrivalNotice: foundGAN, actualPalletQty: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()), actualPackQty: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()) },
-        relations: ['product']
+        relations: ['product', 'productDetail']
     });
     // 7. find grn template based on category
     const foundTemplate = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
@@ -112,7 +131,6 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
             category: constants_1.TEMPLATE_TYPE.COP
         }
     });
-    const inboundInventories = await qbReducedInventory;
     const template = await attachment_base_1.STORAGE.readFile(foundTemplate.path, 'utf-8');
     let logo = null;
     if (foundLogo === null || foundLogo === void 0 ? void 0 : foundLogo.path) {
@@ -126,6 +144,7 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
     if (foundCop === null || foundCop === void 0 ? void 0 : foundCop.path) {
         cop = 'data:' + foundSignature.mimetype + ';base64,' + (await attachment_base_1.STORAGE.readFile(foundCop.path, 'base64'));
     }
+    // serial number aggregation
     const filterInventoryItem = lodash_1.default.groupBy(foundInventoryItem, i => i.sku);
     const tempIndexArr = [];
     const tempTotalQuantity = [];
@@ -143,6 +162,91 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
         if (t >= 0)
             foundInventoryItem[t].totalQuantity = tempTotalQuantity[index];
     });
+    // =========================
+    // Build pallet_list (per pallet)
+    // =========================
+    const pallet_list = inboundInventories.map((inv, idx) => {
+        var _a;
+        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,
+            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 === null || item === void 0 ? void 0 : item.batchIdRef) || '',
+            pallet_id: inv.palletId,
+            pallet_qty: Number(inv.palletQty) || ((_a = item === null || item === void 0 ? void 0 : item.actualPalletQty) !== null && _a !== void 0 ? _a : 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 = lodash_1.default.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, 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,
+            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 = {
         logo_url: logo,
         sign_url: signature,
@@ -163,7 +267,11 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
         warehouse_fax: foundCP.fax,
         warehouse_email: foundCP.email,
         order_no: foundGRN.name,
+        grn_received_by: foundGRN.updater.name,
+        grn_received_date: foundGRN.createdAt ? datetime_util_1.DateTimeConverter.date(foundGRN.createdAt) : '',
         gan_no: foundGAN.name,
+        gan_created_by: foundGAN.creator.name,
+        gan_created_date: foundGAN.createdAt ? datetime_util_1.DateTimeConverter.date(foundGAN.createdAt) : '',
         gan_accepted_at: foundGAN.acceptedAt ? datetime_util_1.DateTimeConverter.datetime(foundGAN.acceptedAt, timezoneOffSet) : '',
         unload_date: datetime_util_1.DateTimeConverter.date(foundWS.endedAt),
         ref_no: ownRefNo ? `${foundGAN.name} / ${foundGAN.refNo}` : `${foundGAN.name}`,
@@ -178,42 +286,8 @@ async function renderFmGRN({ grnNo, timezoneOffSet }, context) {
         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 === null || item === void 0 ? void 0 : 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) => (Object.assign({ list_no: idx + 1 }, item))),
+        pallet_list,
+        product_list,
         serialNumber: foundInventoryItem
     };
     const formData = new form_data_1.default();

package/dist-server/controllers/render-fm-grn.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"render-fm-grn.js","sourceRoot":"","sources":["../../server/controllers/render-fm-grn.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"render-fm-grn.js","sourceRoot":"","sources":["../../server/controllers/render-fm-grn.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js CHANGED Viewed

@@ -98,11 +98,31 @@ exports.inventoriesByPalletResolver = {
                 if (batchIdFilters) {
                     qb.andWhere(`iv.batch_id ilike '${batchIdFilters.value}'`);
                 }
-                qb.andWhere('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 && releaseShelfLifeOverride !== void 0 ? releaseShelfLifeOverride : null });
+                qb.andWhere(`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 && releaseShelfLifeOverride !== void 0 ? releaseShelfLifeOverride : null });
             }
             else {
                 qb.andWhere('iv.obsolete = false');
-                qb.andWhere('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 && releaseShelfLifeOverride !== void 0 ? releaseShelfLifeOverride : null });
+                qb.andWhere(`(
+            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 && releaseShelfLifeOverride !== void 0 ? releaseShelfLifeOverride : null });
             }
             if ((sortings === null || sortings === void 0 ? void 0 : sortings.length) !== 0) {
                 const arrChildSortData = ['productName', 'productSKU'];

package/dist-server/graphql/resolvers/worksheet/inventories-by-pallet.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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~~6UAA6U~~,~~EAC7U,~~EAAE,eAAe,EAAE,wBAAwB,aAAxB,wBAAwB,cAAxB,wBAAwB,GAAI,IAAI,EAAE,CACtD,CAAA;aACF;iBAAM;gBACL,EAAE,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAA;gBAClC,EAAE,CAAC,QAAQ,CACT,~~qTAAqT~~,~~EACrT,~~EAAE,eAAe,EAAE,wBAAwB,aAAxB,wBAAwB,cAAxB,wBAAwB,GAAI,IAAI,EAAE,CACtD,CAAA;aACF;YAED,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,MAAK,CAAC,EAAE;gBAC1B,MAAM,gBAAgB,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;gBAEtD,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;gBAC1C,MAAM,IAAI,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAClC,CAAC,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,iCACf,GAAG,KACN,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EACxG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAC5B,EACF,EAAE,CACH,CAAA;gBACD,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;aACjB;YAED,IAAI,CAAA,oBAAoB,aAApB,oBAAoB,uBAApB,oBAAoB,CAAE,MAAM,IAAG,CAAC,EAAE;gBACpC,oBAAoB,CAAC,OAAO,CAAC,CAAC,IAAqC,EAAE,EAAE;oBACrE,EAAE,CAAC,UAAU,CAAC,YAAY,IAAI,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBACpE,CAAC,CAAC,CAAA;aACH;iBAAM;gBACL,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,CAAA;aACvC;YAED,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;YAE/C,KAAK,GAAG,MAAM,OAAO,CAAC,GAAG,CACvB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAe,EAAE,EAAE;gBAClC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,eAAe,CAAC,IAAI,CAAC,CAAA;gBAEjE,uCACK,IAAI,KACP,SAAS;oBACT,cAAc,EACd,qBAAqB,EAAE,cAAc,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG;oBACtD,yBAAyB;oBACzB,WAAW,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,EAChE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,EAC5B,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAChC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE,EAC1B,eAAe,EAAE,IAAI,CAAC,aAAa,CAAC,EAAE,EACtC,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB,IACpD;YACH,CAAC,CAAC,CACH,CAAA;YAED,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;SACxB;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAA;SACvB;IACH,CAAC;CACF,CAAA;AAED,KAAK,UAAU,eAAe,CAAC,SAAoB;IACjD,OAAO;QACL,SAAS,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,SAAS,IAAI,CAAC,CAAC;QACrD,cAAc,EAAE,SAAS,CAAC,QAAQ,GAAG,CAAC,SAAS,CAAC,cAAc,IAAI,CAAC,CAAC;KACrE,CAAA;AACH,CAAC"}
1	+ {"version":3,"file":"inventories-by-pallet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/inventories-by-pallet.ts"],"names":[],"mappings":"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"}

package/dist-server/utils/inventory-util.js CHANGED Viewed

@@ -105,7 +105,18 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
         locationTypes: [warehouse_base_1.LOCATION_TYPE.QUARANTINE, warehouse_base_1.LOCATION_TYPE.RESERVE]
     })
         .andWhere('"INV"."obsolete" = false')
-        .andWhere('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')
+        .andWhere(`(
+        "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,

package/dist-server/utils/inventory-util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":"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~~4VAA4V,CAC7V~~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~~AArJD~~,~~sDAqJC~~;AAEM,KAAK,UAAU,mBAAmB,CAAC,SAAoB;IAC5D,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC9D,IAAI,OAAO,GAAwB,SAAS,CAAC,OAAO,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC,CAAA;QACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;KAC5B;IAED,MAAM,EAAE,cAAc,EAAE,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAA;IAE9D,IAAI,CAAC,qBAAqB,IAAI,CAAC,mBAAmB,IAAI,cAAc,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IAEvF,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;IAC3B,MAAM,YAAY,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAA;IACvF,MAAM,UAAU,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;IAEjD,OAAO,UAAU,GAAG,YAAY,CAAA;AAClC,CAAC;AApBD,kDAoBC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAwB;IAChE,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,IAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAExE,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAI,OAAO,GAAwB,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;QACzD,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnF,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAA;YACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;SAC5B;QAED,IAAI,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;QAExC,IAAI,oBAAoB,IAAI,cAAc,EAAE;YAC1C,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;YAC3B,cAAc,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;YAEzC,MAAM,aAAa,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAA;YAE7G,IAAI,IAAI,GAAG,aAAa,EAAE;gBACxB,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;aAC5C;SACF;KACF;IAED,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AA9BD,kDA8BC"}
1	+ {"version":3,"file":"inventory-util.js","sourceRoot":"","sources":["../../server/utils/inventory-util.ts"],"names":[],"mappings":";;;AAAA,qCAAkE;AAIlE,+DAAsD;AAEtD,mEAAsH;AAEtH;;;;;;;GAOG;AACI,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,QAAkB,EAClB,OAAa,EACb,MAAsB;IAEtB,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IACnG,MAAM,YAAY,GAAyB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,yBAAQ,CAAC,KAAI,IAAA,uBAAa,EAAC,yBAAQ,CAAC,CAAA;IACrG,MAAM,iBAAiB,GAAW,MAAM,OAAO,CAAC,KAAK,CAAC;QACpD,MAAM;QACN,MAAM,EAAE,iCAAgB,CAAC,MAAM;QAC/B,QAAQ;KACT,CAAC,CAAA;IAEF,IAAI,CAAC,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACnE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,KAAK,EAC7B,OAAO,IACP,CAAA;KACH;SAAM,IAAI,iBAAiB,IAAI,QAAQ,CAAC,MAAM,KAAK,gCAAe,CAAC,KAAK,EAAE;QACzE,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,iCAC7B,QAAQ,KACX,MAAM,EAAE,gCAAe,CAAC,QAAQ,EAChC,OAAO,IACP,CAAA;KACH;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC;AA7BD,oDA6BC;AAEM,KAAK,UAAU,sBAAsB,CAC1C,MAAc,EACd,QAAkB,EAClB,QAAgB,EAChB,MAAsB;IAEtB,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IACnG,MAAM,mBAAmB,GAAW,MAAM,OAAO,CAAC,KAAK,CAAC;QACtD,MAAM;QACN,QAAQ;QACR,QAAQ;KACT,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAA;AACrC,CAAC;AAdD,wDAcC;AAED;;;;;;;;;GASG;AACI,KAAK,UAAU,wBAAwB,CAC5C,MAAc,EACd,QAAkB,EAClB,QAAgB,EAChB,OAAe,EACf,OAAyB,EACzB,WAAmB,EACnB,MAAsB;;IAEtB,MAAM,WAAW,GAAwB,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,sBAAO,CAAC,KAAI,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAA;IACjG,MAAM,OAAO,GAA0B,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,CAAC,0BAAS,CAAC,KAAI,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAA;IAEnG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,YAAY,GAAY,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAChE,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,+BAA+B,OAAO,EAAE,CAAC,CAAA;QAC5E,OAAO,GAAG,YAAY,CAAA;KACvB;IAED,MAAM,GAAG,GAAc,MAAM,OAAO,CAAC,OAAO,CAAC;QAC3C,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;QACrC,SAAS,EAAE,CAAC,SAAS,CAAC;KACvB,CAAC,CAAA;IAEF,IAAI,OAAO,KAAK,GAAG,CAAC,OAAO;QAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,gCAAgC,OAAO,EAAE,EAAE,CAAA;IAErH,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,OAAK,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,0CAAE,EAAE,CAAA;QAClC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,+BAA+B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAA;IAE9F,IAAI,WAAW,KAAK,GAAG,CAAC,WAAW;QACjC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,oCAAoC,WAAW,EAAE,EAAE,CAAA;IAElG,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAA;AAChC,CAAC;AAhCD,4DAgCC;AAED;;;;GAIG;AACI,KAAK,UAAU,qBAAqB,CACzC,EACE,WAAW,EACX,OAAO,EACP,UAAU,EACV,SAAS,EACT,WAAW,EACX,WAAW,EACX,GAAG,EACH,eAAe,EACf,oBAAoB,EACpB,aAAa,EACb,wBAAwB,EACzB,EACD,MAAc,EACd,MAAqB;IAErB,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAC1E,EAAE,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM,CAAC;SACzC,kBAAkB,CAAC,cAAc,EAAE,KAAK,CAAC;SACzC,SAAS,CAAC,YAAY,EAAE,GAAG,EAAE,yBAAyB,CAAC;SACvD,SAAS,CAAC,yCAAyC,EAAE,MAAM,EAAE,uCAAuC,CAAC;SACrG,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpB,QAAQ;SACL,MAAM,CAAC,+BAA+B,EAAE,YAAY,CAAC;SACrD,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;SAC/B,KAAK,CAAC,kCAAkC,CAAC;SACzC,QAAQ,CAAC,2FAA2F,CAAC;SACrG,QAAQ,CAAC,yCAAyC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACrF;SACA,SAAS,CAAC,QAAQ,CAAC,EAAE,CACpB,QAAQ;SACL,MAAM,CAAC,qCAAqC,EAAE,iBAAiB,CAAC;SAChE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC;SAC/B,KAAK,CAAC,kCAAkC,CAAC;SACzC,QAAQ,CAAC,2FAA2F,CAAC;SACrG,QAAQ,CAAC,yCAAyC,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CACrF;SACA,QAAQ,CAAC,+BAA+B,CAAC;SACzC,QAAQ,CAAC,0BAA0B,CAAC;SACpC,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,QAAQ,CAAC,qCAAqC,CAAC;SAC/C,QAAQ,CAAC,oBAAoB,CAAC;SAC9B,QAAQ,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;SAC1D,QAAQ,CAAC,yCAAyC,EAAE;QACnD,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;KACjE,CAAC;SACD,QAAQ,CAAC,0BAA0B,CAAC;SACpC,QAAQ,CACP;;;;;;;;;;;QAWE,CACH;SACA,aAAa,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,SAAS;QACT,WAAW;QACX,WAAW;QACX,GAAG;QACH,wBAAwB,EAAE,wBAAwB,aAAxB,wBAAwB,cAAxB,wBAAwB,GAAI,IAAI;KAC3D,CAAC,CAAA;IAEJ,IAAI,OAAO,KAAK,EAAE,EAAE;QAClB,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;KACxD;IAED,IAAI,UAAU,EAAE;QACd,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;KAC7E;IAED,IAAI,aAAa,EAAE;QACjB,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;KACxF;IAED,IAAI,MAAM,GAAG,CAAC,CAAA;IAEd,EAAE,CAAC,UAAU,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;IAErC,QAAQ,eAAe,CAAC,WAAW,EAAE,EAAE;QACrC,KAAK,MAAM;YACT,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAA;YAC3C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,UAAU,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAA;YAC/C,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,MAAM;YACT,EAAE,CAAC,UAAU,CAAC,0BAA0B,EAAE,KAAK,CAAC,CAAA;YAChD,EAAE,CAAC,UAAU,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;iBACvD;aACF;YACD,MAAK;QAEP,KAAK,UAAU;YACb,IAAI,oBAAoB,EAAE;gBACxB,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE;oBACtC,IAAI,MAAM,KAAK,CAAC,EAAE;wBAChB,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;qBACvD;yBAAM;wBACL,EAAE,CAAC,UAAU,CAAC,OAAO,GAAG,EAAE,EAAE,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAA;qBACvD;oBACD,EAAE,MAAM,CAAA;iBACT;aACF;;gBAAM,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;YAC5C,MAAK;KACR;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC,iBAAiB,EAAE,CAAA;IACtD,MAAM,KAAK,GAAG,QAAQ;SACnB,GAAG,CAAC,CAAC,GAAc,EAAE,GAAW,EAAE,EAAE;QACnC,MAAM,GAAG,GAAW,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,IAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAC9C,MAAM,QAAQ,GAAW,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,IAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;QAC7D,MAAM,SAAS,GAAW,GAAG,CAAC,SAAS,IAAI,CAAC,CAAA;QAC5C,MAAM,cAAc,GAAW,GAAG,CAAC,cAAc,IAAI,CAAC,CAAA;QACtD,MAAM,UAAU,GAAW,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC7D,MAAM,eAAe,GAAW,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAEzE,uCACK,GAAG,KACN,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,UAAU,EACjC,QAAQ,EAAE,QAAQ,GAAG,cAAc,GAAG,eAAe,IACtD;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,GAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,CAAA;IAE1C,MAAM,KAAK,GAAW,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAA;IACzC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC;AAhKD,sDAgKC;AAEM,KAAK,UAAU,mBAAmB,CAAC,SAAoB;IAC5D,IAAI,CAAC,SAAS,CAAC,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAC9D,IAAI,OAAO,GAAwB,SAAS,CAAC,OAAO,CAAA;IACpD,IAAI,CAAC,OAAO,EAAE;QACZ,SAAS,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE;YAC/D,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC,CAAA;QACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;KAC5B;IAED,MAAM,EAAE,cAAc,EAAE,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAA;IAE9D,IAAI,CAAC,qBAAqB,IAAI,CAAC,mBAAmB,IAAI,cAAc,IAAI,CAAC;QAAE,OAAO,KAAK,CAAA;IAEvF,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;IAC3B,MAAM,YAAY,GAAS,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,mBAAmB,CAAC,CAAC,CAAA;IACvF,MAAM,UAAU,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;IAEjD,OAAO,UAAU,GAAG,YAAY,CAAA;AAClC,CAAC;AApBD,kDAoBC;AAEM,KAAK,UAAU,mBAAmB,CAAC,WAAwB;IAChE,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,IAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAA;IAExE,IAAI,mBAAmB,GAAG,EAAE,CAAA;IAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC3C,IAAI,OAAO,GAAwB,WAAW,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;QACzD,IAAI,CAAC,OAAO,EAAE;YACZ,IAAI,SAAS,GAAc,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;gBACnF,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB,CAAC,CAAA;YACF,OAAO,GAAG,SAAS,CAAC,OAAO,CAAA;SAC5B;QAED,IAAI,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC,CAAC,CAAC,CAAA;QACvC,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAA;QAExC,IAAI,oBAAoB,IAAI,cAAc,EAAE;YAC1C,IAAI,IAAI,GAAS,IAAI,IAAI,EAAE,CAAA;YAC3B,cAAc,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAA;YAEzC,MAAM,aAAa,GAAS,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,oBAAoB,CAAC,CAAC,CAAA;YAE7G,IAAI,IAAI,GAAG,aAAa,EAAE;gBACxB,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;aAC5C;SACF;KACF;IAED,OAAO,mBAAmB,CAAA;AAC5B,CAAC;AA9BD,kDA8BC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.705",
+  "version": "4.3.723",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,28 +23,28 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.705",
-    "@things-factory/biz-base": "^4.3.705",
-    "@things-factory/document-template-base": "^4.3.705",
-    "@things-factory/id-rule-base": "^4.3.705",
-    "@things-factory/integration-accounting": "^4.3.705",
-    "@things-factory/integration-base": "^4.3.705",
-    "@things-factory/integration-lmd": "^4.3.705",
-    "@things-factory/integration-marketplace": "^4.3.705",
-    "@things-factory/integration-powrup": "^4.3.705",
-    "@things-factory/integration-sellercraft": "^4.3.705",
-    "@things-factory/integration-sftp": "^4.3.705",
-    "@things-factory/marketplace-base": "^4.3.705",
-    "@things-factory/notification": "^4.3.705",
-    "@things-factory/sales-base": "^4.3.705",
-    "@things-factory/setting-base": "^4.3.705",
-    "@things-factory/shell": "^4.3.705",
-    "@things-factory/transport-base": "^4.3.705",
-    "@things-factory/warehouse-base": "^4.3.705",
-    "@things-factory/worksheet-ui": "^4.3.705",
+    "@things-factory/auth-base": "^4.3.723",
+    "@things-factory/biz-base": "^4.3.723",
+    "@things-factory/document-template-base": "^4.3.723",
+    "@things-factory/id-rule-base": "^4.3.723",
+    "@things-factory/integration-accounting": "^4.3.723",
+    "@things-factory/integration-base": "^4.3.723",
+    "@things-factory/integration-lmd": "^4.3.723",
+    "@things-factory/integration-marketplace": "^4.3.723",
+    "@things-factory/integration-powrup": "^4.3.723",
+    "@things-factory/integration-sellercraft": "^4.3.723",
+    "@things-factory/integration-sftp": "^4.3.723",
+    "@things-factory/marketplace-base": "^4.3.723",
+    "@things-factory/notification": "^4.3.723",
+    "@things-factory/sales-base": "^4.3.723",
+    "@things-factory/setting-base": "^4.3.723",
+    "@things-factory/shell": "^4.3.723",
+    "@things-factory/transport-base": "^4.3.723",
+    "@things-factory/warehouse-base": "^4.3.723",
+    "@things-factory/worksheet-ui": "^4.3.723",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "37ae3b066444a1094389a59b38414e5c2b75db20"
+  "gitHead": "34bf57aa5628280fc483602659df898706e14638"
 }

package/server/controllers/render-fm-grn.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -136,13 +136,33 @@ 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 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)',
+          `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 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',
+          `(
+            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 }
         )
       }

package/server/utils/inventory-util.ts CHANGED Viewed

@@ -159,7 +159,18 @@ export async function inventoriesByStrategy(
     })
     .andWhere('"INV"."obsolete" = false')
     .andWhere(
-      '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'
+      `(
+        "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,