@things-factory/operato-hub 4.3.604 → 4.3.607

package/dist-server/graphql/resolvers/email/send-emails.js

@@ -216,6 +216,7 @@ async function processEmailCronJob(email, fromDate, toDate) {
         let modifiedContent = email.content.replace('{{companyName}}', bizplace.company.name);
         let modifiedSubject = email.subject.replace('{{warehouseName}}', email.domain.name);
         modifiedSubject = modifiedSubject.replace('{{reportDate}}', new Date().toLocaleDateString('en-GB'));
+        modifiedSubject = modifiedSubject.replace('{{companyName}}', bizplace.company.name);
         let res = await (0, email_base_1.sendEmailSes)({
             attachments,
             subject: modifiedSubject,

package/dist-server/graphql/resolvers/email/send-emails.js.map

@@ -1 +1 @@
-{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"send-emails.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/email/send-emails.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/reports/custom/posmy/custom-posmy-aging-report.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.customPosmyAgingReport = void 0;
+const biz_base_1 = require("@things-factory/biz-base");
+exports.customPosmyAgingReport = {
+    async customPosmyAgingReport(_, params, context) {
+        try {
+            const { tx, domain } = context.state;
+            // Fetch all bizplace filters from params
+            let bizplaceFilters = params.filters.find(data => data.name === 'bizplace');
+            if (!bizplaceFilters || bizplaceFilters.length === 0)
+                throw 'Invalid input: At least one Bizplace filter is required';
+            // Query the database for matching Bizplaces to ensure they exist.value)
+            const bizplaces = await tx.getRepository(biz_base_1.Bizplace).findByIds(bizplaceFilters.value);
+            if (!bizplaces || bizplaces.length === 0)
+                throw 'Invalid input: None of the provided Bizplaces were found';
+            // Create temporary table for report
+            const result = await tx.query(`
+        SELECT
+        *,
+        CASE
+          WHEN "age_month" BETWEEN 1 AND 3 THEN '1-3'
+          WHEN "age_month" BETWEEN 3 AND 6 THEN '4-6'
+          WHEN "age_month" BETWEEN 6 AND 9 THEN '7-9'
+          WHEN "age_month" BETWEEN 9 AND 12 THEN '10-12'
+          WHEN "age_month" BETWEEN 12 AND 15 THEN '13-15'
+          WHEN "age_month" BETWEEN 15 AND 18 THEN '16-18'
+          WHEN "age_month" BETWEEN 18 AND 21 THEN '19-21'
+          ELSE '0'
+        END AS "range",
+        CASE
+          WHEN "expiry_date" < now() THEN true
+          ELSE false
+        END AS "isExpired"
+        from(
+          select
+            p.sku as "sku", 
+            p.name as "product_name",
+            (new_invhist.qty-COALESCE(new_invhist.locked_qty,0)) as "qty",
+            new_invhist.batch_id as "batch_id",
+            (NOW()::DATE - new_invhist.created_at::DATE)::smallint AS "age_days",
+            EXTRACT(YEAR FROM age(NOW(), new_invhist.created_at)) * 12 + EXTRACT(MONTH FROM age(NOW(), new_invhist.created_at))::smallint AS "age_month",
+            new_invhist.created_at as "first_inbound_date" , l.name as "location",
+            CASE
+              WHEN l.type in('SHELF','STORAGE') THEN 'AVAILABLE' else l.type
+            END as "stock_status",
+            new_invhist.updated_at as "last_movement_time",
+            b.name as "company", coalesce(new_invhist.expiration_date,null) as "expiry_date"
+          from(
+            select
+              max(foo.created_at) as "created_at",
+              foo.id, foo.pallet_id, foo.batch_id, foo.carton_id, foo.updated_at, foo.product_id, foo.location_id, foo.qty, foo.locked_qty, foo.uom_value, foo.locked_uom_value, foo.bizplace_id, foo.expiration_date from(
+                select row_number() over(PARTITION by batch_id, id order by seq asc) as rn, *
+                from(
+                  select
+                    i.id , ih.created_at + interval '8 hours' as "created_at", ih.pallet_id, ih.batch_id, ih.carton_id, i.updated_at + interval '8 hours' as "updated_at", i.product_id, i.location_id, ih.seq , i.qty, i.locked_qty, i.uom_value, i.locked_uom_value , i.bizplace_id , i.expiration_date
+                  from inventory_histories ih
+                  inner join inventories i on i.id = ih.inventory_id
+                  where i.status not in('MISSING','TERMINATED')
+                  and i.domain_id = $1
+                  and i.bizplace_id = $2
+                  and (not ih.created_at >= now() - interval '30 minutes')
+                  order by DATE(ih.created_at) ASC, ih.created_at ASC
+                )temp_inventory_histories order by id, seq)foo where rn = 1
+            group by
+              foo.id , foo.pallet_id, foo.batch_id, foo.carton_id, foo.updated_at, foo.product_id,
+              foo.location_id, foo.qty, foo.locked_qty, foo.uom_value, foo.locked_uom_value, foo.bizplace_id, foo.expiration_date
+            order by
+              foo.id)new_invhist
+          inner join products p on new_invhist.product_id = p.id
+          inner join locations l on l.id = new_invhist.location_id
+          inner join bizplaces b on b.id = new_invhist.bizplace_id
+          group by
+            p.sku, p.name, new_invhist.batch_id, new_invhist.qty, new_invhist.locked_qty,
+            new_invhist.created_at, "age_days", "age_month", l.type,
+            l.name, new_invhist.updated_at, b.name, new_invhist.id , new_invhist.expiration_date
+        )odd
+        ORDER BY
+          odd."company", odd."batch_id", odd."age_month", DATE(odd."first_inbound_date") ASC, odd."first_inbound_date" ASC, odd."sku"
+        `, [domain.id, bizplaceFilters.value]);
+            // Function to calculate days & months until expiry
+            const calculateExpiryDuration = (expiryDate) => {
+                if (!expiryDate)
+                    return { expiryDays: null, expiryMonths: null };
+                const expiry = new Date(expiryDate);
+                const today = new Date();
+                const timeDiff = expiry.getTime() - today.getTime();
+                const expiryDays = Math.ceil(timeDiff / (1000 * 60 * 60 * 24)); // Convert ms to days
+                const expiryMonths = Math.floor(expiryDays / 30); // Approximate months
+                return { expiryDays, expiryMonths };
+            };
+            // Function to format timestamp as a readable string
+            const formatTimestamp = (timestamp) => new Date(timestamp).toLocaleString();
+            // Function to format expiry date (Only Date & Handle Null)
+            const formatExpiryDate = (expiryDate) => {
+                if (!expiryDate)
+                    return ''; // Return blank if null (for Excel)
+                return new Date(expiryDate).toISOString().split('T')[0]; // Extract YYYY-MM-DD
+            };
+            // Map detailed results
+            let items = result.map(itm => {
+                const { expiryDays, expiryMonths } = calculateExpiryDuration(itm.expiry_date);
+                return {
+                    productSku: itm.sku,
+                    productName: itm.product_name,
+                    qty: itm.qty,
+                    batchId: itm.batch_id,
+                    ageDays: itm.age_days,
+                    ageMonth: itm.age_month,
+                    firstInboundDate: formatTimestamp(itm.first_inbound_date),
+                    lastMovementTime: formatTimestamp(itm.last_movement_time),
+                    location: itm.location,
+                    stockStatus: itm.stock_status,
+                    company: itm.company,
+                    expiryDate: formatExpiryDate(itm.expiry_date),
+                    expiryDays,
+                    expiryMonths,
+                    range: itm.range,
+                    isExpired: itm.isExpired ? 'true' : 'false'
+                };
+            });
+            return {
+                items
+            };
+        }
+        catch (error) {
+            throw error;
+        }
+    }
+};
+//# sourceMappingURL=custom-posmy-aging-report.js.map

package/dist-server/graphql/resolvers/reports/custom/posmy/custom-posmy-aging-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-posmy-aging-report.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/reports/custom/posmy/custom-posmy-aging-report.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/reports/index.js

@@ -10,5 +10,6 @@ const asn_report_1 = require("./asn-report");
 const admiral_asn_report_1 = require("./admiral-asn-report");
 const receiving_report_1 = require("./receiving-report");
 const export_report_1 = require("./export-report");
-exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, inbound_order_details_report_1.inboundOrderDetailsReport), outbound_order_details_report_1.outboundOrderDetailsReport), shortage_report_1.shortageReport), custom_elccl_fn_dispatch_report_1.customElcclDispatchReport), aging_report_1.agingReport), asn_report_1.asnReport), admiral_asn_report_1.admiralAsnReport), custom_elccl_fn_dispatch_report_1.customElcclDispatchReport), receiving_report_1.receivingReport), export_report_1.exportReport);
+const custom_posmy_aging_report_1 = require("./custom/posmy/custom-posmy-aging-report");
+exports.Query = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, inbound_order_details_report_1.inboundOrderDetailsReport), outbound_order_details_report_1.outboundOrderDetailsReport), shortage_report_1.shortageReport), custom_elccl_fn_dispatch_report_1.customElcclDispatchReport), aging_report_1.agingReport), asn_report_1.asnReport), admiral_asn_report_1.admiralAsnReport), custom_elccl_fn_dispatch_report_1.customElcclDispatchReport), receiving_report_1.receivingReport), export_report_1.exportReport), custom_posmy_aging_report_1.customPosmyAgingReport);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/reports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/index.ts"],"names":[],"mappings":";;;AAAA,iFAA0E;AAC1E,mFAA4E;AAC5E,uDAAkD;AAClD,uFAA6E;AAC7E,iDAA4C;AAC5C,6CAAwC;AACxC,6DAAuD;AACvD,yDAAoD;AACpD,mDAA8C;AAEjC,QAAA,KAAK,mJACb,wDAAyB,GACzB,0DAA0B,GAC1B,gCAAc,GACd,2DAAyB,GACzB,0BAAW,GACX,sBAAS,GACT,qCAAgB,GAChB,2DAAyB,GACzB,kCAAe,GACf,4BAAY,EAChB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/index.ts"],"names":[],"mappings":";;;AAAA,iFAA0E;AAC1E,mFAA4E;AAC5E,uDAAkD;AAClD,uFAA6E;AAC7E,iDAA4C;AAC5C,6CAAwC;AACxC,6DAAuD;AACvD,yDAAoD;AACpD,mDAA8C;AAC9C,wFAAiF;AAEpE,QAAA,KAAK,iKACb,wDAAyB,GACzB,0DAA0B,GAC1B,gCAAc,GACd,2DAAyB,GACzB,0BAAW,GACX,sBAAS,GACT,qCAAgB,GAChB,2DAAyB,GACzB,kCAAe,GACf,4BAAY,GACZ,kDAAsB,EAC1B"}

