@things-factory/sales-base 4.3.79-alpha.1 → 4.3.79

package/dist-server/service/purchase-order/purchase-order-query.js

@@ -102,7 +102,6 @@ async function getPurchaseOrderFunction(_, name, context, tx) {
             'supplier',
             'orderProducts',
             'orderProducts.product',
-            'orderProducts.productDetail',
             'otherCharges',
             'bufferLocation',
             'bizplace',

package/dist-server/service/purchase-order/purchase-order-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"purchase-order-query.js","sourceRoot":"","sources":["../../../server/service/purchase-order/purchase-order-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"purchase-order-query.js","sourceRoot":"","sources":["../../../server/service/purchase-order/purchase-order-query.ts"],"names":[],"mappings":"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"}

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

@@ -23,6 +23,7 @@ const biz_base_1 = require("@things-factory/biz-base");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
 const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
+const integration_sftp_1 = require("@things-factory/integration-sftp");
 const marketplace_base_1 = require("@things-factory/marketplace-base");
 // import { sendNotification } from '@things-factory/notification'
 const product_base_1 = require("@things-factory/product-base");
@@ -417,16 +418,20 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
         /** Validate Release Order Product Quantity */
         await utils_1.InventoryUtil.validateWarehousePartnersProductsQuantity(domain, bizplace, orderInventories, context, tx);
         /** End Validate Release Order Product Quantity Section */
-        const orderSource = releaseGood.source;
-        switch (orderSource) {
-            case auth_base_1.ApplicationType.SELLERCRAFT:
-                const sellercraft = await tx
-                    .getRepository(integration_sellercraft_1.Sellercraft)
-                    .findOne({ domain: bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+        if (releaseGood.type == 'b2c') {
+            const sellercraft = await tx
+                .getRepository(integration_sellercraft_1.Sellercraft)
+                .findOne({ domain: bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+            let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
+                where: { domain: bizplace.domain }
+            });
+            if (sellercraft) {
                 const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
                 await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood);
-                break;
-            case auth_base_1.ApplicationType.MMS:
+            }
+            else if (customerAvailableSftp) {
+            }
+            else {
                 const refNo = releaseGood.refNo;
                 const foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
                     where: {
@@ -459,54 +464,8 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
                         throw new Error('Existing release order found');
                     }
                 }
-                break;
-            default:
-                break;
+            }
         }
-        // if (releaseGood.type == 'b2c') {
-        //   const sellercraft: Sellercraft = await tx
-        //     .getRepository(Sellercraft)
-        //     .findOne({ domain: bizplace.domain, status: SellercraftStatus.ACTIVE })
-        //   let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-        //     where: { domain: bizplace.domain }
-        //   })
-        //   if (sellercraft) {
-        //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        //     await sellercraftCtrl.checkExistingReleaseGood(sellercraft, releaseGood)
-        //   } else if (customerAvailableSftp) {
-        //   } else {
-        //     const refNo: string = releaseGood.refNo
-        //     const foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-        //       where: {
-        //         domain: warehouseDomain,
-        //         refNo,
-        //         status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
-        //       },
-        //       relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
-        //     })
-        //     if (foundReleaseGood) {
-        //       const customerCompanyDomain: Domain = foundReleaseGood.bizplace.company.domain
-        //       const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        //         where: { orderNo: refNo, domain: customerCompanyDomain }
-        //       })
-        //       // Need to restructure the validation
-        //       if (marketplaceOrder?.isSplitted) {
-        //         const refNo2: string = releaseGood.refNo2
-        //         const foundSplittedReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-        //           where: {
-        //             domain: warehouseDomain,
-        //             refNo2,
-        //             status: Not(In([ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL]))
-        //           },
-        //           relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
-        //         })
-        //         if (foundSplittedReleaseGood) throw new Error('Existing release order found')
-        //       } else {
-        //         throw new Error('Existing release order found')
-        //       }
-        //     }
-        //   }
-        // }
         let newReleaseGood = new release_good_1.ReleaseGood();
         /** Generate Shipping Order */
         if (shippingOrder) {
@@ -561,15 +520,13 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
                 let splitOI = null;
                 const pbSettings = await tx.getRepository(product_base_1.ProductBundleSetting).find({
                     where: { productBundle: oi.product.id },
-                    relations: ['product', 'productBundle', 'productDetail']
+                    relations: ['product', 'productBundle']
                 });
                 pbSettings.forEach(pbs => {
                     splitOI = Object.assign(Object.assign({}, oi), { releaseQty: oi.releaseQty * pbs.bundleQty, releaseUomValue: oi.releaseUomValue * pbs.bundleQty * pbs.product.primaryValue, packingType: pbs.product.packingType, batchId: '', product: {
                             id: pbs.product.id,
                             name: pbs.product.name,
                             groupType: constants_1.PRODUCT_GROUP_TYPE.SINGLE
-                        }, productDetail: {
-                            id: pbs.productDetail.id
                         } });
                     splitBundleOIs.push(splitOI);
                 });
@@ -579,11 +536,8 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
         newReleaseGood.noOfItems = orderInventories.length;
         newReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(newReleaseGood);
         for (let oi of orderInventories) {
-            let productDetail = await tx
-                .getRepository(product_base_1.ProductDetail)
-                .findOne(oi.productDetail.id, { relations: ['product'] });
             let newOrderInv = Object.assign({}, oi);
-            newOrderInv = Object.assign(Object.assign({}, newOrderInv), { domain: warehouseDomain, bizplace: bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, product: productDetail.product, productDetail, creator: user, updater: user });
+            newOrderInv = Object.assign(Object.assign({}, newOrderInv), { domain: warehouseDomain, bizplace: bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, product: await tx.getRepository(product_base_1.Product).findOne(oi.product.id), creator: user, updater: user });
             let newOrderProduct = Object.assign(new order_product_1.OrderProduct(), newOrderInv);
             newOrderProduct = Object.assign(Object.assign({}, newOrderProduct), { packQty: 0, actualPackQty: 0, palletQty: 0, actualPalletQty: 0, status: constants_1.ORDER_PRODUCT_STATUS.ASSIGNED });
             newOrderProduct = await tx.getRepository(order_product_1.OrderProduct).save(newOrderProduct);
@@ -605,7 +559,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippi
                         locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true });
                     }
                 }
-                let assignedOrderInventories = await utils_1.InventoryUtil.autoAssignInventoryForRelease(oi, productDetail.product, productDetail, locationSortingRules, bizplace, warehouseDomain, tx, oi.batchId);
+                let assignedOrderInventories = await utils_1.InventoryUtil.autoAssignInventoryForRelease(newOrderInv.product, oi, oi.packingType, locationSortingRules, bizplace, warehouseDomain, tx, oi.batchId);
                 assignedOrderInventories = assignedOrderInventories.map(aoi => {
                     return Object.assign(Object.assign({}, aoi), { orderProduct: newOrderProduct });
                 });
@@ -695,22 +649,16 @@ async function confirmReleaseGood(name, context, tx) {
     let foundOVs = foundReleaseGood.orderVass;
     let customerBizplace = foundReleaseGood.bizplace;
     const companyDomain = customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.company.domain;
-    const orderSource = foundReleaseGood.source;
-    switch (orderSource) {
-        case auth_base_1.ApplicationType.SELLERCRAFT:
-            const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
-                where: { domain: foundReleaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE },
-                relations: ['domain']
-            });
+    const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
+        where: { domain: foundReleaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE },
+        relations: ['domain']
+    });
+    if (foundReleaseGood.type == 'b2c') {
+        if (sellercraft) {
             const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
-            if (foundReleaseGood.type == 'b2c') {
-                foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, foundReleaseGood), { orderProducts: foundOPs }));
-            }
-            else if (foundReleaseGood.type == 'b2b') {
-                await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER');
-            }
-            break;
-        case auth_base_1.ApplicationType.MMS:
+            foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, foundReleaseGood), { orderProducts: foundOPs }));
+        }
+        else {
             // find for any existing marketplace store connections
             let marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
                 where: { domain: companyDomain, status: 'ACTIVE' },
@@ -761,81 +709,14 @@ async function confirmReleaseGood(name, context, tx) {
                 const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
                 await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain);
             }
