@things-factory/operato-wms 4.3.669 → 4.3.671

package/client/pages/bulk-operation/bulk-operation.js

@@ -221,6 +221,7 @@ class BulkOperation extends localize(i18next)(PageView) {
         state: '',
         country: '',
         phone1: '',
+        batchId: '',
         sku: '',
         packingType: '',
         packingSize: 0,
@@ -234,7 +235,13 @@ class BulkOperation extends localize(i18next)(PageView) {
         billingPostalCode: '',
         billingCountry: '',
         billingState: '',
-        billingCity: ''
+        billingCity: '',
+        expirationDate:
+          new Date().getDate().toString().padStart(2, '0') +
+          '/' +
+          (new Date().getMonth() + 1).toString().padStart(2, '0') +
+          '/' +
+          new Date().getFullYear()
       }
     ]
   }
@@ -580,6 +587,8 @@ class BulkOperation extends localize(i18next)(PageView) {
               city: String(record.city || ''),
               state: String(record.state || ''),
               country: String(record.country || ''),
+              batchId: String(record.batchId || ''),
+              cartonId: String(record.cartonId || ''),
               sku: String(record.sku || ''),
               productId: String(record.productId || ''),
               productDetailId: String(record.productDetailId || ''),
@@ -598,7 +607,10 @@ class BulkOperation extends localize(i18next)(PageView) {
               billingPostalCode: String(record.billingPostalCode || ''),
               billingCountry: String(record.billingCountry || ''),
               billingState: String(record.billingState || ''),
-              billingCity: String(record.billingCity || '')
+              billingCity: String(record.billingCity || ''),
+              expirationDate: Number.isInteger(record.expirationDate)
+                ? record.expirationDate.toString()
+                : record.expirationDate
             }
           })}
           .bizplaceId=${this._roBizplaceId}

package/client/pages/bulk-operation/validate-ro-popup.js

@@ -238,7 +238,6 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.country'),
           width: 150
         },
-        ,
         {
           type: 'string',
           name: 'sku',
@@ -257,6 +256,18 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.batch_no'),
           width: 150
         },
+        {
+          type: 'string',
+          name: 'cartonId',
+          header: i18next.t('field.carton_id'),
+          width: 150
+        },
+        {
+          type: 'string',
+          name: 'expirationDate',
+          header: i18next.t('field.expiry_date'),
+          width: 150
+        },
         {
           type: 'float',
           name: 'releaseQty',
@@ -375,6 +386,8 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
             productId
             productInfo
             batchId
+            expirationDate
+            cartonId
             packingType
             packingSize
             uom
@@ -442,7 +455,10 @@ class ValidateRoPopup extends localize(i18next)(LitElement) {
               releaseQty: x.releaseQty,
               postalCode: String(x.postalCode),
               phone1: String(x.phone1),
-              exportOption: false
+              exportOption: false,
+              expirationDate: x?.expirationDate ? x.expirationDate : null,
+              batchId: x?.batchId ? x.batchId : null,
+              cartonId: x?.cartonId ? x.cartonId : null
             }
           }),
           bizplaceId: this.bizplaceId

package/config.development.js

