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

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

@@ -13,10 +13,11 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
 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");
-const notification_1 = require("@things-factory/notification");
 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");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
+// import { NewOrderProduct } from '../order-product/order-product-types'
 const constants_1 = require("../../constants");
 const controllers_1 = require("../../controllers");
 const errors_1 = require("../../errors");
@@ -38,10 +39,10 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
         if (!bizplaceId)
             throw new Error('company ID is not provided');
         let createdReleaseGoods = [];
-        const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+        const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
         const roNoSetting = await settingRepo.findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 name: constants_1.ORDER_NUMBER_SETTING_KEY.RO_NUMBER_RULE
             }
         });
@@ -88,17 +89,17 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
     async deleteReleaseGoods(names, context) {
         const { tx } = context.state;
         await tx.getRepository(release_good_1.ReleaseGood).delete({
-            domain: context.state.domain,
+            domain: { id: context.state.domain.id },
             name: (0, typeorm_1.In)(names)
         });
         return true;
     }
-    async generateReleaseGood(context, attachments, releaseGood, shippingOrder) {
+    async generateReleaseGood(context, attachments, releaseGood, shippingOrder, shippingOrderInfo) {
         const { tx } = context.state;
-        const createdReleaseGood = await generateReleaseGoodFunction(null, releaseGood, shippingOrder, attachments, context, tx);
+        const createdReleaseGood = await generateReleaseGoodFunction(null, releaseGood, shippingOrder, shippingOrderInfo, attachments, context, tx);
         return createdReleaseGood;
     }
-    async updateReleaseGoodDetails(context, releaseGood, shippingOrder) {
+    async updateReleaseGoodDetails(context, releaseGood, shippingOrder, shippingOrderInfo) {
         const { tx, domain, user } = context.state;
         let foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
             where: { id: releaseGood.id, domain },
@@ -108,6 +109,11 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
             throw new Error(`Release order ${releaseGood.id} is not found.`);
         }
         // case to update existing shippingOrder
+        if (shippingOrder !== null) {
+            shippingOrder.remark = shippingOrder.exportRemark;
+            shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate);
+            delete shippingOrder.exportRemark;
+        }
         if (foundReleaseGood.shippingOrder && shippingOrder) {
             await tx.getRepository(shipping_order_1.ShippingOrder).update(foundReleaseGood.shippingOrder.id, shippingOrder);
         }
@@ -116,7 +122,7 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
             let newShippingOrder = await tx.getRepository(shipping_order_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: utils_1.OrderNoGenerator.shippingOrder(), domain, bizplace: await (0, biz_base_1.getMyBizplace)(domain, user), status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
             releaseGood.shippingOrder = newShippingOrder;
         }
-        foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(Object.assign(Object.assign(Object.assign({}, foundReleaseGood), releaseGood), { remark: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark) ? releaseGood.remark : null }));
+        foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(Object.assign(Object.assign(Object.assign(Object.assign({}, foundReleaseGood), releaseGood), shippingOrderInfo), { remark: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark) ? releaseGood.remark : null }));
         return foundReleaseGood;
     }
     async confirmReleaseGood(name, context) {
@@ -124,7 +130,8 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
         const releaseGood = await confirmReleaseGood(name, context, tx);
         // If current RO has cross docking
         if (releaseGood.crossDocking) {
-            const { arrivalNotice } = await tx.getRepository(release_good_1.ReleaseGood).findOne(releaseGood.id, {
+            const { arrivalNotice } = await tx.getRepository(release_good_1.ReleaseGood).findOne({
+                where: { id: releaseGood.id },
                 relations: ['arrivalNotice']
             });
             // If status of related GAN is not equal to PENDING_RECEIVE (i.e. Wasn't confirmed yet.)
@@ -145,7 +152,7 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
     }
     async addReleaseGood(context, releaseGood, shippingOrder, file) {
         const { tx } = context.state;
-        const createdRO = await generateReleaseGoodFunction(null, releaseGood, shippingOrder, file, context, tx);
+        const createdRO = await generateReleaseGoodFunction(null, releaseGood, shippingOrder, null, file, context, tx);
         const confirmedRO = await confirmReleaseGood(createdRO.name, context, tx);
         const receivedRO = await receiveReleaseGood(confirmedRO.name, context, tx);
         return receivedRO;
@@ -153,7 +160,7 @@ let ReleaseGoodMutation = class ReleaseGoodMutation {
     async executeOrderRemark(releaseGoodNo, context) {
         const { domain, tx, user } = context.state;
         await tx.getRepository(release_good_1.ReleaseGood).update({
-            domain,
+            domain: { id: domain.id },
             name: releaseGoodNo
         }, {
             checkedRemarkAt: new Date(),
@@ -202,9 +209,11 @@ tslib_1.__decorate([
     tslib_1.__param(1, (0, type_graphql_1.Arg)('attachments', type => [GraphQLUpload_js_1.default], { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('releaseGood', type => release_good_types_1.NewReleaseGood, { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('shippingOrder', type => shipping_order_types_1.ShippingOrderPatch, { nullable: true })),
+    tslib_1.__param(4, (0, type_graphql_1.Arg)('shippingOrderInfo', type => release_good_types_1.ShippingOrderInfoPatch, { nullable: true })),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Array, release_good_types_1.NewReleaseGood,
-        shipping_order_types_1.ShippingOrderPatch]),
+        shipping_order_types_1.ShippingOrderPatch,
+        release_good_types_1.ShippingOrderInfoPatch]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ReleaseGoodMutation.prototype, "generateReleaseGood", null);
 tslib_1.__decorate([
@@ -214,9 +223,11 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('releaseGood', type => release_good_types_1.ReleaseGoodPatch, { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('shippingOrder', type => shipping_order_types_1.ShippingOrderPatch, { nullable: true })),
+    tslib_1.__param(3, (0, type_graphql_1.Arg)('shippingOrderInfo', type => release_good_types_1.ShippingOrderInfoPatch, { nullable: true })),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, release_good_types_1.ReleaseGoodPatch,
-        shipping_order_types_1.ShippingOrderPatch]),
+        shipping_order_types_1.ShippingOrderPatch,
+        release_good_types_1.ShippingOrderInfoPatch]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ReleaseGoodMutation.prototype, "updateReleaseGoodDetails", null);
 tslib_1.__decorate([
@@ -279,7 +290,7 @@ exports.ReleaseGoodMutation = ReleaseGoodMutation;
 async function deleteReleaseGood(tx, name, user, domain) {
     var _a;
     let foundReleaseOrder = await tx.getRepository(release_good_1.ReleaseGood).findOne({
-        where: { domain, name },
+        where: { domain: { id: domain.id }, name },
         relations: [
             'arrivalNotice',
             'orderInventories',
@@ -292,7 +303,7 @@ async function deleteReleaseGood(tx, name, user, domain) {
         ]
     });
     if (!foundReleaseOrder)
-        throw new Error(`Arrival notice doesn't exists.`);
+        throw new Error(`Release order doesn't exists.`);
     const foundOIs = foundReleaseOrder.orderInventories;
     const foundOVs = foundReleaseOrder.orderVass;
     const foundSO = foundReleaseOrder.shippingOrder;
@@ -300,7 +311,7 @@ async function deleteReleaseGood(tx, name, user, domain) {
     if (foundReleaseOrder === null || foundReleaseOrder === void 0 ? void 0 : foundReleaseOrder.ownTransport) {
         foundAttachment = await tx.getRepository(attachment_base_1.Attachment).findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 refBy: foundReleaseOrder.id,
                 category: constants_1.ATTACHMENT_TYPE.DELIVERY_ORDER
             }
@@ -310,7 +321,7 @@ async function deleteReleaseGood(tx, name, user, domain) {
     await Promise.all(foundOIs.map(async (oi) => {
         var _a, _b;
         if ((_a = oi === null || oi === void 0 ? void 0 : oi.inventory) === null || _a === void 0 ? void 0 : _a.id) {
-            oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(oi.inventory.id);
+            oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: oi.inventory.id });
             await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, oi.inventory), { lockedQty: oi.inventory.lockedQty - oi.releaseQty, lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue, updater: user }));
         }
         await tx.getRepository(order_inventory_1.OrderInventory).delete({ id: oi.id });
@@ -345,20 +356,21 @@ async function deleteReleaseGood(tx, name, user, domain) {
     return true;
 }
 exports.deleteReleaseGood = deleteReleaseGood;
-async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attachments, context, tx) {
-    var _a, _b;
+async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, shippingOrderInfo, attachments, context, tx) {
+    var _a, _b, _c, _d, _e;
     try {
         const { domain, user } = context.state;
-        const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+        const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
         // let orderInventories: OrderInventory[] = releaseGood.orderInventories
         // let orderVass: OrderVas[] = releaseGood.orderVass
         let { orderInventories, orderVass } = releaseGood;
         let bizplace;
         let warehouseDomain = domain;
+        let finalOrderInventories = [];
         if (releaseGood.deliverTo) {
             const deliverTo = await tx
                 .getRepository(biz_base_1.ContactPoint)
-                .findOne({ where: { bizplace: releaseGood.deliverTo, domain }, relation: ['bizplace'] });
+                .findOne({ where: { bizplace: releaseGood.deliverTo, domain }, relations: ['bizplace'] });
             if (!deliverTo)
                 throw new Error('contact point does not exist');
             releaseGood.deliverTo = deliverTo;
@@ -406,7 +418,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         if (releaseGood.type == 'b2c') {
             const sellercraft = await tx
                 .getRepository(integration_sellercraft_1.Sellercraft)
-                .findOne({ domain: bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+                .findOneBy({ domain: bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
             let customerAvailableSftp = await tx.getRepository(integration_sftp_1.Sftp).findOne({
                 where: { domain: bizplace.domain }
             });
@@ -420,7 +432,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
                 const refNo = releaseGood.refNo;
                 const foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
                     where: {
-                        domain: warehouseDomain,
+                        domain: { id: warehouseDomain.id },
                         refNo,
                         status: (0, typeorm_1.Not)((0, typeorm_1.In)([constants_1.ORDER_STATUS.CANCELLED, constants_1.ORDER_STATUS.PENDING_CANCEL]))
                     },
@@ -436,7 +448,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
                         const refNo2 = releaseGood.refNo2;
                         const foundSplittedReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
                             where: {
-                                domain: warehouseDomain,
+                                domain: { id: warehouseDomain.id },
                                 refNo2,
                                 status: (0, typeorm_1.Not)((0, typeorm_1.In)([constants_1.ORDER_STATUS.CANCELLED, constants_1.ORDER_STATUS.PENDING_CANCEL]))
                             },
@@ -454,6 +466,11 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         let newReleaseGood = new release_good_1.ReleaseGood();
         /** Generate Shipping Order */
         if (shippingOrder) {
+            shippingOrder.remark = shippingOrder.exportRemark;
+            if (shippingOrder.containerClosureDate !== undefined) {
+                shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate);
+            }
+            delete shippingOrder.exportRemark;
             const createdSO = await tx.getRepository(shipping_order_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: utils_1.OrderNoGenerator.shippingOrder(), domain,
                 bizplace, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
             newReleaseGood.shippingOrder = createdSO;
@@ -462,18 +479,24 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         // find RO number rule setting
         const roNoSetting = await settingRepo.findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 name: constants_1.ORDER_NUMBER_SETTING_KEY.RO_NUMBER_RULE
             }
         });
         newReleaseGood = Object.assign(Object.assign({}, newReleaseGood), { 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, collectionOrderNo: releaseGood.collectionOrderNo, courierOption: releaseGood.courierOption, exportOption: releaseGood.exportOption, ownTransport: releaseGood.ownTransport, packingOption: releaseGood.packingOption, marketplaceOrderStatus: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus) || null, billingAddress: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingAddress) || null, deliverTo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliverTo) || null, 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, deliveryAddress5: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress5) || 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, transporter: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter, trackingNo: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo, airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill, invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice, refNo: releaseGood.refNo, refNo2: releaseGood.refNo2, refNo3: releaseGood.refNo3, remark: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark) || null, releaseDate: releaseGood.releaseDate, truckNo: releaseGood.truckNo, bundleInfo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.bundleInfo) || [], orderInventories: releaseGood.orderInventories, type: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.type) ? releaseGood.type : 'b2b', status: constants_1.ORDER_STATUS.PENDING, storeName: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.storeName, storeId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.storeId, routeId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.routeId, stopId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.stopId, creator: user, updater: user });
+                : utils_1.OrderNoGenerator.releaseGood(), domain: warehouseDomain, bizplace: bizplace, collectionOrderNo: releaseGood.collectionOrderNo, courierOption: releaseGood.courierOption, exportOption: releaseGood.exportOption, ownTransport: releaseGood.ownTransport, packingOption: releaseGood.packingOption, recall: releaseGood.recall, marketplaceOrderStatus: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketplaceOrderStatus) || null, billingAddress: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingAddress) || null : shippingOrderInfo.billingAddress || null, deliveryAddress1: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress1) || null : shippingOrderInfo.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, deliveryAddress5: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress5) || null, attentionTo: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.attentionTo) || null : shippingOrderInfo.attentionTo || null, attentionCompany: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.companyName) || null : shippingOrderInfo.attentionCompany || null, city: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.city) || null : shippingOrderInfo.city || null, state: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.state) || null : shippingOrderInfo.state || null, postalCode: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.postalCode) || null : shippingOrderInfo.postalCode || null, country: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.country) || null : shippingOrderInfo.country || null, phone1: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone1) || null : shippingOrderInfo.phone1 || null, phone2: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.phone2) || null, email: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.email) || null, billingCity: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingCity) || null : shippingOrderInfo.billingCity || null, billingCountry: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingCountry) || null : shippingOrderInfo.billingCountry || null, billingPostalCode: releaseGood.type == 'b2c'
+                ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingPostalCode) || null
+                : shippingOrderInfo.billingPostalCode || null, billingState: releaseGood.type == 'b2c' ? (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingState) || null : shippingOrderInfo.billingState || null, transporter: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.transporter, trackingNo: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.trackingNo, airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill, invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice, refNo: releaseGood.refNo, refNo2: releaseGood.refNo2, refNo3: releaseGood.refNo3, remark: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.remark) || null, releaseDate: releaseGood.releaseDate, truckNo: releaseGood.truckNo, bundleInfo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.bundleInfo) || [], orderInventories: releaseGood.orderInventories, type: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.type) ? releaseGood.type : 'b2b', orderMethod: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderMethod)
+                ? releaseGood.orderMethod
+                : ((_b = (_a = releaseGood.orderInventories[0]) === null || _a === void 0 ? void 0 : _a.inventory) === null || _b === void 0 ? void 0 : _b.id)
+                    ? constants_1.ORDER_METHOD.SELECT_BY_PALLET
+                    : constants_1.ORDER_METHOD.SELECT_BY_PRODUCT, status: constants_1.ORDER_STATUS.PENDING, packageId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.packageId, storeName: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.storeName, storeId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.storeId, routeId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.routeId, stopId: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.stopId, creator: user, updater: user });
         // Make relation with GAN for cross docking
         let crossDockingGAN = undefined;
         if (releaseGood.crossDocking && releaseGood.ganNo) {
             crossDockingGAN = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-                where: { domain, bizplace, name: releaseGood.ganNo, status: constants_1.ORDER_STATUS.PENDING }
+                where: { domain: { id: domain.id }, bizplace, name: releaseGood.ganNo, status: constants_1.ORDER_STATUS.PENDING }
             });
             if (!crossDockingGAN)
                 throw new Error(`Failed to find GAN (${releaseGood.ganNo}) for cross docking`);
