@things-factory/warehouse-base 5.0.14 → 6.0.0-alpha.3

package/dist-server/service/inventory-history/inventory-history-query.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InventoryHistoryQuery = void 0;
 const tslib_1 = require("tslib");
@@ -26,10 +25,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             });
         }
         const convertedParams = (0, shell_1.convertListParams)(params);
-        let [items, total] = await (0, typeorm_1.getRepository)(inventory_history_1.InventoryHistory).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater'], order: {
-                palletId: 'DESC',
-                createdAt: 'ASC'
-            } }));
+        let [items, total] = await (0, shell_1.getRepository)(inventory_history_1.InventoryHistory).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater'], order: Object.assign(Object.assign({}, convertedParams.order), { palletId: 'DESC', createdAt: 'ASC' }) }));
         items = (await Promise.all(items.map(async (item) => {
             switch (item.transactionType) {
                 case 'UNLOADING':
@@ -56,14 +52,15 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
     }
     async inventoryHistory(name, context) {
         const { domain } = context.state;
-        return await (0, typeorm_1.getRepository)(inventory_history_1.InventoryHistory).findOne({
-            where: { domain: domain, name, relations: ['domain', 'creator', 'updater'] }
+        return await (0, shell_1.getRepository)(inventory_history_1.InventoryHistory).findOne({
+            where: { domain: domain, name },
+            relations: ['domain', 'creator', 'updater']
         });
     }
     async bizplaceInventoryHistories(context, inventoryHistory, filters, pagination, sortings) {
         const { domain, user, tx } = context.state;
         const ownerBizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
-        const customerBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(inventoryHistory.bizplace.id);
+        const customerBizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({ id: inventoryHistory.bizplace.id });
         const productFilters = filters.find(x => x.name == 'product_info');
         filters = filters.filter(x => x.name != 'product_info');
         const fromDate = new Date(inventoryHistory.fromDate);
@@ -72,7 +69,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
         let where = { domain: domain };
         if (productFilters) {
             let productFilterValue = `%${productFilters.value.toLowerCase()}%`;
-            const productQb = (0, typeorm_1.getRepository)(product_base_1.Product).createQueryBuilder('prd');
+            const productQb = (0, shell_1.getRepository)(product_base_1.Product).createQueryBuilder('prd');
             productQb.where(new typeorm_1.Brackets(qb => {
                 qb.where('Lower(prd.sku) LIKE :productInfo', { productInfo: productFilterValue })
                     .orWhere('Lower(prd.name) LIKE :productInfo', { productInfo: productFilterValue })
@@ -83,7 +80,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             where['product'] = (0, typeorm_1.In)(_products.map((product) => product.id));
         }
         if (inventoryHistory && inventoryHistory.warehouseName) {
-            const _warehouses = await tx.getRepository(warehouse_1.Warehouse).find({
+            const _warehouses = await tx.getRepository(warehouse_1.Warehouse).findBy({
                 domain: domain,
                 name: (0, typeorm_1.Raw)(alias => `LOWER(${alias}) LIKE '${inventoryHistory.warehouseName.toLowerCase()}'`)
             });
@@ -133,7 +130,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             }
             if (!bizplaceFilter || !fromDate || !toDate)
                 throw 'Invalid input';
-            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                 id: bizplaceFilter.value
             });
             let batchNoQuery = '';
@@ -185,7 +182,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             await tx.query(`
       create temp table temp_data_src AS
       (
-        SELECT prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
+        SELECT prd.sku as sku, prd.name AS product_name, prd.description AS product_description, prd.type as product_type, prd.aux_value_1 AS product_aux_value_1, trim(invh.batch_id) as batch_id, invh.product_id,
         invh.packing_type, invh.bizplace_id, invh.domain_id,
         invh.ref_order_id, invh.order_no, invh.order_ref_no, invh.transaction_type, invh.status, invh.created_at,
         invh.qty, invh.opening_qty, 
@@ -201,7 +198,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
     `, [domain.id, bizplace.id, toDate.value]);
             await tx.query(`
         create temp table temp_inv_history as (
-          SELECT src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
+          SELECT src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
           src.bizplace_id, src.domain_id,
           SUM(COALESCE(src.qty,0)) AS qty,
           SUM(COALESCE(src.opening_qty,0)) AS opening_qty,
@@ -214,14 +211,14 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
           $1::date AS created_date  
           FROM temp_data_src src
           WHERE src.created_at < $1::timestamp
-          GROUP BY src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
+          GROUP BY src.sku, src.product_name, src.product_description, src.product_type, src.product_aux_value_1, src.batch_id, src.product_id, src.packing_type, src.uom,
           src.bizplace_id, src.domain_id
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value, 
           order_name, ref_no, 1 AS rn, MIN(created_at) - $2::interval as created_at, (MIN(created_at) - $2::interval)::DATE as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.uom, invh.opening_uom_value,
             COALESCE(order_no, '-') AS order_name,
@@ -234,14 +231,14 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             invh.transaction_type <>'NEW'
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(qty) as qty, sum(opening_qty) as opening_qty, sum(uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           order_name, ref_no, 1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
             invh.transaction_type AS order_name,
@@ -254,14 +251,14 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             invh.transaction_type = 'NEW')
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn, created_at
           UNION ALL
-          SELECT product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          SELECT sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, sum(-opening_qty) as qty, sum(opening_qty) as opening_qty, sum(-opening_uom_value) as uom_value, sum(opening_uom_value) as opening_uom_value,
           order_name, ref_no, 1 AS rn, created_at - $2::interval as created_at, created_at::date as created_date
           FROM (
-            SELECT invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
+            SELECT invh.sku, invh.product_name, invh.product_description, invh.product_type, invh.product_aux_value_1, invh.batch_id, invh.product_id, invh.packing_type, invh.uom, invh.bizplace_id, 
             invh.domain_id,
             invh.qty, invh.opening_qty,	invh.uom_value, invh.opening_uom_value,
             invh.transaction_type AS order_name,
@@ -274,23 +271,23 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             invh.status = 'MISSING'
             AND invh.created_at >= $1::timestamp
           ) AS inv_movement 
-          GROUP BY product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+          GROUP BY sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
           domain_id, order_name, ref_no, rn, created_at
           
         )`, [fromDate.value, tzoffset]);
             const result = await tx.query(` 
-        select product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
+        select sku, product_name, product_description, product_type, product_aux_value_1, batch_id, product_id, packing_type, uom, bizplace_id, 
         domain_id, qty, opening_qty, round(uom_value::decimal,2) as uom_value, opening_uom_value, order_name, ref_no, created_at::date
         from temp_inv_history invh where
         exists (
           select * from (
-            select batch_id, product_name, packing_type, sum(qty) as totalQty, count(*) as totalRow from temp_inv_history ih2 
-            group by batch_id, product_name, packing_type
+            select sku, batch_id, product_name, packing_type, sum(qty) as totalQty, count(*) as totalRow from temp_inv_history ih2 
+            group by sku, batch_id, product_name, packing_type
           ) src 
-          where src.batch_id = invh.batch_id and src.product_name = invh.product_name and src.packing_type = invh.packing_type
+          where src.sku = invh.sku and src.batch_id = invh.batch_id and src.product_name = invh.product_name and src.packing_type = invh.packing_type
           ${hasTransactionOrBalanceQuery}
         )
-        ORDER BY invh.product_name asc, invh.product_description asc, invh.packing_type asc, invh.batch_id asc, invh.uom asc, invh.rn asc, invh.created_at asc
+        ORDER BY invh.sku asc, invh.product_name asc, invh.product_description asc, invh.packing_type asc, invh.batch_id asc, invh.uom asc, invh.rn asc, invh.created_at asc
       `);
             tx.query(`
         drop table temp_products, temp_data_src, temp_inv_history
@@ -303,6 +300,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
                     packingType: item.packing_type,
                     product: {
                         id: item.product_id,
+                        sku: item.sku,
                         name: item.product_name +
                             ' ( ' +
                             item.product_description +
@@ -352,7 +350,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
                 throw 'Invalid input';
             let bizplaceQuery = '';
             if (bizplaceFilter) {
-                const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+                const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                     id: bizplaceFilter.value
                 });
                 if (bizplace) {
@@ -501,7 +499,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
                 throw 'Invalid input';
             let bizplaceQuery = '';
             if (bizplaceFilter) {
-                const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+                const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                     id: bizplaceFilter.value
                 });
                 if (bizplace) {
@@ -647,7 +645,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             let toDate = params.filters.find(data => data.name === 'toDate');
             if (!bizplaceFilter || !fromDate || !toDate)
                 throw 'Invalid input';
-            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                 id: bizplaceFilter.value
             });
             let queryFilter = ``;
@@ -753,7 +751,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             }
             if (!bizplaceFilter || !fromDate || !toDate)
                 throw 'Invalid input';
-            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                 id: bizplaceFilter.value
             });
             let [result, total] = byPallet.value
@@ -904,20 +902,27 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
         where domain_id = $1 and created_at < $2::timestamp + $3::INTERVAL + '1 day'::INTERVAL 
       );
     `, [domain.id, createdAt.value, timezoneOffset]);
-        //comment start
-        //detailed review needed 19 May 2022 by @ChrisLim-git
+        await tx.query(`
+      CREATE TEMP TABLE tmp_src_group on commit drop AS (
+        select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
+        min(ih.created_at) as initial_inbound_at
+        from tmp_src ih
+        group by ih.domain_id, ih.pallet_id
+      );
+    `);
         await tx.query(`          
         create temp table tmp_data on commit drop as (
           select dt.*, rih.carton_id, rih.batch_id, rih.batch_id_ref, rih.product_id, rih.packing_type, rih.bizplace_id, rih.location_id, rih.unit_cost,iv.id as inventory_id, iv.uom, 
-          iv.expiration_date, iv.manufacture_date, iv.reusable_pallet_id, iv.remark,iv.status
+          iv.expiration_date, iv.manufacture_date, iv.reusable_pallet_id, iv.remark
           from
           (
-            select ih.domain_id, ih.pallet_id, sum(ih.qty) as qty, sum(ih.uom_value) as uom_value, max(ih.seq) as last_seq, max(ih.created_at) as created_at,
-            min(ih.created_at) as initial_inbound_at
-            from tmp_src ih
-            group by ih.domain_id, ih.pallet_id
+            SELECT ih.*, ih2.status FROM tmp_src_group ih
+            INNER JOIN inventory_histories ih2 
+            ON ih.domain_id = ih2.domain_id 
+            AND ih.pallet_id = ih2.pallet_id
+            AND ih.last_seq = ih2.seq            
           ) dt
-          inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq
+          inner join tmp_src rih on dt.domain_id = rih.domain_id and dt.pallet_id = rih.pallet_id and dt.last_seq = rih.seq and rih.status <> 'TERMINATED'
           inner join inventories iv on iv.domain_id = dt.domain_id and iv.pallet_id = dt.pallet_id and iv.status <> 'MISSING'
           where exists (
             SELECT * FROM tmp_bizfilter bizFilter
@@ -927,39 +932,11 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
           ${expirationQueryFilter}
         );
       `);
-        await tx.query(`
-     create temp table tmp_result on commit drop as (
-      select 
-               rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
-               rih.initial_inbound_at as "initialInboundAt", rih.unit_cost as "unitCost",
-               case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
-               rih.batch_id_ref as "batchIdRef", rih.product_id as "productId", rih.packing_type as "packingType",
-               prd.id as product_id, prd.name as product_name, prd.sku as product_sku, prd.brand as product_brand, prd.description as product_description, prd.volume as product_volume,
-               bz.id as bizplace_id, bz.name as bizplace_name, 
-               loc.id as location_id, loc.name as location_name, loc."zone" as location_zone, loc."row" as location_row, loc."column" as location_column, loc.shelf as location_shelf,
-               wh.name as warehouse_name, plt.name as reusable_pallet_name,
-               rih.remark,
-               rih.manufacture_date as "manufactureDate",
-               rih.expiration_date as "expirationDate"
-               ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then oi.release_qty else 0 end) as "nonLoadedQty"
-               ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then (oi.release_uom_value / oi.release_qty* oi.release_qty) else 0 end) as "nonLoadedUomValue" 
-               from tmp_data rih
-               left join pallets plt on plt.id = rih.reusable_pallet_id
-               inner join products prd on prd.id = rih.product_id
-               inner join bizplaces bz on bz.id = rih.bizplace_id
-               inner join locations loc on loc.id = rih.location_id
-               inner join warehouses wh on wh.id = loc.warehouse_id
-               left  join order_inventories oi on oi.inventory_id = rih.inventory_id
-               group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
-               rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
-               having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
-               order by created_at desc
-           );   
-     `);
-        const total = await tx.query(`select count(*) from tmp_result`);
+        const total = await tx.query(`select count(*) from tmp_data`);
         const result = await tx.query(` 
           select 
-          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", rih.uom_value as "uomValue", rih.uom, rih.last_seq, rih.created_at,
+          rih.domain_id, rih.pallet_id as "palletId", rih.carton_id as "cartonId", rih.qty as "remainQty", 
+          TRUNC(rih.uom_value::numeric,2) as "uomValue", rih.uom, rih.last_seq, rih.created_at,
           rih.initial_inbound_at as "initialInboundAt", rih.unit_cost as "unitCost",
           case when rih.reusable_pallet_id is not null then concat(rih.batch_id, ' (', plt.name, ')') else rih.batch_id end as "batchId",
           rih.batch_id_ref as "batchIdRef", rih.product_id, rih.packing_type as "packingType", rih.bizplace_id, rih.location_id,
@@ -969,23 +946,35 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
           wh.name as warehouse_name, plt.name as reusable_pallet_name,
           rih.remark,
           rih.manufacture_date as "manufactureDate",
-          rih.expiration_date as "expirationDate"
-          ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then oi.release_qty else 0 end) as "nonLoadedQty"
-          ,sum(case when oi.status = 'LOADING' or (oi.status = 'SORTING' and oi.type = 'RELEASE_OF_GOODS') then (oi.release_uom_value / oi.release_qty* oi.release_qty) else 0 end) as "nonLoadedUomValue" 
+          rih.expiration_date as "expirationDate",
+          coalesce((
+            select sum(oi1.release_qty) as nonLoadedQty from order_inventories oi1
+            inner join release_goods rg1 on rg1.id = oi1.release_good_id 
+            where rg1.status in ('PICKING', 'LOADING') 
+            and oi1.inventory_id = rih.inventory_id 
+            and oi1.status in ('PICKED', 'LOADING')
+            and rg1.domain_id = '${domain.id}'
+            group by oi1.inventory_id
+          ),0) as "nonLoadedQty",
+          TRUNC(coalesce((
+            select sum(oi1.release_uom_value) as nonLoadedUomValue from order_inventories oi1
+            inner join release_goods rg1 on rg1.id = oi1.release_good_id 
+            where rg1.status in ('PICKING', 'LOADING') 
+            and oi1.inventory_id = rih.inventory_id 
+            and oi1.status in ('PICKED', 'LOADING')
+            and rg1.domain_id = '${domain.id}'
+            group by oi1.inventory_id
+          ),0)::numeric,2) as "nonLoadedUomValue"
           from tmp_data rih
           left join pallets plt on plt.id = rih.reusable_pallet_id
           inner join products prd on prd.id = rih.product_id
           inner join bizplaces bz on bz.id = rih.bizplace_id
           inner join locations loc on loc.id = rih.location_id
           inner join warehouses wh on wh.id = loc.warehouse_id
-          left join order_inventories oi on oi.inventory_id = rih.inventory_id
-          group by rih.inventory_id,rih.domain_id,rih.pallet_id,rih.carton_id,rih.qty,rih.uom_value,rih.uom,rih.last_seq,rih.created_at, rih.initial_inbound_at,rih.unit_cost,rih.reusable_pallet_id,
-          rih.batch_id,plt.name,rih.batch_id_ref,rih.product_id,rih.packing_type,rih.bizplace_id,rih.location_id,prd.id,bz.id,loc.id,wh.name,rih.remark,rih.expiration_date,rih.manufacture_date,rih.status
-          having 1=1 and (case when rih.status = 'TERMINATED' and SUM(CASE WHEN oi.status = 'LOADING' or (oi.status = 'SORTING' AND oi.type = 'RELEASE_OF_GOODS') THEN oi.release_qty ELSE 0 END) > 0 then  rih.status = 'TERMINATED' else rih.status <> 'TERMINATED' end)
+          WHERE 1 = 1
           ${queryOrder}
           ${setPagination ? 'OFFSET ' + (pagination.page - 1) * pagination.limit + ' LIMIT ' + pagination.limit : ''}
       `);
-        //comment end
         // map all results
         let items = result.map(itm => {
             return Object.assign(Object.assign({}, itm), { bizplace: {
@@ -1009,14 +998,14 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
     }
     async bizplaceInventoryHistoriesForExport(context, inventoryHistory, filters) {
         const { domain, tx } = context.state;
-        const customerBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(inventoryHistory.bizplace.id);
+        const customerBizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({ id: inventoryHistory.bizplace.id });
         const productFilters = filters.find(x => x.name == 'product_info');
         filters = filters.filter(x => x.name != 'product_info');
         const fromDate = new Date(inventoryHistory.fromDate);
         const toDate = new Date(inventoryHistory.toDate);
         if (productFilters) {
             let productFilterValue = `%${productFilters.value.toLowerCase()}%`;
-            const productQb = (0, typeorm_1.getRepository)(product_base_1.Product).createQueryBuilder('prd');
+            const productQb = (0, shell_1.getRepository)(product_base_1.Product).createQueryBuilder('prd');
             productQb.where(new typeorm_1.Brackets(qb => {
                 qb.where('Lower(prd.sku) LIKE :productInfo', { productInfo: productFilterValue })
                     .orWhere('Lower(prd.name) LIKE :productInfo', { productInfo: productFilterValue })
@@ -1031,7 +1020,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             });
         }
         if (inventoryHistory && inventoryHistory.warehouseName) {
-            const _warehouses = await tx.getRepository(warehouse_1.Warehouse).find({
+            const _warehouses = await tx.getRepository(warehouse_1.Warehouse).findBy({
                 domain: domain,
                 name: (0, typeorm_1.Raw)(alias => `LOWER(${alias}) LIKE '${inventoryHistory.warehouseName.toLowerCase()}'`)
             });
@@ -1063,7 +1052,7 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             operator: 'eq',
             value: customerBizplace.id
         });
-        const qb = (0, typeorm_1.getRepository)(inventory_history_1.InventoryHistory).createQueryBuilder('ih');
+        const qb = (0, shell_1.getRepository)(inventory_history_1.InventoryHistory).createQueryBuilder('ih');
         (0, shell_1.buildQuery)(qb, { filters }, context);
         qb.select('prd.sku', 'sku')
             .addSelect('prd.name', 'productName')
@@ -1122,13 +1111,14 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
             }
             if (!bizplaceFilter || !fromDate || !toDate)
                 throw 'Invalid input';
-            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+            const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({
                 id: bizplaceFilter.value
             });
             //check if all product details got volume
             let foundPermittedBizplace;
             if (bizplace) {
-                foundPermittedBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(bizplace.id, {
+                foundPermittedBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+                    where: { id: bizplace.id },
                     relations: ['company', 'company.domain']
                 });
                 const companyDomain = foundPermittedBizplace.company.domain;
@@ -1231,13 +1221,13 @@ let InventoryHistoryQuery = class InventoryHistoryQuery {
         }
     }
     async domain(inventoryHistory) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(inventoryHistory.domainId);
+        return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: inventoryHistory.domainId });
     }
     async updater(inventoryHistory) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(inventoryHistory.updaterId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: inventoryHistory.updaterId });
     }
     async creator(inventoryHistory) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(inventoryHistory.creatorId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: inventoryHistory.creatorId });
     }
 };
 tslib_1.__decorate([
@@ -1245,7 +1235,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistories", null);
 tslib_1.__decorate([
@@ -1265,7 +1255,7 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, inventory_history_types_1.InventoryHistoryPatch, Array, typeof (_b = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _b : Object, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, inventory_history_types_1.InventoryHistoryPatch, Array, shell_1.Pagination, Array]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "bizplaceInventoryHistories", null);
 tslib_1.__decorate([
@@ -1274,7 +1264,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_c = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _c : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistoryReport", null);
 tslib_1.__decorate([
@@ -1283,7 +1273,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_d = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _d : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistoryPalletReport", null);
 tslib_1.__decorate([
@@ -1292,7 +1282,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_e = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _e : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistoryPalletDetailReport", null);
 tslib_1.__decorate([
@@ -1301,7 +1291,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_f = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _f : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistoryPalletStorageReport", null);
 tslib_1.__decorate([
@@ -1310,7 +1300,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_g = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _g : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistorySummaryReport", null);
 tslib_1.__decorate([
@@ -1323,7 +1313,7 @@ tslib_1.__decorate([
     tslib_1.__param(4, (0, type_graphql_1.Arg)('locationSortingRules', type => [shell_1.Sorting], { nullable: true })),
     tslib_1.__param(5, (0, type_graphql_1.Arg)('setPagination', type => Boolean, { defaultValue: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Array, typeof (_h = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _h : Object, Array, Array, Boolean]),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, shell_1.Pagination, Array, Array, Boolean]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "onhandInventories", null);
 tslib_1.__decorate([
@@ -1342,7 +1332,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_j = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _j : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryHistoryQuery.prototype, "inventoryHistoryVolumeSummaryReport", null);
 tslib_1.__decorate([
@@ -1567,8 +1557,8 @@ async function filterInventoryQuery(tx, params, bizplace, context) {
       from inventories i2
       inner join reduced_inventory_histories ih on ih.pallet_id = i2.pallet_id and ih.domain_id = i2.domain_id
       where
-      i2.domain_id = $1
-      and i2.bizplace_id = $2
+      ih.domain_id = $1
+      and ih.bizplace_id = $2
       and ih.created_at <= $3
       ${batchNoQuery}
     )