@@ -4,8 +4,15 @@ module.exports = {
   useVirtualHostBasedDomain: false,
   fallbackRoute: '/',
   subdomainOffset: 2,
-  port: 4444,
+  port: 4000,
   inspect: '9330',
+  storage: {
+    type: 's3',
+    accessKeyId: 'AKIAUQEOPWEJHCE4MTH4',
+    secretAccessKey: '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',
+    bucketName: 'opa-one',
+    region: 'ap-southeast-1'
+  },
   ormconfig: {
     name: 'default',
     type: 'postgres',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-wms",
-  "version": "4.3.669",
+  "version": "4.3.671",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -62,53 +62,53 @@
     "@operato/scene-tab": "^0.1.8",
     "@operato/scene-table": "^0.1.8",
     "@operato/scene-wheel-sorter": "^0.1.8",
-    "@things-factory/apptool-ui": "^4.3.591",
-    "@things-factory/attachment-ui": "^4.3.591",
-    "@things-factory/auth-ui": "^4.3.591",
-    "@things-factory/barcode-ui": "^4.3.612",
-    "@things-factory/biz-ui": "^4.3.660",
-    "@things-factory/board-service": "^4.3.591",
-    "@things-factory/board-ui": "^4.3.642",
-    "@things-factory/code-ui": "^4.3.642",
-    "@things-factory/context-ui": "^4.3.591",
-    "@things-factory/export-ui": "^4.3.591",
-    "@things-factory/export-ui-csv": "^4.3.591",
-    "@things-factory/export-ui-excel": "^4.3.591",
-    "@things-factory/fav-base": "^4.3.591",
-    "@things-factory/form-ui": "^4.3.591",
-    "@things-factory/geography": "^4.3.617",
-    "@things-factory/grist-ui": "^4.3.642",
-    "@things-factory/help": "^4.3.591",
-    "@things-factory/i18n-base": "^4.3.591",
-    "@things-factory/id-rule-base": "^4.3.642",
-    "@things-factory/import-ui": "^4.3.660",
-    "@things-factory/import-ui-excel": "^4.3.660",
-    "@things-factory/menu-ui": "^4.3.642",
-    "@things-factory/more-ui": "^4.3.591",
-    "@things-factory/notification": "^4.3.609",
+    "@things-factory/apptool-ui": "^4.3.671",
+    "@things-factory/attachment-ui": "^4.3.671",
+    "@things-factory/auth-ui": "^4.3.671",
+    "@things-factory/barcode-ui": "^4.3.671",
+    "@things-factory/biz-ui": "^4.3.671",
+    "@things-factory/board-service": "^4.3.671",
+    "@things-factory/board-ui": "^4.3.671",
+    "@things-factory/code-ui": "^4.3.671",
+    "@things-factory/context-ui": "^4.3.671",
+    "@things-factory/export-ui": "^4.3.671",
+    "@things-factory/export-ui-csv": "^4.3.671",
+    "@things-factory/export-ui-excel": "^4.3.671",
+    "@things-factory/fav-base": "^4.3.671",
+    "@things-factory/form-ui": "^4.3.671",
+    "@things-factory/geography": "^4.3.671",
+    "@things-factory/grist-ui": "^4.3.671",
+    "@things-factory/help": "^4.3.671",
+    "@things-factory/i18n-base": "^4.3.671",
+    "@things-factory/id-rule-base": "^4.3.671",
+    "@things-factory/import-ui": "^4.3.671",
+    "@things-factory/import-ui-excel": "^4.3.671",
+    "@things-factory/menu-ui": "^4.3.671",
+    "@things-factory/more-ui": "^4.3.671",
+    "@things-factory/notification": "^4.3.671",
     "@things-factory/pdf": "^4.3.591",
-    "@things-factory/print-proxy-service": "^4.3.591",
-    "@things-factory/print-ui": "^4.3.591",
-    "@things-factory/product-base": "^4.3.660",
-    "@things-factory/resource-ui": "^4.3.660",
-    "@things-factory/sales-ui": "^4.3.669",
+    "@things-factory/print-proxy-service": "^4.3.671",
+    "@things-factory/print-ui": "^4.3.671",
+    "@things-factory/product-base": "^4.3.671",
+    "@things-factory/resource-ui": "^4.3.671",
+    "@things-factory/sales-ui": "^4.3.671",
     "@things-factory/scene-data-transform": "^4.3.591",
     "@things-factory/scene-excel": "^4.3.591",
     "@things-factory/scene-firebase": "^4.3.591",
     "@things-factory/scene-form": "^4.3.591",
     "@things-factory/scene-google-map": "^4.3.591",
     "@things-factory/scene-graphql": "^4.3.591",
-    "@things-factory/scene-label": "^4.3.612",
+    "@things-factory/scene-label": "^4.3.671",
     "@things-factory/scene-marker": "^4.3.591",
     "@things-factory/scene-mqtt": "^4.3.591",
     "@things-factory/scene-restful": "^4.3.591",
     "@things-factory/scene-visualizer": "^4.3.591",
-    "@things-factory/setting-ui": "^4.3.642",
-    "@things-factory/system-ui": "^4.3.591",
-    "@things-factory/transport-base": "^4.3.631",
-    "@things-factory/tutorial-ui": "^4.3.591",
-    "@things-factory/warehouse-base": "^4.3.669",
-    "@things-factory/worksheet-base": "^4.3.669"
+    "@things-factory/setting-ui": "^4.3.671",
+    "@things-factory/system-ui": "^4.3.671",
+    "@things-factory/transport-base": "^4.3.671",
+    "@things-factory/tutorial-ui": "^4.3.671",
+    "@things-factory/warehouse-base": "^4.3.671",
+    "@things-factory/worksheet-base": "^4.3.671"
   },
   "devDependencies": {
     "@things-factory/builder": "^4.3.591",
@@ -117,5 +117,5 @@
     "cypress-localstorage-commands": "^1.6.1",
     "eslint-plugin-cypress": "^2.12.1"
   },
-  "gitHead": "c13a564c8b4cbf6b8e92b31fd933590f013cbccb"
+  "gitHead": "ef524cb207378186ec71917d9a8546363d4300b2"
 }