-            break;
-        default:
-            break;
+        }
+    }
+    if (foundReleaseGood.type == 'b2b') {
+        if (sellercraft) {
+            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+            await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER');
+        }
     }
-    // const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-    //   where: { domain: foundReleaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE },
-    //   relations: ['domain']
-    // })
-    // if (foundReleaseGood.type == 'b2c') {
-    //   if (sellercraft) {
-    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-    //     foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...foundReleaseGood, orderProducts: foundOPs })
-    //   } else {
-    //     // find for any existing marketplace store connections
-    //     let marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    //       where: { domain: companyDomain, status: 'ACTIVE' },
-    //       relations: ['marketplaceDistributors']
-    //     })
-    //     const foundMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-    //       where: { domain: companyDomain, orderNo: foundReleaseGood.refNo },
-    //       relations: ['marketplaceStore']
-    //     })
-    //     let matchedMarketplaceStore: MarketplaceStore
-    //     if (foundMarketplaceOrder) {
-    //       matchedMarketplaceStore = marketplaceStores.filter(
-    //         marketplaceStore => marketplaceStore.id == foundMarketplaceOrder.marketplaceStore.id
-    //       )[0]
-    //     }
-    //     let combinedOrderInventories: any[] = foundOIs.map(oi => {
-    //       return {
-    //         sku: oi.product.sku,
-    //         releaseQty: oi.releaseQty
-    //       }
-    //     })
-    //     if (foundBundleInfo?.length) {
-    //       foundBundleInfo.map(bundle => {
-    //         combinedOrderInventories.push({
-    //           sku: bundle.sku,
-    //           releaseQty: bundle.releaseQty
-    //         })
-    //       })
-    //     }
-    //     for (let oi of combinedOrderInventories) {
-    //       let foundMarketplaceProductVariations: MarketplaceProductVariation[] = await tx
-    //         .getRepository(MarketplaceProductVariation)
-    //         .find({
-    //           where: { domain: companyDomain, sku: oi.sku },
-    //           relations: ['marketplaceProduct', 'marketplaceProduct.marketplaceStore']
-    //         })
-    //       if (foundMarketplaceProductVariations) {
-    //         await Promise.all(
-    //           foundMarketplaceProductVariations.map(async variation => {
-    //             if (variation.marketplaceProduct.marketplaceStore.reserveEnabled) {
-    //               variation.reserveQty -= oi.releaseQty
-    //             }
-    //             await tx.getRepository(MarketplaceProductVariation).save(variation)
-    //           })
-    //         )
-    //       }
-    //     }
-    //     if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-    //       marketplaceStores = marketplaceStores.filter(marketplaceStore => marketplaceStore.isAutoUpdateStockQty)
-    //       let productIds: string[] = foundOIs.map(oi => oi.product.id)
-    //       productIds = Array.from(new Set([...productIds]))
-    //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-    //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, productIds, companyDomain)
-    //     }
-    //   }
-    // }
-    // if (foundReleaseGood.type == 'b2b') {
-    //   if (sellercraft) {
-    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-    //     await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'CONFIRM_ORDER')
-    //   }
-    // }
     // 1. RO Status change (PENDING => PENDING_RECEIVE)
     const releaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(Object.assign(Object.assign({}, foundReleaseGood), { status: constants_1.ORDER_STATUS.PENDING_RECEIVE, updater: user }));
     // 1. Update status of order inventories
