@things-factory/sales-base 5.0.13 → 6.0.0-alpha.1

package/dist-server/service/release-good/release-good-query.js

@@ -1,17 +1,17 @@
 "use strict";
-var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bulkReleaseGoodsAvailableItemsFunction = exports.ReleaseGoodQuery = void 0;
 const tslib_1 = require("tslib");
-const orderBy_1 = tslib_1.__importDefault(require("lodash/orderBy"));
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
 const attachment_base_1 = require("@things-factory/attachment-base");
 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 shell_1 = require("@things-factory/shell");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../constants");
+const order_inventory_1 = require("../order-inventory/order-inventory");
 const release_good_1 = require("./release-good");
 const release_good_types_1 = require("./release-good-types");
 let ReleaseGoodQuery = class ReleaseGoodQuery {
@@ -48,174 +48,183 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
                     relation: false
                 });
             }
-            const qb = (0, typeorm_1.getRepository)(release_good_1.ReleaseGood).createQueryBuilder('rg');
+            const qb = (0, shell_1.getRepository)(release_good_1.ReleaseGood).createQueryBuilder('rg');
             (0, shell_1.buildQuery)(qb, params, context);
             let items;
             let total;
-            if (!params.filters.find((filter) => filter.name === 'releaseGoodOnly')) {
-                qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
-                qb.leftJoinAndSelect('rg.domain', 'domain');
-                qb.leftJoinAndSelect('rg.bizplace', 'bizplace');
-                qb.leftJoinAndSelect('rg.orderInventories', 'oi');
-                qb.leftJoinAndSelect('rg.orderProducts', 'op');
-                qb.leftJoinAndSelect('oi.inventory', 'inv');
-                qb.leftJoinAndSelect('oi.product', 'prod');
-                qb.leftJoinAndSelect('rg.arrivalNotice', 'an');
-                qb.leftJoinAndSelect('rg.creator', 'creator');
-                qb.leftJoinAndSelect('rg.updater', 'updater');
-                qb.leftJoin(subQuery => {
-                    return subQuery
-                        .select(`ccd.rank`, 'rank')
-                        .addSelect(`ccd.name`, 'status')
-                        .from(`common_code_details`, 'ccd')
-                        .innerJoin(`ccd.commonCode`, 'cc')
-                        .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
-                        .andWhere(`cc.name = 'RO_LIST_STATUS'`);
-                }, 'cc', 'cc.status = rg.status');
-                const arrChildSortData = ['bizplace'];
-                const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
-                        ? 'DESC'
-                        : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
-                qb.orderBy(sort);
-                let [itemsRes, totalRes] = await qb.getManyAndCount();
-                items = itemsRes;
-                total = totalRes;
-            }
-            else {
-                let itemsRes = await qb.getOne();
-                items = itemsRes ? [itemsRes] : [];
-                total = items.length;
-            }
+            qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
+            qb.leftJoinAndSelect('rg.domain', 'domain');
+            qb.leftJoinAndSelect('rg.bizplace', 'bizplace');
+            qb.leftJoinAndSelect('rg.orderInventories', 'oi');
+            qb.leftJoinAndSelect('rg.orderProducts', 'op');
+            qb.leftJoinAndSelect('oi.inventory', 'inv');
+            qb.leftJoinAndSelect('oi.product', 'prod');
+            qb.leftJoinAndSelect('rg.arrivalNotice', 'an');
+            qb.leftJoinAndSelect('rg.creator', 'creator');
+            qb.leftJoinAndSelect('rg.updater', 'updater');
+            qb.leftJoin(subQuery => {
+                return subQuery
+                    .select(`ccd.rank`, 'rank')
+                    .addSelect(`ccd.name`, 'status')
+                    .from(`common_code_details`, 'ccd')
+                    .innerJoin(`ccd.commonCode`, 'cc')
+                    .where(`ccd.domain_id = :domainId`, { domainId: domain.id })
+                    .andWhere(`cc.name = 'RO_LIST_STATUS'`);
+            }, 'cc', 'cc.status = rg.status');
+            const arrChildSortData = ['bizplace'];
+            const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
+                    ? 'DESC'
+                    : 'ASC' })), !params.sortings.some(e => e.name === 'status') ? { rank: 'ASC' } : {});
+            qb.orderBy(sort);
+            let [itemsRes, totalRes] = await qb.getManyAndCount();
+            items = itemsRes;
+            total = totalRes;
             return { items, total };
         }
         catch (error) {
             throw error;
         }
     }