package/dist-server/graphql/index.js

@@ -1,33 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.schema = void 0;
-const typeDefs = __importStar(require("./types"));
-const resolvers = __importStar(require("./resolvers"));
-exports.schema = {
-    typeDefs,
-    resolvers
-};
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/graphql/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAmC;AACnC,uDAAwC;AAE3B,QAAA,MAAM,GAAG;IACpB,QAAQ;IACR,SAAS;CACV,CAAA"}

package/dist-server/graphql/resolvers/board-setting/board-settings.js

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.boardSettingsResolver = void 0;
-const typeorm_1 = require("typeorm");
-const auth_base_1 = require("@things-factory/auth-base");
-const board_service_1 = require("@things-factory/board-service");
-const setting_base_1 = require("@things-factory/setting-base");
-const opa_app_setting_constants_1 = require("../../../opa-app-setting-constants");
-exports.boardSettingsResolver = {
-    async boardSettings(_, params, context) {
-        const { domain } = context.state;
-        /***********************************************************************************
-         * Temporary solution for dashboard user type
-         ***********************************************************************************/
-        const user = await (0, typeorm_1.getRepository)(auth_base_1.User)
-            .createQueryBuilder('USER')
-            .leftJoinAndSelect('USER.roles', 'ROLES')
-            .leftJoinAndSelect('ROLES.domain', 'ROLES_DOMAIN')
-            .where('USER.id = :userId', { userId: context.state.user.id })
-            .andWhere('ROLES_DOMAIN.id = :domainId', { domainId: domain.id })
-            .getOne();
-        const userType = user.roles.filter(role => role.description)[0].description;
-        /**********************************************************************************/
-        const HOME_BOARD = `${opa_app_setting_constants_1.HOME_DASHBOARD_PREFIX}:${userType}`;
-        // const HOME_BOARD = `${HOME_DASHBOARD_PREFIX}:${context.state.user.userType}`
-        const queryBuilder = (0, typeorm_1.getRepository)(setting_base_1.Setting).createQueryBuilder();
-        const names = [
-            opa_app_setting_constants_1.LOCATION_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.PRODUCT_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.PALLET_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.ITEM_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.REUSABLE_PALLET_LABEL_SETTING_KEY,
-            HOME_BOARD,
-            opa_app_setting_constants_1.CARTON_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.CARTON_LABEL_BY_SKU_SETTING_KEY,
-            opa_app_setting_constants_1.INTENALIZED_AWB_SETTING_KEY,
-            opa_app_setting_constants_1.ROUTE_LABEL_SETTING_KEY,
-            opa_app_setting_constants_1.TOTE_LABEL_SETTING_KEY
-        ];
-        var qb = queryBuilder
-            // .innerJoin(Board, 'Board', 'Board.id = CAST(Setting.value AS uuid)')
-            .innerJoin(board_service_1.Board, 'Board', 'Setting.value = CAST(Board.id AS char(36))')
-            // .innerJoin(Board, 'Board', 'Board.id = Setting.value')
-            .select([
-            'Setting.id as id',
-            'Setting.name as name',
-            'Setting.value as value',
-            'Board.id as boardId',
-            'Board.name as boardName',
-            'Board.description as boardDescription',
-            'Board.thumbnail as boardThumbnail'
-        ])
-            .where('Setting.domain_id = :domain', { domain: context.state.domain.id });
-        if (names && names.length)
-            qb.andWhere('Setting.name IN (:...names)', { names });
-        var boardSettingList = await qb.getRawMany();
-        return boardSettingList.map(boardSetting => {
-            var setting = {
-                board: {}
-            };
-            for (let key in boardSetting) {
-                if (key.includes('board')) {
-                    let originKey = key;
-                    key = key.replace('board', '').toLowerCase();
-                    setting.board[key] = boardSetting[originKey];
-                }
-                else {
-                    setting[key] = boardSetting[key];
-                }
-            }
-            if (setting.name.indexOf(opa_app_setting_constants_1.HOME_DASHBOARD_PREFIX) == 0) {
-                setting.name = opa_app_setting_constants_1.HOME_DASHBOARD_PREFIX;
-            }
-            return setting;
-        });
-    }
-};
-//# sourceMappingURL=board-settings.js.map