@@ -511,29 +534,55 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
         newReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).save(newReleaseGood);
         for (let oi of orderInventories) {
             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: await tx.getRepository(product_base_1.Product).findOne(oi.product.id), creator: user, updater: user });
-            if ((_a = newOrderInv.inventory) === null || _a === void 0 ? void 0 : _a.id) {
-                const foundInv = await tx.getRepository(warehouse_base_1.Inventory).findOne(newOrderInv.inventory.id);
-                newOrderInv.inventory = foundInv;
-                foundInv.lockedQty = Number(foundInv.lockedQty) + newOrderInv.releaseQty;
-                foundInv.lockedUomValue = Number(foundInv.lockedUomValue) + newOrderInv.releaseUomValue;
-                foundInv.updater = user;
-                await tx.getRepository(warehouse_base_1.Inventory).save(foundInv);
-            }
+            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).findOneBy({ id: 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: ((_b = newOrderInv.inventory) === null || _b === void 0 ? void 0 : _b.id) ? constants_1.ORDER_PRODUCT_STATUS.ASSIGNED : constants_1.ORDER_PRODUCT_STATUS.PENDING_ASSIGN });
+            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);
-            await tx.getRepository(order_inventory_1.OrderInventory).save(Object.assign(Object.assign({}, newOrderInv), { orderProduct: newOrderProduct }));
+            if ((_c = newOrderInv.inventory) === null || _c === void 0 ? void 0 : _c.id) {
+                const foundInv = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: newOrderInv.inventory.id });
+                newOrderInv.inventory = foundInv;
+                newOrderInv.orderProduct = newOrderProduct;
+                finalOrderInventories.push(newOrderInv);
+            }
+            else {
+                // Preassign Inventories
+                const inventoryAssignmentSetting = await tx.getRepository(setting_base_1.Setting).findOne({
+                    where: { domain: { id: domain.id }, name: 'rule-for-inventory-assignment' }
+                });
+                let locationSortingRules = [];
+                if (inventoryAssignmentSetting) {
+                    let locationSetting = JSON.parse(inventoryAssignmentSetting.value);
+                    for (const key in locationSetting) {
+                        locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true });
+                    }
+                }
+                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 });
+                });
+                finalOrderInventories.push(...assignedOrderInventories);
+            }
+        }
+        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: user, updater: user });
+            await tx.getRepository(order_inventory_1.OrderInventory).save(Object.assign({}, generatedOI));
+            // update inventory locked qty and uom value
+            await tx.getRepository(warehouse_base_1.Inventory).update({ id: oi.inventory.id }, {
+                lockedQty: (((_d = oi.inventory) === null || _d === void 0 ? void 0 : _d.lockedQty) || 0) + generatedOI.releaseQty,
+                lockedUomValue: (((_e = oi.inventory) === null || _e === void 0 ? void 0 : _e.lockedUomValue) || 0) + generatedOI.releaseUomValue,
+                updater: user
+            });
         }
         if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
             orderVass = await Promise.all(orderVass.map(async (orderVas) => {
                 var _a, _b;
                 if ((_a = orderVas === null || orderVas === void 0 ? void 0 : orderVas.targetProduct) === null || _a === void 0 ? void 0 : _a.id) {
-                    orderVas.targetProduct = await tx.getRepository(product_base_1.Product).findOne(orderVas.targetProduct.id);
+                    orderVas.targetProduct = await tx.getRepository(product_base_1.Product).findOneBy({ id: orderVas.targetProduct.id });
                 }
-                let newOrderVas = Object.assign(Object.assign({}, orderVas), { domain: warehouseDomain, bizplace, name: utils_1.OrderNoGenerator.releaseVas(), vas: await tx.getRepository(vas_1.Vas).findOne(orderVas.vas.id), type: constants_1.ORDER_TYPES.RELEASE_OF_GOODS, releaseGood: newReleaseGood, status: constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
+                let newOrderVas = Object.assign(Object.assign({}, orderVas), { domain: warehouseDomain, bizplace, name: utils_1.OrderNoGenerator.releaseVas(), vas: await tx.getRepository(vas_1.Vas).findOneBy({ id: orderVas.vas.id }), type: constants_1.ORDER_TYPES.RELEASE_OF_GOODS, releaseGood: newReleaseGood, status: constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
                 if ((_b = orderVas === null || orderVas === void 0 ? void 0 : orderVas.inventory) === null || _b === void 0 ? void 0 : _b.id) {
-                    newOrderVas.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(orderVas.inventory.id);
+                    newOrderVas.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: orderVas.inventory.id });
                 }
                 return newOrderVas;
             }));
@@ -551,7 +600,7 @@ async function generateReleaseGoodFunction(_, releaseGood, shippingOrder, attach
             await (0, attachment_base_1.createAttachments)(_, { attachments: files }, context);
         }
         const directReceiveSetting = await tx.getRepository(setting_base_1.Setting).findOne({
-            where: { domain, category: 'id-rule', name: 'enable-direct-receive-release-order' }
+            where: { domain: { id: domain.id }, category: 'id-rule', name: 'enable-direct-receive-release-order' }
         });
         const partnerDirectReceiveSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
             where: { setting: directReceiveSetting, domain, partnerDomain: bizplace === null || bizplace === void 0 ? void 0 : bizplace.domain }
@@ -586,12 +635,12 @@ async function confirmReleaseGood(name, context, tx) {
         throw new Error(`Release good order doesn't exists.`);
     // query orderInventories separately from releaseGood to reduce resource usage
     let foundOIs = await tx.getRepository(order_inventory_1.OrderInventory).find({
-        where: { domain, releaseGood: foundReleaseGood },
+        where: { domain: { id: domain.id }, releaseGood: { id: foundReleaseGood.id } },
         relations: ['product']
     });
     // query orderProducts separately from releaseGood to reduce resource usage
     let foundOPs = await tx.getRepository(order_product_1.OrderProduct).find({
-        where: { domain, releaseGood: foundReleaseGood },
+        where: { domain: { id: domain.id }, releaseGood: { id: foundReleaseGood.id } },
         relations: ['bizplace', 'product', 'product.productDetails']
     });
     let foundBundleInfo = JSON.parse(foundReleaseGood.bundleInfo);
@@ -707,10 +756,13 @@ async function confirmReleaseGood(name, context, tx) {
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await (0, notification_1.sendNotification)({
-                receivers,
-                message: Object.assign({}, msg)
-            });
+            /**
+             * @notes Temporary off sendNotification due to suspect of causing wms down
+             */
+            // await sendNotification({
+            //   receivers,
+            //   message: { ...msg }
+            // })
         }
     }
     return releaseGood;
@@ -720,7 +772,7 @@ async function receiveReleaseGood(name, context, tx) {
     var _a, _b;
     const { domain, user } = context.state;
     const foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
-        where: { domain, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
+        where: { domain: { id: domain.id }, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
         relations: ['bizplace', 'orderInventories', 'orderVass']
     });
     if (!foundReleaseGood)
@@ -769,10 +821,13 @@ async function receiveReleaseGood(name, context, tx) {
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await (0, notification_1.sendNotification)({
-                receivers,
-                message: Object.assign({}, msg)
-            });
+            /**
+             * @notes Temporary off sendNotification due to suspect of causing wms down
+             */
+            // await sendNotification({
+            //   receivers,
+            //   message: { ...msg }
+            // })
         }
     }
     return releaseGood;
@@ -782,7 +837,7 @@ async function rejectReleaseGood(tx, context, name, remark) {
     var _a;
     const { domain, user } = context.state;
     const releaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
-        where: { domain, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
+        where: { domain: { id: domain.id }, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
         relations: [
             'bizplace',
             'bizplace.domain',
@@ -807,7 +862,7 @@ async function rejectReleaseGood(tx, context, name, remark) {
         await tx.getRepository(order_inventory_1.OrderInventory).save(await Promise.all(foundOIs.map(async (oi) => {
             var _a;
             if ((_a = oi === null || oi === void 0 ? void 0 : oi.inventory) === null || _a === void 0 ? void 0 : _a.id) {
-                oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(oi.inventory.id);
+                oi.inventory = await tx.getRepository(warehouse_base_1.Inventory).findOneBy({ id: oi.inventory.id });
                 await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, oi.inventory), { lockedQty: oi.inventory.lockedQty - oi.releaseQty, lockedUomValue: oi.inventory.lockedUomValue - oi.releaseUomValue, updater: user }));
             }
             oi.status = constants_1.ORDER_INVENTORY_STATUS.REJECTED;
@@ -818,7 +873,7 @@ async function rejectReleaseGood(tx, context, name, remark) {
     if (foundOPs && foundOPs.length) {
         const sellercraft = await tx
             .getRepository(integration_sellercraft_1.Sellercraft)
-            .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+            .findOneBy({ 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');
@@ -841,7 +896,7 @@ async function rejectReleaseGood(tx, context, name, remark) {
     if (releaseGood.shippingOrder) {
         // 2. 1) if it's yes update status of collection order
         const shippingOrder = await tx.getRepository(shipping_order_1.ShippingOrder).findOne({
-            where: { domain, name: releaseGood.shippingOrder.name }
+            where: { domain: { id: domain.id }, name: releaseGood.shippingOrder.name }
         });
         shippingOrder.status = constants_1.ORDER_STATUS.REJECTED;
         shippingOrder.updater = user;
@@ -861,10 +916,13 @@ async function rejectReleaseGood(tx, context, name, remark) {
             url: context.header.referer,
             data: { url: context.header.referer }
         };
-        await (0, notification_1.sendNotification)({
-            receivers,
-            message: Object.assign({}, msg)
-        });
+        /**
+         * @notes Temporary off sendNotification due to suspect of causing wms down
+         */
+        // await sendNotification({
+        //   receivers,
+        //   message: { ...msg }
+        // })
     }
     return releaseGood;
 }
@@ -873,17 +931,28 @@ async function bulkGenerateReleaseGood(releaseGood, bizplaceId, roNoSetting, dom
     var _a, _b;
     try {
         let warehouseDomain = domain;
-        let { orderInventories } = releaseGood;
-        let bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(bizplaceId);
+        let { orderInventories, shippingOrder } = releaseGood;
+        let bizplace = await tx.getRepository(biz_base_1.Bizplace).findOneBy({ id: 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, 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, status: constants_1.ORDER_STATUS.PENDING, creator: user, 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) {
+            shippingOrder.remark = shippingOrder.exportRemark;
+            if (shippingOrder.containerClosureDate !== undefined) {
+                shippingOrder.containerClosureDateTime = new Date(shippingOrder.containerClosureDate);
+            }
+            delete shippingOrder.exportRemark;
+            const createdSO = await tx.getRepository(shipping_order_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: utils_1.OrderNoGenerator.shippingOrder(), domain,
+                bizplace, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+            newReleaseGood.shippingOrder = createdSO;
+        }
         let finalOrderInventories = [];
         // pre assign inventory to orderInventories
         for (let oi of orderInventories) {
             const pickingProductSetting = await tx.getRepository(setting_base_1.Setting).findOne({
-                where: { domain, name: 'rule-for-picking-product' }
+                where: { domain: { id: domain.id }, name: 'rule-for-picking-product' }
             });
             let locationSortingRules = [];
             if (pickingProductSetting) {
@@ -892,33 +961,42 @@ async function bulkGenerateReleaseGood(releaseGood, bizplaceId, roNoSetting, dom
                     locationSortingRules.push({ name: key, desc: locationSetting[key] == 'ASC' ? false : true });
                 }
             }
-            const product = await tx.getRepository(product_base_1.Product).findOne(oi.productId);
-            finalOrderInventories.push(...(await utils_1.InventoryUtil.autoAssignInventoryForRelease(product, oi, oi.packingType, locationSortingRules, bizplace, warehouseDomain, tx)));
+            const product = await tx.getRepository(product_base_1.Product).findOneBy({ id: 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: user, updater: user });
-            let newOrderProduct = {
-                name: generatedOI.name,
-                product: generatedOI.product,
-                batchId: generatedOI.batchId,
-                packingType: generatedOI.packingType,
-                packingSize: generatedOI.packingSize,
-                uom: generatedOI.uom,
-                domain: warehouseDomain,
-                bizplace,
-                releaseQty: generatedOI.releaseQty,
-                releaseUomValue: generatedOI.releaseUomValue,
-                packQty: 0,
-                actualPackQty: 0,
-                palletQty: 0,
-                actualPalletQty: 0,
-                status: constants_1.ORDER_PRODUCT_STATUS.PENDING_ASSIGN,
-                releaseGood: newReleaseGood,
-                creator: user,
-                updater: user
-            };
-            newOrderProduct = await tx.getRepository(order_product_1.OrderProduct).save(newOrderProduct);
+            let newOrderProduct;
+            if (!(oi === null || oi === void 0 ? void 0 : oi.orderProduct)) {
+                newOrderProduct = {
+                    name: generatedOI.name,
+                    product: generatedOI.product,
+                    batchId: generatedOI.batchId,
+                    packingType: generatedOI.packingType,
+                    packingSize: generatedOI.packingSize,
+                    uom: generatedOI.uom,
+                    domain: warehouseDomain,
+                    bizplace,
+                    releaseQty: generatedOI.releaseQty,
+                    releaseUomValue: generatedOI.releaseUomValue,
+                    packQty: 0,
+                    actualPackQty: 0,
+                    palletQty: 0,
+                    actualPalletQty: 0,
+                    status: constants_1.ORDER_PRODUCT_STATUS.ASSIGNED,
+                    releaseGood: newReleaseGood,
+                    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: 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, {
@@ -944,7 +1022,7 @@ async function bulkConfirmReleaseGoods(releaseGoodsNo, domain, user, context, tx
         throw new Error(`release good order doesn't exists.`);
     let customerBizplace = foundReleaseGoods[0].bizplace;
     let foundOrderInventories = await tx.getRepository(order_inventory_1.OrderInventory).find({
-        where: { domain, releaseGood: (0, typeorm_1.In)(foundReleaseGoods.map((rg) => rg.id)) }
+        where: { domain: { id: domain.id }, releaseGood: (0, typeorm_1.In)(foundReleaseGoods.map((rg) => rg.id)) }
     });
     await tx
         .getRepository(release_good_1.ReleaseGood)
@@ -977,14 +1055,19 @@ async function bulkConfirmReleaseGoods(releaseGoodsNo, domain, user, context, tx
                 url: context.header.referer,
                 data: { url: context.header.referer }
             };
-            await (0, notification_1.sendNotification)({
-                receivers,
-                message
-            });
+            /**
+             * @notes Temporary off sendNotification due to suspect of causing wms down
+             */
+            // await sendNotification({
+            //   receivers,
+            //   message
+            // })
         }
     }
     return Promise.all(foundReleaseGoods.map(async (releaseGood) => {
-        return Object.assign(Object.assign({}, releaseGood), { orderInventories: await tx.getRepository(order_inventory_1.OrderInventory).find({ where: releaseGood }), status: constants_1.ORDER_STATUS.PENDING_RECEIVE, updater: user });
+        return Object.assign(Object.assign({}, releaseGood), { orderInventories: await tx
+                .getRepository(order_inventory_1.OrderInventory)
+                .find({ where: { releaseGood: { id: releaseGood.id } } }) /* CONFIRMME regarding TYPEORM */, status: constants_1.ORDER_STATUS.PENDING_RECEIVE, updater: user });
     }));
 }
 exports.bulkConfirmReleaseGoods = bulkConfirmReleaseGoods;
@@ -1044,6 +1127,11 @@ function extractRawReleaseGoods(rawReleaseGoods) {
                 deliveryAddress2: item.deliveryAddress2,
                 deliveryAddress3: item.deliveryAddress3,
                 deliveryAddress4: item.deliveryAddress4,
+                billingAddress: item.billingAddress,
+                billingCity: item.billingPostalCode,
+                billingState: item.billingState,
+                billingCountry: item.billingCountry,
+                billingPostalCode: item.billingPostalCode,
                 city: item.city,
                 postalCode: item.postalCode,
                 state: item.state,