package/dist-server/graphql/types/reports/custom/posmy/custom-posmy-aging-report-list.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomPosmyAgingReportList = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.CustomPosmyAgingReportList = (0, graphql_tag_1.default) `
+  type CustomPosmyAgingReportList {
+    items: [CustomPosmyAgingReport]
+  }
+`;
+//# sourceMappingURL=custom-posmy-aging-report-list.js.map

package/dist-server/graphql/types/reports/custom/posmy/custom-posmy-aging-report-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-posmy-aging-report-list.js","sourceRoot":"","sources":["../../../../../../server/graphql/types/reports/custom/posmy/custom-posmy-aging-report-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,0BAA0B,GAAG,IAAA,qBAAG,EAAA;;;;CAI5C,CAAA"}

package/dist-server/graphql/types/reports/custom/posmy/custom-posmy-aging-report.js

@@ -0,0 +1,28 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CustomPosmyAgingReport = void 0;
+const graphql_tag_1 = __importDefault(require("graphql-tag"));
+exports.CustomPosmyAgingReport = (0, graphql_tag_1.default) `
+  type CustomPosmyAgingReport {
+    productSku: String
+    productName: String
+    qty: Int
+    batchId: String
+    ageDays: Int
+    ageMonth: Int
+    firstInboundDate: String
+    lastMovementTime: String
+    location: String
+    stockStatus: String
+    company: String
+    expiryDate: String
+    expiryDays: Int
+    expiryMonths: Int
+    range: String
+    isExpired: String
+  }
+`;
+//# sourceMappingURL=custom-posmy-aging-report.js.map