@@ -992,27 +873,13 @@ async function rejectReleaseGood(tx, context, name, remark) {
         })));
     }
     if (foundOPs && foundOPs.length) {
-        const orderSource = releaseGood.source;
-        switch (orderSource) {
-            case auth_base_1.ApplicationType.SELLERCRAFT:
-                const sellercraft = await tx
-                    .getRepository(integration_sellercraft_1.Sellercraft)
-                    .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
-                if (sellercraft) {
-                    const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
-                    await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER');
-                }
-                break;
-            default:
-                break;
+        const sellercraft = await tx
+            .getRepository(integration_sellercraft_1.Sellercraft)
+            .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+        if (sellercraft) {
+            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+            await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER');
         }
-        // const sellercraft: Sellercraft = await tx
-        //   .getRepository(Sellercraft)
-        //   .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-        // if (sellercraft) {
-        //   const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        //   await sellercraftCtrl.updateSellercraftStock(sellercraft, foundOPs, 'REJECT_ORDER')
-        // }
         await tx.getRepository(order_product_1.OrderProduct).save(await Promise.all(foundOPs.map(async (op) => {
             op.status = constants_1.ORDER_PRODUCT_STATUS.REJECTED;
             op.updater = user;
@@ -1063,14 +930,14 @@ async function rejectReleaseGood(tx, context, name, remark) {
 }
 exports.rejectReleaseGood = rejectReleaseGood;
 async function bulkGenerateReleaseGood(releaseGood, bizplaceId, roNoSetting, domain, user, tx) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     try {
         let warehouseDomain = domain;
         let { orderInventories, shippingOrder } = releaseGood;
         let bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(bizplaceId);
         let newReleaseGood = Object.assign(Object.assign({}, releaseGood), { name: roNoSetting
                 ? await (0, id_rule_base_1.generateId)({ domain, type: constants_1.ORDER_NUMBER_RULE_TYPE.RO_NUMBER, seed: {} })
-                : utils_1.OrderNoGenerator.releaseGood(), domain: warehouseDomain, bizplace: bizplace, deliveryAddress1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress1) || null, deliveryAddress2: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) || null, deliveryAddress3: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) || null, deliveryAddress4: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress4) || null, attentionTo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionTo) || null, attentionCompany: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionCompany) || null, city: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.city) || null, state: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) || null, postalCode: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.postalCode) || null, country: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.country) || null, phone1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone1) || null, phone2: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone2) || null, email: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.email) || null, source: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.source) || null, airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill, refNo: releaseGood.refNo, refNo2: releaseGood.refNo2, refNo3: releaseGood.refNo3, releaseDate: releaseGood.releaseDate, ownTransport: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.ownTransport) || false, orderMethod: constants_1.ORDER_METHOD.SELECT_BY_PRODUCT, status: constants_1.ORDER_STATUS.PENDING, creator: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.creator) || user, updater: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.updater) || user });
+                : utils_1.OrderNoGenerator.releaseGood(), domain: warehouseDomain, bizplace: bizplace, deliveryAddress1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress1) || null, deliveryAddress2: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress2) || null, deliveryAddress3: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress3) || null, deliveryAddress4: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress4) || null, attentionTo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionTo) || null, attentionCompany: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionCompany) || null, city: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.city) || null, state: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) || null, postalCode: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.postalCode) || null, country: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.country) || null, phone1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone1) || null, phone2: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone2) || null, email: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.email) || null, airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill, refNo: releaseGood.refNo, refNo2: releaseGood.refNo2, refNo3: releaseGood.refNo3, releaseDate: releaseGood.releaseDate, ownTransport: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.ownTransport) || false, orderMethod: constants_1.ORDER_METHOD.SELECT_BY_PRODUCT, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user });
         newReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(newReleaseGood);
         /** Generate Shipping Order */
         if (shippingOrder) {
@@ -1096,20 +963,15 @@ async function bulkGenerateReleaseGood(releaseGood, bizplaceId, roNoSetting, dom
                     locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true });
                 }
             }
