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

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

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inventoriesByStrategy = exports.InventoryQuery = void 0;
 const tslib_1 = require("tslib");
@@ -7,6 +6,7 @@ const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const biz_base_1 = require("@things-factory/biz-base");
+const env_1 = require("@things-factory/env");
 const product_base_1 = require("@things-factory/product-base");
 const setting_base_1 = require("@things-factory/setting-base");
 const shell_1 = require("@things-factory/shell");
@@ -15,14 +15,27 @@ const inventory_change_1 = require("../inventory-change/inventory-change");
 const inventory_1 = require("./inventory");
 const inventory_types_1 = require("./inventory-types");
 let InventoryQuery = class InventoryQuery {
-    async inventories(context, filters, pagination, sortings, locationSortingRules) {
-        var _a, _b;
+    /**
+     * Combined single query resolver to perform extraction of data with or without pagination
+     * @param context
+     * @param filters
+     * @param pagination
+     * @param sortings
+     * @param locationSortingRules
+     * @param exportItem
+     * @returns
+     */
+    async inventories(context, filters, pagination, sortings, locationSortingRules, exportItem) {
         const { domain, user, tx } = context.state;
+        const { page, limit } = pagination || {};
         try {
-            const productFilters = filters.find(x => x.name == 'product_info');
-            filters = filters.filter(x => x.name != 'product_info');
+            //Define special filters
+            const productFilters = filters.find((filter) => filter.name == 'productInfo');
+            const remainOnlyParam = filters.find((filter) => filter.name == 'remainOnly');
+            const bizplace = filters.find((filter) => filter.name === 'bizplace');
+            filters = filters.filter(x => ['productInfo', 'remainOnly'].indexOf(x.name) < 0);
             const params = { filters, pagination };
-            if (!params.filters.find((filter) => filter.name === 'bizplace')) {
+            if (!bizplace) {
                 params.filters.push({
                     name: 'bizplace',
                     operator: 'in',
@@ -30,38 +43,37 @@ let InventoryQuery = class InventoryQuery {
                     relation: true
                 });
             }
-            const remainOnlyParam = (_a = params === null || params === void 0 ? void 0 : params.filters) === null || _a === void 0 ? void 0 : _a.find((f) => f.name === 'remainOnly');
-            let remainOnly = false;
-            if (typeof (remainOnlyParam === null || remainOnlyParam === void 0 ? void 0 : remainOnlyParam.value) !== 'undefined') {
-                remainOnly = remainOnlyParam.value;
-                params.filters = params.filters.filter((f) => f.name !== 'remainOnly');
-            }
-            const unlockOnlyParam = (_b = params === null || params === void 0 ? void 0 : params.filters) === null || _b === void 0 ? void 0 : _b.find((f) => f.name === 'unlockOnly');
-            let unlockOnly = false;
-            if (typeof (unlockOnlyParam === null || unlockOnlyParam === void 0 ? void 0 : unlockOnlyParam.value) !== 'undefined') {
-                unlockOnly = unlockOnlyParam.value;
-                params.filters = params.filters.filter((f) => f.name !== 'unlockOnly');
-            }
-            const qb = (0, typeorm_1.getRepository)(inventory_1.Inventory).createQueryBuilder('iv');
+            const remainOnly = (remainOnlyParam === null || remainOnlyParam === void 0 ? void 0 : remainOnlyParam.value) || false;
+            // Define Query data
+            const qb = tx.getRepository(inventory_1.Inventory).createQueryBuilder('inventory');
             (0, shell_1.buildQuery)(qb, params, context, {
                 searchables: ['warehouse', 'product', 'batchId', 'location', 'palletId']
             });
-            qb.leftJoinAndSelect('iv.bizplace', 'bizplace')
-                .leftJoinAndSelect('iv.product', 'product')
-                .leftJoinAndSelect('iv.warehouse', 'warehouse')
-                .leftJoinAndSelect('iv.location', 'location')
-                .leftJoin('iv.inventoryItems', 'ivi')
-                .loadRelationCountAndMap('iv.inventoryItemCount', 'iv.inventoryItems', 'ivic', qb => qb.andWhere('ivic.status = :ivicStatus', {
-                ivicStatus: constants_1.INVENTORY_STATUS.STORED
-            }));
+            qb.leftJoinAndSelect('inventory.bizplace', 'bizplace')
+                .leftJoinAndSelect('inventory.product', 'product')
+                .leftJoinAndSelect('product.productDetails', 'productDetail', 'productDetail.id = inventory.product_detail_id')
+                .leftJoinAndSelect('inventory.warehouse', 'warehouse')
+                .leftJoinAndSelect('inventory.location', 'location')
+                .leftJoinAndSelect('inventory.creator', 'creator')
+                .leftJoinAndSelect('inventory.updater', 'updater')
+                // To get aggregated serial number in csv and total number of stored serial number
+                .leftJoinAndSelect(subQuery => {
+                return subQuery
+                    .select('inventoryItems.inventory_id', 'inventory_item_inventory_id')
+                    .addSelect(`SUM(case when "inventoryItems"."status" = 'STORED' then 1 else 0 end)`, 'inventory_item_count')
+                    .addSelect(`string_agg(inventoryItems.serial_number, ', ')`, 'serial_numbers')
+                    .from('inventory_items', 'inventoryItems')
+                    .where(`inventoryItems.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`inventoryItems.status = :ivicStatus`, { ivicStatus: constants_1.INVENTORY_STATUS.STORED })
+                    .groupBy('inventoryItems.inventory_id');
+            }, 'inventoryItems', '"inventoryItems"."inventory_item_inventory_id" = "inventory"."id"');
+            // To get inventory with remaining qty
             if (remainOnly) {
-                qb.andWhere('iv.qty > 0')
-                    .andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END >= 0')
-                    .andWhere('iv.qty - CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END > 0');
-            }
-            if (unlockOnly) {
-                qb.andWhere('CASE WHEN iv.lockedQty IS NULL THEN 0 ELSE iv.lockedQty END = 0');
+                qb.andWhere('inventory.qty > 0')
+                    .andWhere('CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END >= 0')
+                    .andWhere('inventory.qty - CASE WHEN inventory.lockedQty IS NULL THEN 0 ELSE inventory.lockedQty END > 0');
             }
+            // Filter based on multiple product parameters and allow to search in csv format
             if (productFilters) {
                 let productFilterValue = `%${productFilters.value.toLowerCase()}%`;
                 qb.andWhere(qb => {
@@ -69,7 +81,7 @@ let InventoryQuery = class InventoryQuery {
                         .subQuery()
                         .select()
                         .from(product_base_1.Product, `products`)
-                        .where(`products.id = iv.product_id`)
+                        .where(`products.id = Inventory.product_id`) // @chrislim Does the uppercase I in Inventory affect? I can see the rest are in lowercase i
                         .andWhere(new typeorm_1.Brackets(qb => {
                         qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
                             .orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
@@ -80,42 +92,34 @@ let InventoryQuery = class InventoryQuery {
                     return `EXISTS ${subQuery}`;
                 });
             }
+            // Apply sorting based on child data
             if ((sortings === null || sortings === void 0 ? void 0 : sortings.length) !== 0) {
                 const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone'];
-                const sort = (sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'iv.' + sort.name]: sort.desc
+                const sort = (sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'inventory.' + sort.name]: sort.desc
                         ? 'DESC'
                         : 'ASC' })), {});
                 qb.orderBy(sort);
             }
             if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
-                locationSortingRules.forEach((rule) => {
+                locationSortingRules.forEach(rule => {
                     qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
                 });
             }
-            let [items, total] = await qb.getManyAndCount();
-            items = await Promise.all(items.map(async (item) => {
-                var _a;
-                let [productDetails, inventoryItems] = await Promise.all([
-                    (0, typeorm_1.getRepository)(product_base_1.ProductDetail).find({
-                        where: {
-                            product: item.product.id,
-                            packingType: item.packingType,
-                            packingSize: item.packingSize
-                        }
-                    }),
-                    tx.query(`
-              SELECT string_agg(ii.serial_number, ', ') AS "serialNumbers"
-              FROM inventory_items ii
-              WHERE ii.inventory_id = $1
-              GROUP BY ii.inventory_id 
-            `, [item.id])
-                ]);
-                item.product['productDetails'] = productDetails;
-                return Object.assign(Object.assign({}, item), { remainQty: item.qty - (item.lockedQty ? item.lockedQty : 0), remainUomValue: item.uomValue - (item.lockedUomValue ? item.lockedUomValue : 0), serialNumbers: (_a = inventoryItems[0]) === null || _a === void 0 ? void 0 : _a.serialNumbers });
-            }));
-            return { items, total };
+            // Fetch all row for exporting
+            if (exportItem != true && page && limit) {
+                qb.offset((page - 1) * limit).limit(limit);
+            }
+            let items = (await qb.getRawMany()).map(item => {
+                return Object.assign(Object.assign({}, new inventory_1.Inventory(item)), { serialNumbers: item.serial_numbers });
+            });
+            let total = await qb.getCount();
+            return {
+                items,
+                total
+            };
         }
         catch (error) {
+            env_1.logger.error(`inventory-query[inventories]: ${error}`);
             throw error;
         }
     }
@@ -129,7 +133,7 @@ let InventoryQuery = class InventoryQuery {
     async inventoryByPallet(palletId, context) {
         const { domain } = context.state;
         return await (0, typeorm_1.getRepository)(inventory_1.Inventory).findOne({
-            where: { domain, palletId, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(constants_1.INVENTORY_STATUS.TERMINATED)) },
+            where: { domain: { id: domain.id }, palletId, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(constants_1.INVENTORY_STATUS.TERMINATED)) },
             relations: ['domain', 'bizplace', 'product', 'location', 'warehouse', 'creator', 'updater']
         });
     }
@@ -142,10 +146,13 @@ let InventoryQuery = class InventoryQuery {
             const limit = params.pagination.limit;
             let bizplaceFilter = params.filters.find(filter => filter.name == 'bizplace');
             let productFilter = params.filters.find(filter => filter.name == 'product');
-            let productTypeFilter = params.filters.find(filter => filter.name == 'type');
+            let packingTypeFilter = params.filters.find(filter => filter.name == 'packingType');
             let availableStockFilter = params.filters.find(filter => filter.name == 'availableStock');
             let lowStockFilter = params.filters.find(filter => filter.name == 'lowStock');
             let overStockFilter = params.filters.find(filter => filter.name == 'overStock');
+            let quarantineStockFilter = params.filters.find(filter => filter.name == 'quarantineStock');
+            let reserveStockFilter = params.filters.find(filter => filter.name == 'reserveStock');
+            let productTypeFilter = params.filters.find(filter => filter.name == 'type');
             if (bizplaceFilter) {
                 const bizplaceQueryBuilder = (0, typeorm_1.getRepository)(biz_base_1.Bizplace).createQueryBuilder('b');
                 bizplaceQueryBuilder
@@ -203,27 +210,96 @@ let InventoryQuery = class InventoryQuery {
           Lower("Product"."type") LIKE ANY(ARRAY[${productTypeValue}])
         )`;
             }
+            let qtyStockQuery = '';
             let availableStockQuery = '';
+            if (reserveStockFilter === null || reserveStockFilter === void 0 ? void 0 : reserveStockFilter.value) {
+                qtyStockQuery += `\nAND SUM("reserveQty") > 0`;
+            }
+            if (quarantineStockFilter === null || quarantineStockFilter === void 0 ? void 0 : quarantineStockFilter.value) {
+                qtyStockQuery += `\nAND SUM("quarantineQty") > 0`;
+            }
+            if (availableStockFilter === null || availableStockFilter === void 0 ? void 0 : availableStockFilter.value) {
+                qtyStockQuery += ` AND SUM("availableQty") > 0`;
+            }
             if (availableStockFilter === null || availableStockFilter === void 0 ? void 0 : availableStockFilter.value) {
                 availableStockQuery = ` AND SUM("Inventory"."qty") > 0`;
             }
+            if ((availableStockFilter === null || availableStockFilter === void 0 ? void 0 : availableStockFilter.value) && (quarantineStockFilter === null || quarantineStockFilter === void 0 ? void 0 : quarantineStockFilter.value)) {
+                qtyStockQuery = '';
+                qtyStockQuery += `\nAND (SUM("availableQty") > 0 \n OR SUM("quarantineQty") > 0)`;
+            }
+            if ((availableStockFilter === null || availableStockFilter === void 0 ? void 0 : availableStockFilter.value) && (reserveStockFilter === null || reserveStockFilter === void 0 ? void 0 : reserveStockFilter.value)) {
+                qtyStockQuery = '';
+                qtyStockQuery += `\nAND (SUM("availableQty") > 0 \n OR SUM("reserveQty") > 0)`;
+            }
+            if ((quarantineStockFilter === null || quarantineStockFilter === void 0 ? void 0 : quarantineStockFilter.value) && (reserveStockFilter === null || reserveStockFilter === void 0 ? void 0 : reserveStockFilter.value)) {
+                qtyStockQuery = '';
+                qtyStockQuery += `\nAND (SUM("quarantineQty") > 0 \n OR SUM("reserveQty") > 0)`;
+            }
+            let inventoryQuery = '';
+            if (packingTypeFilter) {
+                let packingTypeValue = packingTypeFilter.value
+                    .toLowerCase()
+                    .split(',')
+                    .map(prod => {
+                    return "'%" + prod.trim().replace(/'/g, "''") + "%'";
+                })
+                    .join(',');
+                inventoryQuery =
+                    inventoryQuery +
+                        ` AND (
+          Lower("Inventory"."packing_type") LIKE ANY(ARRAY[${packingTypeValue}])
+        )`;
+            }
             let thresholdQuery = '';
-            if (lowStockFilter === null || lowStockFilter === void 0 ? void 0 : lowStockFilter.value) {
-                thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) > SUM("Inventory"."qty")`;
+            if ((lowStockFilter === null || lowStockFilter === void 0 ? void 0 : lowStockFilter.value) && (overStockFilter === null || overStockFilter === void 0 ? void 0 : overStockFilter.value)) {
+                throw new Error('invalid filter combination');
             }
-            if (overStockFilter === null || overStockFilter === void 0 ? void 0 : overStockFilter.value) {
-                thresholdQuery = `AND COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0)  > 0 AND 
-          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0)  < SUM("Inventory"."qty")`;
+            else if ((lowStockFilter === null || lowStockFilter === void 0 ? void 0 : lowStockFilter.value) && !(overStockFilter === null || overStockFilter === void 0 ? void 0 : overStockFilter.value)) {
+                thresholdQuery = `AND SUM(COALESCE("minQty", 0)) > SUM("availableQty")`;
+            }
+            else if (!(lowStockFilter === null || lowStockFilter === void 0 ? void 0 : lowStockFilter.value) && (overStockFilter === null || overStockFilter === void 0 ? void 0 : overStockFilter.value)) {
+                thresholdQuery = `AND SUM(COALESCE("maxQty", 0)) > 0 AND SUM(COALESCE("maxQty", 0)) < SUM("availableQty")`;
             }
             await tx.query(`
+        CREATE TEMP TABLE order_inventories_by_products AS (
+          SELECT "product_id", "packing_type", sum("release_qty") AS "total_release_qty" FROM order_inventories oi 
+          WHERE "type" = 'RELEASE_OF_GOODS'
+          AND "domain_id" = $1
+          AND "inventory_id" ISNULL
+          AND "status" IN ('PENDING','PENDING_RECEIVE','PENDING_WORKSHEET','READY_TO_PICK'/*, 'PENDING_SPLIT' kiv sebab kalau pending split, ada yang dah assign tapi belum delete*/)
+          GROUP BY "product_id", "packing_type"
+        )`, [domain.id]);
+            await tx.query(`
         create temp table temp_inv_history AS 
         (
           SELECT "Product"."id" AS "id", "Product"."sku" AS "sku", "Product"."brand" AS "brand", "Product"."name" AS "name", "Product"."type" AS "type", "Product"."description" AS "description", 
+          "Inventory"."packing_type" AS "packingType",
           "Product"."weight" AS "weight", "ProductRef"."id" AS "productRefId", 
           "ProductRef"."description" AS "productRefDesciption", "Bizplace"."id" AS "bizplaceId", "Bizplace"."name" AS "bizplaceName", SUM("Inventory"."qty") AS "qty" ,
           CASE WHEN SUM("Inventory"."qty") > 0 THEN SUM(COALESCE("Inventory"."unit_cost", 0) * "Inventory"."qty")/ SUM("Inventory"."qty") ELSE 0 END AS "averageUnitCost",
           COALESCE("ProductDetailBizplaceSetting"."min_qty", "Product"."min_qty",0) AS "minQty", 
-          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) AS "maxQty"
+          COALESCE("ProductDetailBizplaceSetting"."max_qty", "Product"."max_qty",0) AS "maxQty",
+          CASE WHEN "Location"."type" NOT IN ('${constants_1.LOCATION_TYPE.QUARANTINE}','${constants_1.LOCATION_TYPE.RESERVE}') 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "availableQty",
+          SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0)) AS "releaseQty",
+          CASE WHEN "Location"."type" = '${constants_1.LOCATION_TYPE.QUARANTINE}' 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "quarantineQty",
+          CASE WHEN "Location"."type" = '${constants_1.LOCATION_TYPE.RESERVE}' 
+          THEN 
+          CASE WHEN SUM("Inventory"."qty") > 0 
+          THEN SUM("Inventory"."qty")-SUM(COALESCE("Inventory"."locked_qty", 0) + COALESCE("OrderInventoriesByProduct"."total_release_qty", 0))
+          ELSE 0 END
+          ELSE 0 END AS "reserveQty",
+          CASE WHEN "Location"."type" = '${constants_1.LOCATION_TYPE.BIN}' THEN SUM("Inventory"."qty") ELSE 0 END AS "binQty"
           FROM "inventories" "Inventory" 
           LEFT JOIN "products" "Product" ON "Product"."id"="Inventory"."product_id" 
           LEFT JOIN "product_details" "ProductDetails" ON "ProductDetails"."product_id" = "Product"."id" 
@@ -232,23 +308,43 @@ let InventoryQuery = class InventoryQuery {
             AND "ProductDetailBizplaceSetting"."domain_id" = "Inventory"."domain_id"
           LEFT JOIN "products" "ProductRef" ON "ProductRef"."id"="Product"."product_ref_id" 
           INNER JOIN "bizplaces" "Bizplace" ON "Bizplace"."id"="Inventory"."bizplace_id"
+          INNER JOIN "locations" "Location" ON "Location"."id" = "Inventory"."location_id"
+          LEFT JOIN "order_inventories_by_products" "OrderInventoriesByProduct" 
+          ON "OrderInventoriesByProduct"."product_id" = "Inventory"."product_id"
+          AND "OrderInventoriesByProduct"."packing_type" = "Inventory"."packing_type"
           WHERE "Inventory"."qty" >= 0
           AND "Inventory"."status" <> 'MISSING'
           AND "Inventory"."domain_id" = $1
           ${bizplaceQuery}
           ${productQuery}
-          GROUP BY "Product"."id", "ProductRef"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id"
+          GROUP BY "Product"."id", "Bizplace"."id", "ProductDetailBizplaceSetting"."id", "Inventory"."packing_type", "Location"."type", "ProductRef"."id"
           HAVING 1 = 1
           ${availableStockQuery}
-          ${thresholdQuery}
         )`, [domain.id]);
+            await tx.query(`
+          CREATE TEMP TABLE grouped_inventories_product AS (
+            SELECT "id", "sku", "brand", "name", "description",
+             "packingType", "bizplaceId", "bizplaceName", sum("averageUnitCost") AS "averageUnitCost",
+		              sum("minQty") AS "minQty", sum("maxQty") AS "maxQty", 
+		              sum("availableQty") AS "availableQty", 
+		              sum("quarantineQty") AS "quarantineQty",
+		              sum("reserveQty") AS "reserveQty", 
+		              sum("releaseQty") AS "releaseQty",
+		              sum("availableQty" + "quarantineQty"  + "releaseQty" +  "reserveQty" - "binQty") AS "warehouseQty" 
+	            FROM temp_inv_history
+	            GROUP BY "id", "sku", "brand", "name", "description", "packingType", "bizplaceId", "bizplaceName"
+	            HAVING 1=1  
+            ${qtyStockQuery}
+            ${thresholdQuery}
+          )
+        `);
             const results = await tx.query(`
-          SELECT * FROM temp_inv_history
-          ORDER BY "bizplaceName", "sku" 
+          SELECT * FROM grouped_inventories_product
+          ORDER BY "bizplaceName", "sku"
           OFFSET $1 LIMIT $2
         `, [(page - 1) * limit, limit]);
-            const total = await tx.query(`SELECT COUNT(*) FROM temp_inv_history`);
-            tx.query(`drop table temp_inv_history`);
+            const total = await tx.query(`SELECT COUNT(*) FROM grouped_inventories_product`);
+            await tx.query(`drop table temp_inv_history, order_inventories_by_products, grouped_inventories_product`);
             return {
                 items: results.map((item) => {
                     return {
@@ -258,15 +354,20 @@ let InventoryQuery = class InventoryQuery {
                             sku: item.sku,
                             brand: item.brand,
                             description: item.description,
-                            type: item.type,
-                            weight: item.weight,
-                            productRefId: item.productRefId,
-                            bizplaceId: item.bizplaceId,
                             minQty: item.minQty,
                             maxQty: item.maxQty
                         },
+                        bizplace: {
+                            id: item.bizplaceId,
+                            name: item.bizplaceName
+                        },
+                        packingType: item.packingType,
                         averageUnitCost: item.averageUnitCost,
-                        qty: item.qty
+                        availableQty: item.availableQty,
+                        releaseQty: item.releaseQty,
+                        quarantineQty: item.quarantineQty,
+                        reserveQty: item.reserveQty,
+                        warehouseQty: item.warehouseQty
                     };
                 }),
                 total: total[0].count
@@ -279,7 +380,7 @@ let InventoryQuery = class InventoryQuery {
     async inventoriesByStrategy(context, worksheetId, batchId, productName, productSku, packingType, packingSize, uom, pickingStrategy, locationSortingRules, bizplaceId) {
         const { domain, tx } = context.state;
         const inventoryAssignmentSetting = await tx.getRepository(setting_base_1.Setting).findOne({
-            where: { domain, name: 'rule-for-inventory-assignment' }
+            where: { domain: { id: domain.id }, name: 'rule-for-inventory-assignment' }
         });
         if (!locationSortingRules && inventoryAssignmentSetting) {
             locationSortingRules = [];
@@ -306,11 +407,11 @@ let InventoryQuery = class InventoryQuery {
         const { tx } = context.state;
         const invRepo = tx.getRepository(inventory_1.Inventory);
         const invA = await invRepo.findOne({
-            where: { domain: context.state.domain, palletId: palletA, status: constants_1.INVENTORY_STATUS.STORED },
+            where: { domain: { id: context.state.domain.id }, palletId: palletA, status: constants_1.INVENTORY_STATUS.STORED },
             relations: ['product']
         });
         const invB = await invRepo.findOne({
-            where: { domain: context.state.domain, palletId: palletB, status: constants_1.INVENTORY_STATUS.STORED },
+            where: { domain: { id: context.state.domain.id }, palletId: palletB, status: constants_1.INVENTORY_STATUS.STORED },
             relations: ['product']
         });
         return ((invA === null || invA === void 0 ? void 0 : invA.batchId) === (invB === null || invB === void 0 ? void 0 : invB.batchId) &&
@@ -321,7 +422,12 @@ let InventoryQuery = class InventoryQuery {
         var _a, _b;
         const invRepo = (0, typeorm_1.getRepository)(inventory_1.Inventory);
         const invA = await invRepo.findOne({
-            where: { domain: context.state.domain, palletId: palletA, cartonId: cartonA, status: constants_1.INVENTORY_STATUS.STORED },
+            where: {
+                domain: { id: context.state.domain.id },
+                palletId: palletA,
+                cartonId: cartonA,
+                status: constants_1.INVENTORY_STATUS.STORED
+            },
             relations: ['product']
         });
         const invB = await invRepo.findOne({
@@ -344,7 +450,7 @@ let InventoryQuery = class InventoryQuery {
         const invRepo = (0, typeorm_1.getRepository)(inventory_1.Inventory);
         const bizRepo = (0, typeorm_1.getRepository)(biz_base_1.Bizplace);
         const inventory = await invRepo.findOne({
-            where: { domain: context.state.domain, palletId, status: constants_1.INVENTORY_STATUS.STORED },
+            where: { domain: { id: context.state.domain.id }, palletId, status: constants_1.INVENTORY_STATUS.STORED },
             relations: ['bizplace']
         });
         if (!inventory)
@@ -475,99 +581,6 @@ let InventoryQuery = class InventoryQuery {
         /** ************************ **/
         return { bundleGroup, bundleSetting };
     }
-    async inventoriesForExport(context, filters, pagination, sortings, locationSortingRules) {
-        var _a, _b;
-        const { domain, user } = context.state;
-        const { page, limit } = pagination;
-        try {
-            const productFilters = filters.find(x => x.name == 'product_info');
-            filters = filters.filter(x => x.name != 'product_info');
-            const params = { filters, pagination };
-            if (!params.filters.find((filter) => filter.name === 'bizplace')) {
-                throw new Error('Please select a customer for export.');
-            }
-            const remainOnlyParam = (_a = params === null || params === void 0 ? void 0 : params.filters) === null || _a === void 0 ? void 0 : _a.find((f) => f.name === 'remainOnly');
-            let remainOnly = false;
-            if (typeof (remainOnlyParam === null || remainOnlyParam === void 0 ? void 0 : remainOnlyParam.value) !== 'undefined') {
-                remainOnly = remainOnlyParam.value;
-                params.filters = params.filters.filter((f) => f.name !== 'remainOnly');
-            }
-            const unlockOnlyParam = (_b = params === null || params === void 0 ? void 0 : params.filters) === null || _b === void 0 ? void 0 : _b.find((f) => f.name === 'unlockOnly');
-            let unlockOnly = false;
-            if (typeof (unlockOnlyParam === null || unlockOnlyParam === void 0 ? void 0 : unlockOnlyParam.value) !== 'undefined') {
-                unlockOnly = unlockOnlyParam.value;
-                params.filters = params.filters.filter((f) => f.name !== 'unlockOnly');
-            }
-            const qb = (0, typeorm_1.getRepository)(inventory_1.Inventory).createQueryBuilder('Inventory');
-            (0, shell_1.buildQuery)(qb, params, context);
-            qb.leftJoinAndSelect('Inventory.bizplace', 'Bizplace')
-                .leftJoinAndSelect('Inventory.product', 'Product')
-                .leftJoinAndSelect('Inventory.warehouse', 'Warehouse')
-                .leftJoinAndSelect('Inventory.location', 'Location')
-                .leftJoinAndSelect('Inventory.creator', 'Creator')
-                .leftJoinAndSelect('Inventory.updater', 'Updater')
-                .leftJoinAndSelect(subQuery => {
-                return subQuery
-                    .select('ii.inventory_id', 'inventory_id')
-                    .addSelect(`string_agg(ii.serial_number, ', ')`, 'serial_numbers')
-                    .from('inventory_items', 'ii')
-                    .where(`ii.domain_id = :domainId`, { domainId: domain.id })
-                    .groupBy('ii.inventory_id');
-            }, 'ii2', 'ii2.inventory_id = Inventory.id');
-            if (remainOnly) {
-                qb.andWhere('Inventory.qty > 0')
-                    .andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END >= 0')
-                    .andWhere('Inventory.qty - CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END > 0');
-            }
-            if (unlockOnly) {
-                qb.andWhere('CASE WHEN Inventory.locked_qty IS NULL THEN 0 ELSE Inventory.locked_qty END = 0');
-            }
-            if (productFilters) {
-                let productFilterValue = `%${productFilters.value.toLowerCase()}%`;
-                qb.andWhere(qb => {
-                    const subQuery = qb
-                        .subQuery()
-                        .select()
-                        .from(product_base_1.Product, `products`)
-                        .where(`products.id = Inventory.product_id`)
-                        .andWhere(new typeorm_1.Brackets(qb => {
-                        qb.where('Lower(products.sku) LIKE :productInfo', { productInfo: productFilterValue })
-                            .orWhere('Lower(products.name) LIKE :productInfo', { productInfo: productFilterValue })
-                            .orWhere('Lower(products.description) LIKE :productInfo', { productInfo: productFilterValue })
-                            .orWhere('Lower(products.brand) LIKE :productInfo', { productInfo: productFilterValue });
-                    }))
-                        .getQuery();
-                    return `EXISTS ${subQuery}`;
-                });
-            }
-            if ((sortings === null || sortings === void 0 ? void 0 : sortings.length) !== 0) {
-                const arrChildSortData = ['bizplace', 'product', 'location', 'warehouse', 'zone'];
-                const sort = (sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'Inventory.' + sort.name]: sort.desc
-                        ? 'DESC'
-                        : 'ASC' })), {});
-                qb.orderBy(sort);
-            }
-            if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
-                locationSortingRules.forEach((rule) => {
-                    qb.addOrderBy(`location.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
-                });
-            }
-            let items = await qb
-                .offset((page - 1) * limit)
-                .limit(limit)
-                .getRawMany();
-            let total = await qb.getCount();
-            return {
-                items: items.map(item => {
-                    return Object.assign(Object.assign({}, new inventory_1.Inventory(item)), { serialNumbers: item.serial_numbers });
-                }),
-                total
-            };
-        }
-        catch (error) {
-            throw error;
-        }
-    }
     async inventoriesGroupByProduct(params, context) {
         try {
             const { domain, user, tx } = context.state;
@@ -719,13 +732,13 @@ let InventoryQuery = class InventoryQuery {
         }
     }
     async domain(inventory) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(inventory.domainId);
+        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOneBy({ id: inventory.domainId });
     }
     async updater(inventory) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(inventory.updaterId);
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOneBy({ id: inventory.updaterId });
     }
     async creator(inventory) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(inventory.creatorId);