package/dist-server/graphql/resolvers/board-setting/board-settings.js.map

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

package/dist-server/graphql/resolvers/board-setting/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Query = void 0;
-const board_settings_1 = require("./board-settings");
-exports.Query = Object.assign({}, board_settings_1.boardSettingsResolver);
-//# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/board-setting/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/board-setting/index.ts"],"names":[],"mappings":";;;AAAA,qDAAwD;AAE3C,QAAA,KAAK,qBACb,sCAAqB,EACzB"}

package/dist-server/graphql/resolvers/custom/elccl/elccl-daily-collection-report.js

@@ -1,87 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.elcclDailyCollectionReport = void 0;
-const biz_base_1 = require("@things-factory/biz-base");
-const typeorm_1 = require("typeorm");
-exports.elcclDailyCollectionReport = {
-    async elcclDailyCollectionReport(_, params, context) {
-        try {
-            const { tx } = context.state;
-            let bizplaceQuery = '';
-            if (params.filters.find((filter) => filter.name === 'bizplace')) {
-                const bizplace = await (0, typeorm_1.getRepository)(biz_base_1.Bizplace).findOne({
-                    id: params.filters.find(data => data.name === 'bizplace').value
-                });
-                bizplaceQuery = "AND rg.bizplace_id = '" + bizplace.id + "'";
-            }
-            let fromDate = params.filters.find(data => data.name === 'fromDate');
-            let toDate = params.filters.find(data => data.name === 'toDate');
-            let arrivalNotice = params.filters.find(data => data.name === 'arrivalNotice');
-            let tzoffset = params.filters.find(data => data.name === 'tzoffset').value + ' seconds';
-            if (!fromDate || !toDate)
-                throw 'Invalid input';
-            let arrivalNoticeQuery = '';
-            if (arrivalNotice) {
-                arrivalNoticeQuery =
-                    'AND arrival_notice_name ILIKE ANY(ARRAY[' +
-                        arrivalNotice.value
-                            .split(',')
-                            .map(an => {
-                            return "'%" + an.trim().replace(/'/g, "''") + "%'";
-                        })
-                            .join(',') +
-                        '])';
-            }
-            const result = await tx.query(`
-        with src as (
-          select ar.name as release_good_name, COALESCE(ar.name, 'MIGRATE') as arrival_notice_name, bz.name as bizplace_name, 
-          ws.ended_at::date, delord.own_collection, delord.name as delivery_order_name, inv.pallet_id, inv.batch_id
-          from release_goods rg
-          inner join bizplaces bz on bz.id = rg.bizplace_id
-          inner join worksheets ws on ws.release_good_id = rg.id and ws.type = 'LOADING'
-          inner join order_inventories oi on oi.release_good_id = rg.id
-          inner join inventories inv on inv.id = oi.inventory_id
-          inner join delivery_orders delord on delord.id = oi.delivery_order_id 
-          left join order_inventories inbound_oi on inbound_oi.inventory_id = inv.id and inbound_oi.type = 'ARRIVAL_NOTICE'
-          left join arrival_notices ar on ar.id = inbound_oi.arrival_notice_id
-          where rg.domain_id = $1
-          and ws.ended_at >= $2::timestamp + $4::interval
-          and ws.ended_at <= $3::timestamp + $4::interval
-          ${bizplaceQuery}
-        )
-        select bizplace_name, arrival_notice_name, ended_at, batch_id, 
-        trim(trailing ', ' from self_collect) as self_collect, trim(trailing ', ' from delivery) as delivery,
-          trim(trailing ', ' from self_collect_summary) as self_collect_summary, trim(trailing ', ' from delivery_summary) as delivery_summary,
-          total_self_collect, total_delivery
-          from(
-            select bizplace_name, arrival_notice_name, ended_at, batch_id,
-            string_agg(self_collect, '') as self_collect,
-            string_agg(delivery, '') delivery,
-            string_agg(self_collect_summary, '') as self_collect_summary,
-            string_agg(delivery_summary, '') delivery_summary,
-            COUNT(case when own_collection = true then 1 end) as total_self_collect,
-            COUNT(case when own_collection = false then 1 end) as total_delivery
-            from (
-              select arrival_notice_name, delivery_order_name, bizplace_name, ended_at::varchar, own_collection, batch_id,
-                case when own_collection = 'true' then concat(delivery_order_name, ' (', string_agg(pallet_id, ', ' ORDER BY pallet_id), '), ') else '' end as self_collect,
-                case when own_collection = 'false' then concat(delivery_order_name, ' (', string_agg(pallet_id, ', ' ORDER BY pallet_id), '), ') else '' end as delivery,
-                case when own_collection = 'true' then concat(delivery_order_name, ' (', count(*), '), ') else '' end as self_collect_summary,
-                case when own_collection = 'false' then concat(delivery_order_name, ' (', count(*), '), ') else '' end as delivery_summary
-              from src
-              where 1 = 1
-            ${arrivalNoticeQuery}
-            group by bizplace_name, arrival_notice_name, ended_at, delivery_order_name, own_collection, batch_id
-          ) src
-          group by bizplace_name, arrival_notice_name, ended_at, batch_id
-          order by bizplace_name, ended_at, arrival_notice_name
-        ) src
-        `, [context.state.domain.id, fromDate.value, toDate.value, tzoffset]);
-            let items = result;
-            return items;
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-};
-//# sourceMappingURL=elccl-daily-collection-report.js.map

package/dist-server/graphql/resolvers/custom/elccl/elccl-daily-collection-report.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"elccl-daily-collection-report.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/custom/elccl/elccl-daily-collection-report.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAEnD,qCAAsD;AAEzC,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,0BAA0B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACtE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,aAAa,GAAG,EAAE,CAAA;YACtB,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAW,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,EAAE;gBACpE,MAAM,QAAQ,GAAa,MAAM,IAAA,uBAAa,EAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;oBAC/D,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK;iBAChE,CAAC,CAAA;gBACF,aAAa,GAAG,wBAAwB,GAAG,QAAQ,CAAC,EAAE,GAAG,GAAG,CAAA;aAC7D;YAED,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACpE,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAChE,IAAI,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,eAAe,CAAC,CAAA;YAC9E,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,GAAG,UAAU,CAAA;YAEvF,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,eAAe,CAAA;YAE/C,IAAI,kBAAkB,GAAG,EAAE,CAAA;YAC3B,IAAI,aAAa,EAAE;gBACjB,kBAAkB;oBAChB,0CAA0C;wBAC1C,aAAa,CAAC,KAAK;6BAChB,KAAK,CAAC,GAAG,CAAC;6BACV,GAAG,CAAC,EAAE,CAAC,EAAE;4BACR,OAAO,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,IAAI,CAAA;wBACpD,CAAC,CAAC;6BACD,IAAI,CAAC,GAAG,CAAC;wBACZ,IAAI,CAAA;aACP;YAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAC3B;;;;;;;;;;;;;;;YAeI,aAAa;;;;;;;;;;;;;;;;;;;;;;cAsBX,kBAAkB;;;;;;SAMvB,EACD,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,CAClE,CAAA;YAED,IAAI,KAAK,GAAG,MAAa,CAAA;YAEzB,OAAO,KAAK,CAAA;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/custom/elccl/elccl-daily-order-inventory-report.js

@@ -1,138 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.elcclDailyOrderInventoryReport = void 0;
-const biz_base_1 = require("@things-factory/biz-base");
-exports.elcclDailyOrderInventoryReport = {
-    async elcclDailyOrderInventoryReport(_, params, context) {
-        try {
-            const { tx } = context.state;
-            let bizplaceFilter = params.filters.find(data => data.name === 'bizplace');
-            let month = params.filters.find(data => data.name === 'month').value + '-01';
-            let tzoffset = params.filters.find(data => data.name === 'tzoffset').value + ' seconds';
-            if (!bizplaceFilter || !month)
-                throw 'Invalid input';
-            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
-                id: bizplaceFilter.value
-            });
-            await tx.query(`
-        create temp table temp_invHistory as (
-          select rih.pallet_id, rih.seq, 
-          coalesce(grn.name, do2.name, rih.order_no) as order_no , rih.order_ref_no , an.delivery_order_no as do_ref_no, 
-          rih.bizplace_id, rih.ref_order_id, 
-          coalesce(grn.created_at, case when do2.delivery_date is not null then concat(do2.delivery_date, 'T00:00:00.000Z')::timestamp else null end, rih.created_at) as created_at, 
-          CASE WHEN rih.transaction_type = 'PICKING' THEN COALESCE(-oi.release_qty,rih.qty) ELSE rih.qty END AS qty,
-          inv.packing_type, inv.reusable_pallet_id, rih.transaction_type, 
-          case when rih.status = 'TERMINATED' then rih.status else 'STORED' end as status,
-          (case when lag(case when rih.status = 'TERMINATED' then 0 else 1 end) over (partition by rih.pallet_id order by rih.seq) = (case when rih.status = 'TERMINATED' then 0 else 1 end) 
-            then 0 else 1 end) as startflag
-          from reduced_inventory_histories rih
-          inner join inventories inv on inv.domain_id =rih.domain_id and inv.pallet_id =rih.pallet_id 
-          left join arrival_notices an on an.id = rih.ref_order_id::uuid and an.domain_id =rih.domain_id 
-          left join goods_receival_notes grn on grn.arrival_notice_id = an.id
-          left join release_goods rg on rg.id = rih.ref_order_id::uuid and rg.domain_id =rih.domain_id 
-          left join order_inventories oi on oi.release_good_id = rih.ref_order_id::uuid and oi.inventory_id = inv.id
-          left join delivery_orders do2 on do2.id = oi.delivery_order_id
-          where ((rih.transaction_type <> 'PUTAWAY' and rih.transaction_type <> 'ADJUSTMENT' and rih.transaction_type <> 'RELOCATE') or rih.qty <> 0)
-          and rih.domain_id =$1 and rih.bizplace_id = $2
-          and coalesce(grn.created_at, case when do2.delivery_date is not null then concat(do2.delivery_date, 'T00:00:00.000Z')::timestamp else null end, rih.created_at) < $3::timestamp + '1 month' + $4::interval
-          )
-        `, [context.state.domain.id, bizplace.id, month, tzoffset]);
-            await tx.query(`
-        create temp table temp_invByPallet as (
-          select grp.*, ivh.order_no, ivh.order_ref_no, ivh.do_ref_no from (
-            select pallet_id, packing_type, min(created_at) as started_at, max(created_at) as ended_at, min(seq) as min_seq, max(seq) as max_seq, status from (
-              select startData.*, sum(startflag) over (partition by pallet_id order by seq) as grp from (
-              select * from temp_invHistory s
-              ) startData
-            ) endData
-            group by pallet_id, grp, status, packing_type
-            order by pallet_id, min_seq
-          ) grp
-          inner join temp_invHistory ivh on ivh.pallet_id = grp.pallet_id and ivh.seq = grp.min_seq 
-        )
-      `);
-            const result = await tx.query(` 
-        select monthDays.created_at, order_no, order_ref_no, do_ref_no,
-        coalesce(carton,0) as carton, 
-        coalesce(bag,0) as bag, 
-        coalesce(basket,0) as basket, 
-        coalesce(pallet,0) as pallet,
-        sum(carton_running_total + carton) over (order by monthDays.created_at, src.rn) as carton_running_total, 
-        sum(bag_running_total + bag) over (order by monthDays.created_at, src.rn) as bag_running_total, 
-        sum(basket_running_total + basket) over (order by monthDays.created_at, src.rn) as basket_running_total, 
-        sum(pallet_running_total + pallet) over (order by monthDays.created_at, src.rn) as pallet_running_total
-        from (select generate_series((date '${month}')::timestamp, date_trunc('month',(date '${month}')::timestamp) + '1 month' - '1 day'::interval, interval '1 day')::date as created_at) monthDays
-        left join (
-          select 0 as rn, loose.*, pallet.pallet, pallet.pallet_running_total from (
-            select (date '${month}')::timestamp as created_at, 'NA' as order_no, 'NA' as order_ref_no, 'NA' as do_ref_no, 
-            0 as carton, 0 as bag, 0 as basket,
-            coalesce(sum(case when packing_type = 'CARTON' then qty else 0 end),0) as carton_running_total, 
-            coalesce(sum(case when packing_type = 'BAG' then qty else 0 end),0) as bag_running_total, 
-            coalesce(sum(case when packing_type = 'BASKET' then qty else 0 end),0) as basket_running_total
-            from temp_invHistory
-            where created_at < (date '${month}')::timestamp and qty <> 0
-          ) loose
-          left join (
-            select (date '${month}')::timestamp as created_at,
-            0 as pallet,
-            coalesce(sum(case when status = 'STORED' then 1 else -1 end),0) as pallet_running_total
-            from temp_invByPallet ivp
-            where started_at < (date '${month}')::timestamp
-          ) pallet on pallet.created_at = loose.created_at
-          union
-          select row_number() over (order by loose.created_at) as rn,
-          loose.*, pallet.pallet, pallet.pallet_running_total from (
-            select MIN(created_at) as created_at, order_no, order_ref_no, do_ref_no,
-            sum(case when packing_type = 'CARTON' then qty else 0 end) as carton, 
-            sum(case when packing_type = 'BAG' then qty else 0 end) as bag, 
-            sum(case when packing_type = 'BASKET' then qty else 0 end) as basket,
-            0 as carton_running_total, 0 as bag_running_total, 0 as basket_running_total
-            from 
-            (
-              SELECT pallet_id, packing_type, created_at, order_no, order_ref_no, do_ref_no, min(qty) AS qty FROM temp_invHistory 
-              where created_at >= (date '${month}')::timestamp and qty <> 0
-              group by pallet_id, packing_type, created_at, order_no, order_ref_no, do_ref_no
-              order by pallet_id, created_at, order_no, order_ref_no, do_ref_no
-            ) foo
-            group by created_at, order_no, order_ref_no, do_ref_no
-          ) loose
-          left join (
-            select MIN(started_at) as created_at, order_no, order_ref_no, do_ref_no,
-            sum(case when status = 'STORED' then 1 else -1 end) as pallet, 
-            0 as pallet_running_total
-            from temp_invByPallet ivp
-            where started_at >= (date '${month}')::timestamp
-            group by started_at::date, order_no, order_ref_no, do_ref_no
-          ) pallet on pallet.created_at::date = loose.created_at::date and pallet.order_no = loose.order_no
-          order by rn
-        ) as src on src.created_at::date = monthDays.created_at::date 
-        order by monthDays.created_at, src.rn
-      `);
-            tx.query(`
-        drop table temp_invHistory, temp_invByPallet
-      `);
-            let items = result.map(itm => {
-                return {
-                    bag: itm.bag,
-                    bizplace: bizplace,
-                    bagRunningTotal: itm.bag_running_total,
-                    basket: itm.basket,
-                    basketRunningTotal: itm.basket_running_total,
-                    carton: itm.carton,
-                    cartonRunningTotal: itm.carton_running_total,
-                    createdAt: itm.created_at,
-                    doRefNo: itm.do_ref_no,
-                    orderNo: itm.order_no,
-                    orderRefNo: itm.order_ref_no,
-                    pallet: itm.pallet,
-                    palletRunningTotal: itm.pallet_running_total
-                };
-            });
-            return { items, total: items.length };
-        }
-        catch (error) {
-            throw error;
-        }
-    }
-};
-//# sourceMappingURL=elccl-daily-order-inventory-report.js.map

package/dist-server/graphql/resolvers/custom/elccl/elccl-daily-order-inventory-report.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"elccl-daily-order-inventory-report.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/custom/elccl/elccl-daily-order-inventory-report.ts"],"names":[],"mappings":";;;AAGA,uDAAiE;AAEpD,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QAC1E,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YAEnD,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YAE1E,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,KAAK,GAAG,KAAK,CAAA;YAC5E,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,GAAG,UAAU,CAAA;YAEvF,IAAI,CAAC,cAAc,IAAI,CAAC,KAAK;gBAAE,MAAM,eAAe,CAAA;YAEpD,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,EAAE,EAAE,cAAc,CAAC,KAAK;aACzB,CAAC,CAAA;YAEF,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;SAsBC,EACD,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CACxD,CAAA;YAED,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;;;;OAad,CAAC,CAAA;YAEF,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;;;;;;;;;8CAUK,KAAK,4CAA4C,KAAK;;;4BAGxE,KAAK;;;;;;wCAMO,KAAK;;;4BAGjB,KAAK;;;;wCAIO,KAAK;;;;;;;;;;;;;2CAaF,KAAK;;;;;;;;;;;yCAWP,KAAK;;;;;;OAMvC,CAAC,CAAA;YAEF,EAAE,CAAC,KAAK,CAAC;;OAER,CAAC,CAAA;YAEF,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC3B,OAAO;oBACL,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,QAAQ,EAAE,QAAQ;oBAClB,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,kBAAkB,EAAE,GAAG,CAAC,oBAAoB;oBAC5C,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,kBAAkB,EAAE,GAAG,CAAC,oBAAoB;oBAC5C,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,OAAO,EAAE,GAAG,CAAC,SAAS;oBACtB,OAAO,EAAE,GAAG,CAAC,QAAQ;oBACrB,UAAU,EAAE,GAAG,CAAC,YAAY;oBAC5B,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,kBAAkB,EAAE,GAAG,CAAC,oBAAoB;iBAC7C,CAAA;YACH,CAAC,CAAC,CAAA;YAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAA;SACtC;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}