-            let productDetail = (_a = oi.orderProduct) === null || _a === void 0 ? void 0 : _a.productDetail;
-            let product = (_b = oi.orderProduct) === null || _b === void 0 ? void 0 : _b.product;
-            if (!productDetail) {
-                productDetail = await tx.getRepository(product_base_1.ProductDetail).findOne(oi.productDetailId, { relations: ['product'] });
-                product = productDetail.product;
-            }
-            let assignedResult = await utils_1.InventoryUtil.autoAssignInventoryForRelease(oi, product, productDetail, locationSortingRules, bizplace, warehouseDomain, tx);
+            const product = await tx.getRepository(product_base_1.Product).findOne(oi.productId);
+            let assignedResult = await utils_1.InventoryUtil.autoAssignInventoryForRelease(product, oi, oi.packingType, locationSortingRules, bizplace, warehouseDomain, tx);
             finalOrderInventories.push(...assignedResult.map(itm => {
                 return Object.assign(Object.assign({}, itm), { orderProduct: oi === null || oi === void 0 ? void 0 : oi.orderProduct });
             }));
         }
         for (let oi of finalOrderInventories) {
             let generatedOI = Object.assign(new order_inventory_1.OrderInventory(), oi);
-            generatedOI = Object.assign(Object.assign({}, generatedOI), { domain: warehouseDomain, bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, creator: (newReleaseGood === null || newReleaseGood === void 0 ? void 0 : newReleaseGood.creator) || user, updater: (newReleaseGood === null || newReleaseGood === void 0 ? void 0 : newReleaseGood.updater) || user });
+            generatedOI = Object.assign(Object.assign({}, generatedOI), { domain: warehouseDomain, bizplace, status: constants_1.ORDER_INVENTORY_STATUS.PENDING, name: utils_1.OrderNoGenerator.orderInventory(), releaseGood: newReleaseGood, creator: user, updater: user });
             let newOrderProduct;
             if (!(oi === null || oi === void 0 ? void 0 : oi.orderProduct)) {
                 newOrderProduct = {
@@ -1129,19 +991,19 @@ async function bulkGenerateReleaseGood(releaseGood, bizplaceId, roNoSetting, dom
                     actualPalletQty: 0,
                     status: constants_1.ORDER_PRODUCT_STATUS.ASSIGNED,
                     releaseGood: newReleaseGood,
-                    creator: (newReleaseGood === null || newReleaseGood === void 0 ? void 0 : newReleaseGood.creator) || user,
-                    updater: (newReleaseGood === null || newReleaseGood === void 0 ? void 0 : newReleaseGood.updater) || user
+                    creator: user,
+                    updater: user
                 };
                 newOrderProduct = await tx.getRepository(order_product_1.OrderProduct).save(newOrderProduct);
             }
             else {
-                newOrderProduct = await tx.getRepository(order_product_1.OrderProduct).save(Object.assign(Object.assign({}, oi.orderProduct), { totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`, status: constants_1.ORDER_PRODUCT_STATUS.ASSIGNED, updater: (newReleaseGood === null || newReleaseGood === void 0 ? void 0 : newReleaseGood.updater) || user }));
+                newOrderProduct = await tx.getRepository(order_product_1.OrderProduct).save(Object.assign(Object.assign({}, oi.orderProduct), { totalUomValue: `${oi.orderProduct.releaseUomValue} ${oi.orderProduct.uom}`, status: constants_1.ORDER_PRODUCT_STATUS.ASSIGNED, updater: user }));
             }
             await tx.getRepository(order_inventory_1.OrderInventory).save(Object.assign(Object.assign({}, generatedOI), { orderProduct: newOrderProduct }));
             // update inventory locked qty and uom value
             await tx.getRepository(warehouse_base_1.Inventory).update(oi.inventory.id, {
-                lockedQty: (((_c = oi.inventory) === null || _c === void 0 ? void 0 : _c.lockedQty) || 0) + generatedOI.releaseQty,
-                lockedUomValue: (((_d = oi.inventory) === null || _d === void 0 ? void 0 : _d.lockedUomValue) || 0) + generatedOI.releaseUomValue,
+                lockedQty: (((_a = oi.inventory) === null || _a === void 0 ? void 0 : _a.lockedQty) || 0) + generatedOI.releaseQty,
+                lockedUomValue: (((_b = oi.inventory) === null || _b === void 0 ? void 0 : _b.lockedUomValue) || 0) + generatedOI.releaseUomValue,
                 updater: user
             });
         }