+        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOneBy({ id: inventory.creatorId });
     }
     /*
       move changeCount to @FieldResolver so that system don't have
@@ -733,7 +746,7 @@ let InventoryQuery = class InventoryQuery {
     */
     async changeCount(inventory) {
         return await (0, typeorm_1.getRepository)(inventory_change_1.InventoryChange).count({
-            where: { inventory }
+            where: { inventory: { id: inventory.id } }
         });
     }
     /*
@@ -776,6 +789,17 @@ let InventoryQuery = class InventoryQuery {
     `);
         return ((_a = items[0]) === null || _a === void 0 ? void 0 : _a.arrivalNoticeRefNo) || '';
     }
+    async arrivalNoticeNo(inventory) {
+        var _a;
+        if (!inventory.refOrderId)
+            return '';
+        let items = await (0, typeorm_1.getRepository)(inventory_1.Inventory).query(`
+      SELECT an.name as "arrivalNoticeNo" FROM arrival_notices an
+      WHERE an.id = '${inventory.refOrderId}'
+      LIMIT 1
+    `);
+        return ((_a = items[0]) === null || _a === void 0 ? void 0 : _a.arrivalNoticeNo) || '';
+    }
 };
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "inventory", privilege: "query")'),
@@ -786,8 +810,9 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
     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)('exportItem', type => Boolean, { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Array, typeof (_a = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _a : Object, Array, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, shell_1.Pagination, Array, Array, Boolean]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryQuery.prototype, "inventories", null);
 tslib_1.__decorate([
@@ -815,7 +840,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 (_b = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _b : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryQuery.prototype, "inventoriesByProduct", null);
 tslib_1.__decorate([
@@ -873,21 +898,9 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Array, typeof (_c = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _c : Object, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, shell_1.Pagination, Array]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryQuery.prototype, "inventoriesByBundle", null);
-tslib_1.__decorate([
-    (0, type_graphql_1.Directive)('@privilege(category: "inventory", privilege: "query")'),
-    (0, type_graphql_1.Query)(returns => inventory_types_1.InventoryList),
-    tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
-    tslib_1.__param(1, (0, type_graphql_1.Arg)('filters', type => [shell_1.Filter], { nullable: true })),
-    tslib_1.__param(2, (0, type_graphql_1.Arg)('pagination', type => shell_1.Pagination, { nullable: true })),
-    tslib_1.__param(3, (0, type_graphql_1.Arg)('sortings', type => [shell_1.Sorting], { nullable: true })),
-    tslib_1.__param(4, (0, type_graphql_1.Arg)('locationSortingRules', type => [shell_1.Sorting], { nullable: true })),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Array, typeof (_d = typeof shell_1.Pagination !== "undefined" && shell_1.Pagination) === "function" ? _d : Object, Array, Array]),
-    tslib_1.__metadata("design:returntype", Promise)
-], InventoryQuery.prototype, "inventoriesForExport", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "inventory", privilege: "query")'),
     (0, type_graphql_1.Directive)('@transaction'),
@@ -895,7 +908,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)
 ], InventoryQuery.prototype, "inventoriesGroupByProduct", null);
 tslib_1.__decorate([
@@ -947,6 +960,13 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [inventory_1.Inventory]),
     tslib_1.__metadata("design:returntype", Promise)
 ], InventoryQuery.prototype, "arrivalNoticeRefNo", null);
+tslib_1.__decorate([
+    (0, type_graphql_1.FieldResolver)(type => String),
+    tslib_1.__param(0, (0, type_graphql_1.Root)()),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [inventory_1.Inventory]),
+    tslib_1.__metadata("design:returntype", Promise)
+], InventoryQuery.prototype, "arrivalNoticeNo", null);
 InventoryQuery = tslib_1.__decorate([
     (0, type_graphql_1.Resolver)(inventory_1.Inventory)
 ], InventoryQuery);
@@ -1008,6 +1028,7 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
             break;
         case 'FEFO':
             qb.orderBy('"INV"."expiration_date"', 'ASC');
+            qb.addOrderBy('"INV"."created_at"', 'ASC');
             if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
                 locationSortingRules.forEach((rule, idx) => {
                     qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');
@@ -1016,6 +1037,7 @@ async function inventoriesByStrategy({ worksheetId, batchId, bizplaceId, product
             break;
         case 'FMFO':
             qb.orderBy('"INV"."manufacture_date"', 'ASC');
+            qb.addOrderBy('"INV"."created_at"', 'ASC');
             if ((locationSortingRules === null || locationSortingRules === void 0 ? void 0 : locationSortingRules.length) > 0) {
                 locationSortingRules.forEach((rule, idx) => {
                     qb.addOrderBy(`LOC.${rule.name}`, rule.desc ? 'DESC' : 'ASC');