-    async releaseGood(context, name) {
+    async releaseGood(context, name, trackingNo) {
         const { domain, user } = context.state;
-        return await (0, typeorm_1.getRepository)(release_good_1.ReleaseGood).findOne({
-            where: {
-                domain,
-                name,
-                bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user))
-            },
-            relations: [
-                'domain',
-                'bizplace',
-                'shippingOrder',
-                'arrivalNotice',
-                'orderInventories',
-                'orderInventories.product',
-                'orderInventories.inventory',
-                'orderInventories.inventory.product',
-                'orderVass',
-                'orderVass.vas',
-                'creator',
-                'updater'
-            ]
-        });
+        if (name) {
+            return await (0, shell_1.getRepository)(release_good_1.ReleaseGood).findOne({
+                where: {
+                    domain: { id: domain.id },
+                    name,
+                    bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user))
+                },
+                relations: [
+                    'domain',
+                    'bizplace',
+                    'shippingOrder',
+                    'arrivalNotice',
+                    'orderInventories',
+                    'orderInventories.product',
+                    'orderInventories.inventory',
+                    'orderInventories.inventory.product',
+                    'orderVass',
+                    'orderVass.vas',
+                    'creator',
+                    'updater'
+                ]
+            });
+        }
+        else if (trackingNo) {
+            let releaseGood = await (0, shell_1.getRepository)(release_good_1.ReleaseGood).findOne({
+                where: {
+                    domain: { id: domain.id },
+                    trackingNo,
+                    bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user))
+                },
+                relations: ['bizplace']
+            });
+            if (!releaseGood) {
+                throw new Error('Tracking No not found in any orders');
+            }
+            else {
+                return releaseGood;
+            }
+        }
     }
     async releaseGoodDetail(context, refNo, name) {
-        const { domain, tx } = context.state;
-        let param;
-        if (name)
-            param = { domain, name };
-        else
-            param = { domain, refNo };
-        const releaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
-            where: Object.assign({}, param),
-            relations: [
-                'domain',
-                'bizplace',
-                'shippingOrder',
-                'arrivalNotice',
-                'orderInventories',
-                'orderInventories.inventory',
-                'orderInventories.product',
-                'orderInventories.inventory.product',
-                'orderInventories.inventory.location',
-                'orderVass',
-                'orderVass.vas',
-                'orderVass.targetProduct',
-                'orderVass.inventory',
-                'creator',
-                'updater',
-                'deliverTo'
-            ]
-        });
-        if (releaseGood) {
-            const roBizId = releaseGood.bizplace.id;
-            const shippingOrder = releaseGood.shippingOrder;
-            const foundAttachments = await tx.getRepository(attachment_base_1.Attachment).find({
-                where: {
-                    domain,
-                    refBy: releaseGood.id,
-                    category: constants_1.ATTACHMENT_TYPE.DELIVERY_ORDER
-                }
+        try {
+            const { domain, tx } = context.state;
+            let param;
+            if (name)
+                param = { domain, name };
+            else
+                param = { domain, refNo };
+            const releaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
+                where: Object.assign({}, param),
+                relations: [
+                    'domain',
+                    'bizplace',
+                    'shippingOrder',
+                    'arrivalNotice',
+                    'orderProducts',
+                    'orderProducts.product',
+                    'orderVass',
+                    'orderVass.vas',
+                    'orderVass.targetProduct',
+                    'orderVass.inventory',
+                    'creator',
+                    'updater'
+                ]
             });
-            await prepOITempTable(domain, tx);
-            let invInfos = await Promise.all(releaseGood.orderInventories
-                .filter(itm => itm.status !== constants_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT && itm.status !== constants_1.ORDER_INVENTORY_STATUS.REPLACED)
-                .map(async (orderInv) => {
-                var _a;
-                if ((_a = orderInv === null || orderInv === void 0 ? void 0 : orderInv.inventory) === null || _a === void 0 ? void 0 : _a.id) {
-                    const inventory = orderInv.inventory;
-                    return {
-                        id: inventory.id,
-                        name: inventory.name,
-                        batchId: inventory.batchId,
-                        batchIdRef: inventory.batchIdRef,
-                        palletId: inventory.palletId,
-                        product: inventory.product,
-                        productIdRef: inventory.product.id,
-                        productName: `${inventory.product.name} (${inventory.product.description})`,
-                        packingType: inventory.packingType,
-                        packingSize: inventory.packingSize,
-                        location: inventory.location,
-                        qty: inventory.qty,
-                        lockedQty: inventory.lockedQty,
-                        lockedUomValue: inventory.lockedUomValue,
-                        uom: inventory.uom,
-                        uomValue: inventory.uomValue,
-                        invStatus: inventory.status,
-                        releaseQty: orderInv.releaseQty,
-                        releaseUomValue: orderInv.releaseUomValue,
-                        status: orderInv.status
-                    };
-                }
-                else {
-                    const { batchId, batchIdRef, product, packingType, packingSize, releaseQty, releaseUomValue } = orderInv;
-                    const { id: productIdRef, name: productName } = product;
-                    const { qty, uomValue, uom } = await getAvailableAmount(roBizId, productIdRef, batchId, packingType, tx);
-                    return {
-                        batchId,
-                        batchIdRef,
-                        productIdRef,
-                        product,
-                        productName,
-                        packingType,
-                        packingSize,
-                        qty,
-                        uom,
-                        uomValue,
-                        releaseQty,
-                        releaseUomValue
-                    };
-                }
-            }));
-            const result = Object.assign(Object.assign({}, releaseGood), { attachment: foundAttachments, shippingOrderInfo: {
-                    containerNo: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerNo) || '',
-                    containerLeavingDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerLeavingDate) || '',
-                    containerArrivalDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerArrivalDate) || '',
-                    shipName: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.shipName) || ''
-                }, inventoryInfos: (0, orderBy_1.default)(invInfos, ['product.sku'], ['asc']) });
-            dropOITempTable(domain, tx);
-            return result;
+            if (releaseGood) {
+                let oiQb = tx
+                    .getRepository(order_inventory_1.OrderInventory)
+                    .createQueryBuilder('oi')
+                    .leftJoinAndSelect('oi.inventory', 'inventory')
+                    .leftJoinAndSelect('oi.product', 'product')
+                    .leftJoinAndSelect('inventory.location', 'location')
+                    .where('oi.domain_id = :domainId', { domainId: domain.id })
+                    .andWhere('oi.release_good_id = :releaseGoodId', { releaseGoodId: releaseGood.id })
+                    .andWhere('oi.status NOT IN (:...orderInventoryStatus)', {
+                    orderInventoryStatus: [constants_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT, constants_1.ORDER_INVENTORY_STATUS.REPLACED]
+                })
+                    .orderBy('product.sku', 'ASC');
+                let orderInventories = await oiQb.getMany();
+                const shippingOrder = releaseGood.shippingOrder;
+                const foundAttachments = await tx.getRepository(attachment_base_1.Attachment).find({
+                    where: {
+                        domain,
+                        refBy: releaseGood.id,
+                        category: constants_1.ATTACHMENT_TYPE.DELIVERY_ORDER
+                    }
+                });
+                let invInfos = await Promise.all(orderInventories.map(async (orderInv) => {
+                    var _a;
+                    if ((_a = orderInv === null || orderInv === void 0 ? void 0 : orderInv.inventory) === null || _a === void 0 ? void 0 : _a.id) {
+                        const inventory = orderInv.inventory;
+                        return {
+                            id: inventory.id,
+                            name: inventory.name,
+                            batchId: inventory.batchId,
+                            batchIdRef: inventory.batchIdRef,
+                            palletId: inventory.palletId,
+                            product: orderInv.product,
+                            productIdRef: orderInv.product.id,
+                            productName: `${orderInv.product.name} (${orderInv.product.description})`,
+                            packingType: orderInv.packingType,
+                            packingSize: orderInv.packingSize,
+                            location: inventory.location,
+                            qty: inventory.qty,
+                            lockedQty: inventory.lockedQty,
+                            lockedUomValue: inventory.lockedUomValue,
+                            uom: inventory.uom,
+                            uomValue: inventory.uomValue,
+                            invStatus: inventory.status,
+                            releaseQty: orderInv.releaseQty,
+                            releaseUomValue: orderInv.releaseUomValue,
+                            status: orderInv.status,
+                            refWorksheetId: orderInv.refWorksheetId
+                        };
+                    }
+                }));
+                const result = Object.assign(Object.assign({}, releaseGood), { attachment: foundAttachments, shippingOrderInfo: {
+                        containerNo: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerNo) || '',
+                        containerSize: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerSize) || '',
+                        containerLeavingDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerLeavingDate) || '',
+                        containerArrivalDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerArrivalDate) || '',
+                        containerClosureDate: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.containerClosureDate) || '',
+                        shipName: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.shipName) || '',
+                        remark: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.remark) || '',
+                        remindContainerDeparture: (shippingOrder === null || shippingOrder === void 0 ? void 0 : shippingOrder.remindContainerDeparture) || null
+                    }, inventoryInfos: invInfos });
+                return result;
+            }
+        }
+        catch (error) {
+            env_1.logger.error(`release-good-query[releaseGoodDetail]: ${error}`);
+            throw new Error(error);
         }
     }
     async releaseGoodRequests(context, params) {
+        var _a, _b, _c;
         try {
+            console.time('t1');
             const { domain, user } = context.state;
             const statusFilter = params.filters.some(e => e.name === 'status');
             const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId');
@@ -223,6 +232,9 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
             const skuFilter = params.filters.find(param => param.name === 'sku');
             const routeId = params.filters.find(param => param.name === 'routeId');
             const orderRemarkFilter = params.filters.find(param => param.name === 'orderRemark');
+            const manifestedFilter = params.filters.find(param => param.name === 'manifested');
+            const orderInfoFilter = params.filters.find(param => param.name === 'name');
+            const typeFilter = (_a = params.filters.find(param => param.name === 'type')) === null || _a === void 0 ? void 0 : _a.value;
             if (await (0, auth_base_1.checkUserBelongsDomain)(domain, user)) {
                 if (!statusFilter && !params.filters.some(e => e.name === 'name')) {
                     params.filters.push({
@@ -244,6 +256,9 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
             if (skuFilter) {
                 params.filters = params.filters.filter(param => param.name !== 'sku');
             }
+            if (orderInfoFilter) {
+                params.filters = params.filters.filter(param => param.name !== 'name');
+            }
             if (routeId) {
                 if (routeId.value == true) {
                     params.filters.find(param => param.name === 'routeId').value = 'null';
@@ -274,32 +289,55 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
                     });
                 }
             }
+            if (manifestedFilter) {
+                const manifestedIdx = params.filters.findIndex(param => param.name === 'manifested');
+                if (manifestedFilter.value == true) {
+                    params.filters.splice(manifestedIdx, 1);
+                    params.filters.push({
+                        name: 'manifestId',
+                        operator: 'is_not_null',
+                        value: null,
+                        relation: false
+                    });
+                }
+                else {
+                    params.filters.splice(manifestedIdx, 1);
+                    params.filters.push({
+                        name: 'manifestId',
+                        operator: 'is_null',
+                        value: null,
+                        relation: false
+                    });
+                }
+            }
             const fromDateParamIdx = params.filters.findIndex(param => param.name === 'fromDate');
             if (fromDateParamIdx >= 0) {
                 let fromDateVal = new Date(params.filters[fromDateParamIdx].value);
+                let releaseDateFrom = (_b = params.filters.find(param => param.name === 'fromDate')) === null || _b === void 0 ? void 0 : _b.value;
                 params.filters.splice(fromDateParamIdx, 1);
                 params.filters.push({
-                    name: 'createdAt',
+                    name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
                     operator: 'gte',
-                    value: fromDateVal.toISOString(),
+                    value: typeFilter == 'b2c' ? releaseDateFrom : fromDateVal.toISOString(),
                     relation: false
                 });
             }
             const toDateParamIdx = params.filters.findIndex(param => param.name === 'toDate');
             if (toDateParamIdx >= 0) {
                 let toDateVal = new Date(params.filters[toDateParamIdx].value);
+                let releaseDateTo = (_c = params.filters.find(param => param.name === 'toDate')) === null || _c === void 0 ? void 0 : _c.value;
                 params.filters.splice(toDateParamIdx, 1);
                 params.filters.push({
-                    name: 'createdAt',
-                    operator: 'lt',
-                    value: new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
+                    name: typeFilter == 'b2c' ? 'releaseDate' : 'createdAt',
+                    operator: typeFilter == 'b2c' ? 'lte' : 'lt',
+                    value: typeFilter == 'b2c' ? releaseDateTo : new Date(toDateVal.setDate(toDateVal.getDate() + 1)).toISOString(),
                     relation: false
                 });
             }
             if (noOfItemsFilter && noOfItemsFilter.value == 1) {
                 params.filters.find(param => param.name === 'noOfItems').operator = 'eq';
             }
-            const qb = (0, typeorm_1.getRepository)(release_good_1.ReleaseGood).createQueryBuilder('rg');
+            const qb = (0, shell_1.getRepository)(release_good_1.ReleaseGood).createQueryBuilder('rg');
             (0, shell_1.buildQuery)(qb, params, context);
             qb.addSelect('COALESCE("cc".rank, 99999)', 'rank');
             qb.leftJoinAndSelect('rg.domain', 'domain');
@@ -319,13 +357,47 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
                     .andWhere(`cc.name = 'RO_REQUESTS_STATUS'`);
             }, 'cc', 'cc.status = rg.status');
             if (skuFilter) {
+                let removeSymbol = skuFilter.value
+                    .split('')
+                    .filter(res => res !== '%')
+                    .join('');
+                let products = removeSymbol
+                    .toLowerCase()
+                    .split(',')
+                    .map(prod => {
+                    return "'%" + prod.trim().replace(/'/g, "''") + "%'";
+                })
+                    .join(',');
                 qb.andWhere(`
         exists (select * from  order_inventories oi  
         inner join products p on oi.product_id = p.id
         inner join inventories i on i.product_id = p.id
         where oi.release_good_id = rg.id
-        and lower(p.sku) like :sku)
-        `, { sku: skuFilter.value.toLowerCase() });
+        and (lower(p.sku) like any(array[${products}])
+        or lower(p.brand_sku) like any(array[${products}])
+        or lower(p.name) like any(array[${products}])
+        or lower(p.description) like any(array[${products}]))
+        )
+        `);
+            }
+            if (orderInfoFilter) {
+                let removeSymbol = orderInfoFilter.value
+                    .split('')
+                    .filter(res => res !== '%')
+                    .join('');
+                let orderInfos = removeSymbol
+                    .toLowerCase()
+                    .split(',')
+                    .map(prod => {
+                    return "'%" + prod.trim().replace(/'/g, "''") + "%'";
+                })
+                    .join(',');
+                qb.andWhere(`(
+          lower(rg.name) like any(array[${orderInfos}])
+          or lower(rg.ref_no) like any(array[${orderInfos}])
+          or lower(rg.ref_no_2) like any(array[${orderInfos}])
+          or lower(rg.ref_no_3) like any(array[${orderInfos}])
+        )`);
             }
             const arrChildSortData = ['bizplace', 'creator'];
             const sort = (params.sortings || []).reduce((acc, sort) => (Object.assign(Object.assign({}, acc), { [arrChildSortData.indexOf(sort.name) >= 0 ? sort.name + '.name' : 'rg.' + sort.name]: sort.desc
@@ -333,12 +405,18 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
                     : 'ASC' })), params.sortings.length < 1 ? { rank: 'ASC', 'rg.createdAt': 'DESC' } : {});
             qb.orderBy(sort);
             let [items, total] = await qb.getManyAndCount();
-            items = items.map(item => {
+            items = items
+                .filter(item => {
+                return item.domainId === domain.id;
+            })
+                .map(item => {
                 return Object.assign(Object.assign({}, item), { orderRemark: (item === null || item === void 0 ? void 0 : item.remark) ? true : false });
             });
+            console.timeEnd('t1');
             return { items, total };
         }
         catch (error) {
+            env_1.logger.error(`release-good-query[releaseGoodRequests]: ${error}`);
             throw error;
         }
     }
@@ -407,7 +485,7 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
         OFFSET ${pagination.limit * (pagination.page - 1)}
         LIMIT ${pagination.limit}
     `;
-        const invRepo = (0, typeorm_1.getRepository)(warehouse_base_1.Inventory);
+        const invRepo = (0, shell_1.getRepository)(warehouse_base_1.Inventory);
         let items = await invRepo.query(`
       ${SELECT} ${FROM} ${WHERE} ${GROUP_BY} ${OFFSET_LIMIT}
     `);
@@ -441,13 +519,13 @@ let ReleaseGoodQuery = class ReleaseGoodQuery {
         return availableItems;
     }
     async domain(releaseGood) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(releaseGood.domainId);
+        return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: releaseGood.domainId });
     }
     async creator(releaseGood) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(releaseGood.creatorId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: releaseGood.creatorId });
     }
     async updater(releaseGood) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(releaseGood.updaterId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: releaseGood.updaterId });
     }
 };
 tslib_1.__decorate([
@@ -456,16 +534,17 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
     tslib_1.__param(1, (0, type_graphql_1.Args)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object]),
+    tslib_1.__metadata("design:paramtypes", [Object, shell_1.ListParam]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ReleaseGoodQuery.prototype, "releaseGoods", null);
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "order", privilege: "query")'),
     (0, type_graphql_1.Query)(returns => release_good_1.ReleaseGood),
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
-    tslib_1.__param(1, (0, type_graphql_1.Arg)('name')),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('name', { nullable: true })),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('trackingNo', { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ReleaseGoodQuery.prototype, "releaseGood", null);
 tslib_1.__decorate([
@@ -485,7 +564,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
     tslib_1.__param(1, (0, type_graphql_1.Args)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, typeof (_b = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _b : Object]),
+    tslib_1.__metadata("design:paramtypes", [Object, shell_1.ListParam]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ReleaseGoodQuery.prototype, "releaseGoodRequests", null);
 tslib_1.__decorate([
@@ -496,7 +575,7 @@ 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)
 ], ReleaseGoodQuery.prototype, "releasableInventories", null);
 tslib_1.__decorate([
@@ -536,7 +615,7 @@ ReleaseGoodQuery = tslib_1.__decorate([
 exports.ReleaseGoodQuery = ReleaseGoodQuery;
 async function prepOITempTable(domain, tx) {
     await tx.query(`
-    CREATE TEMP TABLE oi AS (
+    CREATE TEMP TABLE oi ON COMMIT DROP AS (
       SELECT
         SUM(oi.release_qty) as release_qty,
         SUM(oi.release_uom_value) as release_uom_value,