package/dist-server/graphql/types/reports/custom/posmy/custom-posmy-aging-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-posmy-aging-report.js","sourceRoot":"","sources":["../../../../../../server/graphql/types/reports/custom/posmy/custom-posmy-aging-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;CAmBxC,CAAA"}

package/dist-server/graphql/types/reports/index.js

@@ -19,6 +19,8 @@ const receiving_report_1 = require("./receiving-report");
 const receiving_report_list_1 = require("./receiving-report-list");
 const export_report_1 = require("./export-report");
 const export_report_list_1 = require("./export-report-list");
+const custom_posmy_aging_report_1 = require("./custom/posmy/custom-posmy-aging-report");
+const custom_posmy_aging_report_list_1 = require("./custom/posmy/custom-posmy-aging-report-list");
 exports.Query = `
   inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
   outboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): OutboundOrderDetailsReportList @transaction
@@ -29,6 +31,7 @@ exports.Query = `
   admiralAsnReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): AdmiralAsnReportList @transaction
   receivingReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ReceivingReportList @transaction
   exportReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ExportReportList @transaction
+  customPosmyAgingReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): CustomPosmyAgingReportList @transaction
 `;
 exports.Types = [
     inbound_order_details_report_1.InboundOrderDetailsReport,
@@ -48,6 +51,8 @@ exports.Types = [
     admiral_asn_report_1.AdmiralAsnReport,
     admiral_asn_report_list_1.AdmiralAsnReportList,
     export_report_1.ExportReport,
-    export_report_list_1.ExportReportList
+    export_report_list_1.ExportReportList,
+    custom_posmy_aging_report_1.CustomPosmyAgingReport,
+    custom_posmy_aging_report_list_1.CustomPosmyAgingReportList
 ];
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/types/reports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/index.ts"],"names":[],"mappings":";;;AAAA,iFAA0E;AAC1E,2FAAmF;AACnF,mFAA4E;AAC5E,6FAAqF;AACrF,iEAA2D;AAC3D,iEAAuD;AACvD,uFAA6E;AAC7E,iGAAsF;AACtF,iDAA4C;AAC5C,2DAAqD;AACrD,6CAAwC;AACxC,uDAAiD;AACjD,6DAAuD;AACvD,uEAAgE;AAChE,yDAAoD;AACpD,mEAA6D;AAC7D,mDAA8C;AAC9C,6DAAuD;AAE1C,QAAA,KAAK,GAAG;;;;;;;;;;CAUpB,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,wDAAyB;IACzB,iEAA6B;IAC7B,0DAA0B;IAC1B,mEAA8B;IAC9B,qCAAc;IACd,yCAAkB;IAClB,2DAAyB;IACzB,oEAA6B;IAC7B,kCAAe;IACf,2CAAmB;IACnB,0BAAW;IACX,mCAAe;IACf,sBAAS;IACT,+BAAa;IACb,qCAAgB;IAChB,8CAAoB;IACpB,4BAAY;IACZ,qCAAgB;CACjB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/reports/index.ts"],"names":[],"mappings":";;;AAAA,iFAA0E;AAC1E,2FAAmF;AACnF,mFAA4E;AAC5E,6FAAqF;AACrF,iEAA2D;AAC3D,iEAAuD;AACvD,uFAA6E;AAC7E,iGAAsF;AACtF,iDAA4C;AAC5C,2DAAqD;AACrD,6CAAwC;AACxC,uDAAiD;AACjD,6DAAuD;AACvD,uEAAgE;AAChE,yDAAoD;AACpD,mEAA6D;AAC7D,mDAA8C;AAC9C,6DAAuD;AACvD,wFAAiF;AACjF,kGAA0F;AAE7E,QAAA,KAAK,GAAG;;;;;;;;;;;CAWpB,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,wDAAyB;IACzB,iEAA6B;IAC7B,0DAA0B;IAC1B,mEAA8B;IAC9B,qCAAc;IACd,yCAAkB;IAClB,2DAAyB;IACzB,oEAA6B;IAC7B,kCAAe;IACf,2CAAmB;IACnB,0BAAW;IACX,mCAAe;IACf,sBAAS;IACT,+BAAa;IACb,qCAAgB;IAChB,8CAAoB;IACpB,4BAAY;IACZ,qCAAgB;IAChB,kDAAsB;IACtB,2DAA0B;CAC3B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-hub",
-  "version": "4.3.604",
+  "version": "4.3.607",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -90,9 +90,9 @@
     "@things-factory/more-ui": "^4.3.591",
     "@things-factory/notification": "^4.3.591",
     "@things-factory/pdf": "^4.3.591",
-    "@things-factory/product-ui": "^4.3.598",
+    "@things-factory/product-ui": "^4.3.607",
     "@things-factory/resource-ui": "^4.3.591",
-    "@things-factory/sales-base": "^4.3.603",
+    "@things-factory/sales-base": "^4.3.607",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
@@ -109,7 +109,7 @@
     "@things-factory/system-ui": "^4.3.591",
     "@things-factory/transport-base": "^4.3.595",
     "@things-factory/warehouse-base": "^4.3.603",
-    "@things-factory/worksheet-base": "^4.3.603",
+    "@things-factory/worksheet-base": "^4.3.607",
     "cron-parser": "^4.7.0",
     "koa2-swagger-ui": "^5.0.2",
     "swagger-jsdoc": "^5.0.0",
@@ -122,5 +122,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "dd4804c72f1c5c43955c26e0562debcb9fba93d1"
+  "gitHead": "897591abbc6716566a0f675b53fe5bc9d1025e76"
 }

package/server/graphql/resolvers/email/send-emails.ts

@@ -221,6 +221,7 @@ async function processEmailCronJob(email, fromDate, toDate) {
     let modifiedContent = email.content.replace('{{companyName}}', bizplace.company.name)
     let modifiedSubject = email.subject.replace('{{warehouseName}}', email.domain.name)
     modifiedSubject = modifiedSubject.replace('{{reportDate}}', new Date().toLocaleDateString('en-GB'))
+    modifiedSubject = modifiedSubject.replace('{{companyName}}', bizplace.company.name)
 
     let res = await sendEmailSes({
       attachments,

package/server/graphql/resolvers/reports/custom/posmy/custom-posmy-aging-report.ts

@@ -0,0 +1,144 @@
+import { EntityManager } from 'typeorm'
+import { Domain } from '@things-factory/shell'
+import { Bizplace } from '@things-factory/biz-base'
+import { ListParam } from '@things-factory/shell'
+
+export const customPosmyAgingReport = {
+  async customPosmyAgingReport(_: any, params: ListParam, context: any) {
+    try {
+      const { tx, domain }: { tx: EntityManager; domain: Domain } = context.state
+
+      // Fetch all bizplace filters from params
+      let bizplaceFilters = params.filters.find(data => data.name === 'bizplace')
+
+      if (!bizplaceFilters || bizplaceFilters.length === 0)
+        throw 'Invalid input: At least one Bizplace filter is required'
+
+      // Query the database for matching Bizplaces to ensure they exist.value)
+      const bizplaces: Bizplace[] = await tx.getRepository(Bizplace).findByIds(bizplaceFilters.value)
+
+      if (!bizplaces || bizplaces.length === 0) throw 'Invalid input: None of the provided Bizplaces were found'
+
+      // Create temporary table for report
+      const result: any = await tx.query(
+        `
+        SELECT
+        *,
+        CASE
+          WHEN "age_month" BETWEEN 1 AND 3 THEN '1-3'
+          WHEN "age_month" BETWEEN 3 AND 6 THEN '4-6'
+          WHEN "age_month" BETWEEN 6 AND 9 THEN '7-9'
+          WHEN "age_month" BETWEEN 9 AND 12 THEN '10-12'
+          WHEN "age_month" BETWEEN 12 AND 15 THEN '13-15'
+          WHEN "age_month" BETWEEN 15 AND 18 THEN '16-18'
+          WHEN "age_month" BETWEEN 18 AND 21 THEN '19-21'
+          ELSE '0'
+        END AS "range",
+        CASE
+          WHEN "expiry_date" < now() THEN true
+          ELSE false
+        END AS "isExpired"
+        from(
+          select
+            p.sku as "sku", 
+            p.name as "product_name",
+            (new_invhist.qty-COALESCE(new_invhist.locked_qty,0)) as "qty",
+            new_invhist.batch_id as "batch_id",
+            (NOW()::DATE - new_invhist.created_at::DATE)::smallint AS "age_days",
+            EXTRACT(YEAR FROM age(NOW(), new_invhist.created_at)) * 12 + EXTRACT(MONTH FROM age(NOW(), new_invhist.created_at))::smallint AS "age_month",
+            new_invhist.created_at as "first_inbound_date" , l.name as "location",
+            CASE
+              WHEN l.type in('SHELF','STORAGE') THEN 'AVAILABLE' else l.type
+            END as "stock_status",
+            new_invhist.updated_at as "last_movement_time",
+            b.name as "company", coalesce(new_invhist.expiration_date,null) as "expiry_date"
+          from(
+            select
+              max(foo.created_at) as "created_at",
+              foo.id, foo.pallet_id, foo.batch_id, foo.carton_id, foo.updated_at, foo.product_id, foo.location_id, foo.qty, foo.locked_qty, foo.uom_value, foo.locked_uom_value, foo.bizplace_id, foo.expiration_date from(
+                select row_number() over(PARTITION by batch_id, id order by seq asc) as rn, *
+                from(
+                  select
+                    i.id , ih.created_at + interval '8 hours' as "created_at", ih.pallet_id, ih.batch_id, ih.carton_id, i.updated_at + interval '8 hours' as "updated_at", i.product_id, i.location_id, ih.seq , i.qty, i.locked_qty, i.uom_value, i.locked_uom_value , i.bizplace_id , i.expiration_date
+                  from inventory_histories ih
+                  inner join inventories i on i.id = ih.inventory_id
+                  where i.status not in('MISSING','TERMINATED')
+                  and i.domain_id = $1
+                  and i.bizplace_id = $2
+                  and (not ih.created_at >= now() - interval '30 minutes')
+                  order by DATE(ih.created_at) ASC, ih.created_at ASC
+                )temp_inventory_histories order by id, seq)foo where rn = 1
+            group by
+              foo.id , foo.pallet_id, foo.batch_id, foo.carton_id, foo.updated_at, foo.product_id,
+              foo.location_id, foo.qty, foo.locked_qty, foo.uom_value, foo.locked_uom_value, foo.bizplace_id, foo.expiration_date
+            order by
+              foo.id)new_invhist
+          inner join products p on new_invhist.product_id = p.id
+          inner join locations l on l.id = new_invhist.location_id
+          inner join bizplaces b on b.id = new_invhist.bizplace_id
+          group by
+            p.sku, p.name, new_invhist.batch_id, new_invhist.qty, new_invhist.locked_qty,
+            new_invhist.created_at, "age_days", "age_month", l.type,
+            l.name, new_invhist.updated_at, b.name, new_invhist.id , new_invhist.expiration_date
+        )odd
+        ORDER BY
+          odd."company", odd."batch_id", odd."age_month", DATE(odd."first_inbound_date") ASC, odd."first_inbound_date" ASC, odd."sku"
+        `,
+        [domain.id, bizplaceFilters.value]
+      )
+
+      // Function to calculate days & months until expiry
+      const calculateExpiryDuration = (expiryDate: string | null) => {
+        if (!expiryDate) return { expiryDays: null, expiryMonths: null }
+
+        const expiry = new Date(expiryDate)
+        const today = new Date()
+        const timeDiff = expiry.getTime() - today.getTime()
+
+        const expiryDays = Math.ceil(timeDiff / (1000 * 60 * 60 * 24)) // Convert ms to days
+        const expiryMonths = Math.floor(expiryDays / 30) // Approximate months
+
+        return { expiryDays, expiryMonths }
+      }
+
+      // Function to format timestamp as a readable string
+      const formatTimestamp = (timestamp: string) => new Date(timestamp).toLocaleString()
+
+      // Function to format expiry date (Only Date & Handle Null)
+      const formatExpiryDate = (expiryDate: string | null) => {
+        if (!expiryDate) return '' // Return blank if null (for Excel)
+        return new Date(expiryDate).toISOString().split('T')[0] // Extract YYYY-MM-DD
+      }
+
+      // Map detailed results
+      let items = result.map(itm => {
+        const { expiryDays, expiryMonths } = calculateExpiryDuration(itm.expiry_date)
+
+        return {
+          productSku: itm.sku,
+          productName: itm.product_name,
+          qty: itm.qty,
+          batchId: itm.batch_id,
+          ageDays: itm.age_days,
+          ageMonth: itm.age_month,
+          firstInboundDate: formatTimestamp(itm.first_inbound_date),
+          lastMovementTime: formatTimestamp(itm.last_movement_time),
+          location: itm.location,
+          stockStatus: itm.stock_status,
+          company: itm.company,
+          expiryDate: formatExpiryDate(itm.expiry_date),
+          expiryDays,
+          expiryMonths,
+          range: itm.range,
+          isExpired: itm.isExpired ? 'true' : 'false'
+        }
+      })
+
+      return {
+        items
+      }
+    } catch (error) {
+      throw error
+    }
+  }
+}

package/server/graphql/resolvers/reports/index.ts

@@ -7,6 +7,7 @@ import { asnReport } from './asn-report'
 import { admiralAsnReport } from './admiral-asn-report'
 import { receivingReport } from './receiving-report'
 import { exportReport } from './export-report'
+import { customPosmyAgingReport } from './custom/posmy/custom-posmy-aging-report'
 
 export const Query = {
   ...inboundOrderDetailsReport,
@@ -18,5 +19,6 @@ export const Query = {
   ...admiralAsnReport,
   ...customElcclDispatchReport,
   ...receivingReport,
-  ...exportReport
+  ...exportReport,
+  ...customPosmyAgingReport
 }

package/server/graphql/types/reports/custom/posmy/custom-posmy-aging-report-list.ts

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const CustomPosmyAgingReportList = gql`
+  type CustomPosmyAgingReportList {
+    items: [CustomPosmyAgingReport]
+  }
+`

package/server/graphql/types/reports/custom/posmy/custom-posmy-aging-report.ts

@@ -0,0 +1,22 @@
+import gql from 'graphql-tag'
+
+export const CustomPosmyAgingReport = gql`
+  type CustomPosmyAgingReport {
+    productSku: String
+    productName: String
+    qty: Int
+    batchId: String
+    ageDays: Int
+    ageMonth: Int
+    firstInboundDate: String
+    lastMovementTime: String
+    location: String
+    stockStatus: String
+    company: String
+    expiryDate: String
+    expiryDays: Int
+    expiryMonths: Int
+    range: String
+    isExpired: String
+  }
+`

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

@@ -16,6 +16,8 @@ import { ReceivingReport } from './receiving-report'
 import { ReceivingReportList } from './receiving-report-list'
 import { ExportReport } from './export-report'
 import { ExportReportList } from './export-report-list'
+import { CustomPosmyAgingReport } from './custom/posmy/custom-posmy-aging-report'
+import { CustomPosmyAgingReportList } from './custom/posmy/custom-posmy-aging-report-list'
 
 export const Query = `
   inboundOrderDetailsReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): InboundOrderDetailsReportList @transaction
@@ -27,6 +29,7 @@ export const Query = `
   admiralAsnReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): AdmiralAsnReportList @transaction
   receivingReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ReceivingReportList @transaction
   exportReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): ExportReportList @transaction
+  customPosmyAgingReport(filters: [Filter!], pagination: Pagination, sortings: [Sorting!]): CustomPosmyAgingReportList @transaction
 `
 
 export const Types = [
@@ -47,5 +50,7 @@ export const Types = [
   AdmiralAsnReport,
   AdmiralAsnReportList,
   ExportReport,
-  ExportReportList
+  ExportReportList,
+  CustomPosmyAgingReport,
+  CustomPosmyAgingReportList
 ]