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

package/dist-server/service/arrival-notice/arrival-notice-mutation.js

@@ -9,9 +9,9 @@ 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 id_rule_base_1 = require("@things-factory/id-rule-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 constants_1 = require("../../constants");
 const attachment_type_1 = require("../../constants/attachment-type");
 const errors_1 = require("../../errors");
@@ -36,7 +36,7 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
     }
     async generateArrivalNotice(context, arrivalNotice, files) {
         const { tx } = context.state;
-        const createdArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, files, context, tx);
+        const createdArrivalNotice = await generateArrivalNoticeFunction(null, arrivalNotice, false, files, context, tx);
         return createdArrivalNotice;
     }
     async confirmArrivalNotice(name, context) {
@@ -44,7 +44,8 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
         const arrivalNotice = await confirmArrivalNoticeFunction(name, context, tx);
         // If current GAN has cross docking
         if (arrivalNotice.crossDocking) {
-            const { releaseGood } = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne(arrivalNotice.id, {
+            const { releaseGood } = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
+                where: { id: arrivalNotice.id },
                 relations: ['releaseGood']
             });
             // If status of related RO is not equal to PENDING_RECEIVE (i.e. Wasn't confirmed yet.)
@@ -66,13 +67,12 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
         const { tx } = context.state;
         const arrivalNotice = await rejectArrivalNotice(tx, name, patch.remark, context);
         if (arrivalNotice.crossDocking) {
-            const { releaseGood } = await tx
-                .getRepository(arrival_notice_1.ArrivalNotice)
-                .findOne(arrivalNotice.id, {
+            const { releaseGood } = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
+                where: { id: arrivalNotice.id },
                 relations: ['releaseGood']
             });
             if (releaseGood.status !== constants_1.ORDER_STATUS.REJECTED) {
-                await (0, release_good_mutation_1.rejectReleaseGood)(tx, releaseGood.name, patch.remark, context);
+                await (0, release_good_mutation_1.rejectReleaseGood)(tx, context, releaseGood.name, patch.remark);
             }
         }
         return arrivalNotice;
@@ -104,16 +104,19 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
                 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 true;
     }
     async addArrivalNotice(context, arrivalNotice, file) {
         const { tx } = context.state;
-        const createdGAN = await generateArrivalNoticeFunction(null, arrivalNotice, file, context, tx);
+        const createdGAN = await generateArrivalNoticeFunction(null, arrivalNotice, false, file, context, tx);
         debug('createdGAN', createdGAN);
         const confirmedGAN = await confirmArrivalNoticeFunction(createdGAN.name, context, tx);
         debug('confirmedGAN', confirmedGAN);
@@ -128,12 +131,16 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
             throw new Error('Existing Arrival Notice not found.');
         }
         await tx.getRepository(arrival_notice_1.ArrivalNotice).update(existingArrivalNotice.id, arrivalNotice);
-        return await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne(existingArrivalNotice.id);
+        return await tx.getRepository(arrival_notice_1.ArrivalNotice).findOneBy({ id: existingArrivalNotice.id });
     }
-    async bulkGenerateArrivalNotices(context, rawArrivalNotices, bizplaceId) {
+    async bulkGenerateArrivalNotices(context, rawArrivalNotices, bizplaceId, bufferLocation) {
         const { domain, user, tx } = context.state;
         let createdArrivalNoticeIds = [], createdOrderProductIds = [], errorsCaught = [], finalArrivalNoticeList = [];
-        const foundBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(bizplaceId);
+        let opStatus = constants_1.ORDER_PRODUCT_STATUS.PENDING_RECEIVE;
+        let anStatus = constants_1.ORDER_STATUS.PENDING_RECEIVE;
+        const foundBizplace = await tx
+            .getRepository(biz_base_1.Bizplace)
+            .findOne({ where: { id: bizplaceId }, relations: ['domain'] });
         if (!foundBizplace)
             throw new Error('company not found');
         // to check whether the raw data are valid
@@ -141,10 +148,27 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
         // check for custom GAN order no setting
         const ganNoSetting = await tx.getRepository(setting_base_1.Setting).findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 name: constants_1.ORDER_NUMBER_SETTING_KEY.GAN_NUMBER_RULE
             }
         });
+        const ganProcessingSetting = await tx.getRepository(setting_base_1.Setting).findOne({
+            where: { domain: { id: domain.id }, category: 'id-rule', name: 'gan-order-processing' }
+        });
+        const partnerGanProcessingSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
+            where: { setting: ganProcessingSetting, domain, partnerDomain: foundBizplace.domain.id }
+        });
+        // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
+        if (ganProcessingSetting) {
+            let setting = !isNaN(partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value)
+                ? partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value
+                : ganProcessingSetting.value;
+            // CONFIRM to assign if setting value is 1
+            if (setting == 1) {
+                opStatus = constants_1.ORDER_PRODUCT_STATUS.ARRIVED;
+                anStatus = constants_1.ORDER_STATUS.ARRIVED;
+            }
+        }
         // extract rawArrivalNotices data into normal ArrivalNotice format
         let arrivalNotices = extractArrivalNotices(validatedArrivalNotices);
         for (let i = 0, l = arrivalNotices.length; i < l; i++) {
@@ -174,7 +198,7 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
                     // save new order products
                     let createdOrderProducts = await Promise.all(arrivalNotices[i].orderProducts.map(async (op) => {
                         return Object.assign(Object.assign({}, op), { domain, bizplace: foundBizplace, name: order_no_generator_1.OrderNoGenerator.orderProduct(), 
-                            // product: await childTx.getRepository(Product).findOne(op.product.id),
+                            // product: await childTx.getRepository(Product).findOneBy({ id: op.product.id }),
                             status: constants_1.ORDER_PRODUCT_STATUS.PENDING, arrivalNotice: createdArrivalNotice, creator: user });
                     }));
                     createdOrderProducts = await childTx.getRepository(order_product_1.OrderProduct).save(createdOrderProducts);
@@ -196,11 +220,11 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
                 // update arrivalNotices status to PENDING_RECEIVE
                 await childTx
                     .getRepository(arrival_notice_1.ArrivalNotice)
-                    .update({ id: (0, typeorm_1.In)(createdArrivalNoticeIds) }, { status: constants_1.ORDER_STATUS.PENDING_RECEIVE, updater: user });
+                    .update({ id: (0, typeorm_1.In)(createdArrivalNoticeIds) }, { status: anStatus, updater: user });
                 // update orderProducts status to PENDING_RECEIVE
                 await childTx
                     .getRepository(order_product_1.OrderProduct)
-                    .update({ id: (0, typeorm_1.In)(createdOrderProductIds) }, { status: constants_1.ORDER_PRODUCT_STATUS.PENDING_RECEIVE, updater: user });
+                    .update({ id: (0, typeorm_1.In)(createdOrderProductIds) }, { status: opStatus, updater: user });
                 finalArrivalNoticeList = await childTx.getRepository(arrival_notice_1.ArrivalNotice).find({
                     where: { id: (0, typeorm_1.In)(createdArrivalNoticeIds) },
                     relations: ['orderProducts', 'orderProducts.product', 'bizplace']
@@ -317,8 +341,9 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('rawArrivalNotices', type => [arrival_notice_types_1.NewArrivalNotice], { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('bizplaceId', type => String)),
+    tslib_1.__param(3, (0, type_graphql_1.Arg)('bufferLocation', type => String, { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Array, String]),
+    tslib_1.__metadata("design:paramtypes", [Object, Array, String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ArrivalNoticeMutation.prototype, "bulkGenerateArrivalNotices", null);
 ArrivalNoticeMutation = tslib_1.__decorate([
@@ -328,7 +353,7 @@ exports.ArrivalNoticeMutation = ArrivalNoticeMutation;
 async function deleteArrivalNotice(tx, name, user, domain) {
     var _a;
     let foundArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-        where: { domain, name },
+        where: { domain: { id: domain.id }, name },
         relations: ['bizplace', 'releaseGood', 'orderProducts', 'orderVass', 'collectionOrders', 'creator', 'updater']
     });
     if (!foundArrivalNotice)
@@ -369,13 +394,13 @@ async function deleteArrivalNotice(tx, name, user, domain) {
     return true;
 }
 exports.deleteArrivalNotice = deleteArrivalNotice;
-async function generateArrivalNoticeFunction(_, arrivalNotice, files, context, tx) {
+async function generateArrivalNoticeFunction(_, arrivalNotice, fromPo, files, context, tx) {
     const { domain, user } = context.state;
     let orderProducts = arrivalNotice.orderProducts;
     let orderVass = arrivalNotice.orderVass;
     let myBizplace;
     let orderNo = '';
-    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);
     if (arrivalNotice.bizplace)
         myBizplace = arrivalNotice.bizplace;
     else if (arrivalNotice.customerBizplaceId) {
@@ -399,7 +424,7 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, files, context, t
     if (arrivalNotice.supplier) {
         const supplier = await tx
             .getRepository(biz_base_1.ContactPoint)
-            .findOne({ where: { bizplace: arrivalNotice.supplier, domain }, relation: ['bizplace'] });
+            .findOne({ where: { bizplace: arrivalNotice.supplier, domain }, relations: ['bizplace'] });
         if (!supplier)
             throw new Error('contact point does not exist');
         arrivalNotice.supplier = supplier;
@@ -407,7 +432,7 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, files, context, t
     // find GAN number rule setting
     const ganNoSetting = await settingRepo.findOne({
         where: {
-            domain,
+            domain: { id: domain.id },
             name: constants_1.ORDER_NUMBER_SETTING_KEY.GAN_NUMBER_RULE
         }
     });
@@ -418,19 +443,19 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, files, context, t
         orderNo = order_no_generator_1.OrderNoGenerator.arrivalNotice();
     }
     // 1. Create arrival notice
-    const createdArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: orderNo, domain, bizplace: myBizplace, looseItem: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.looseItem) ? arrivalNotice.looseItem : false, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+    const createdArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: orderNo, domain, bizplace: myBizplace, looseItem: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.looseItem) ? arrivalNotice.looseItem : false, status: fromPo ? constants_1.ORDER_STATUS.INTRANSIT : constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
     // 2. Create arrival notice product
     await addArrivalNoticeProducts(domain, createdArrivalNotice, orderProducts.map((op) => {
-        return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.PENDING });
+        return Object.assign(Object.assign({}, op), { status: fromPo ? constants_1.ORDER_PRODUCT_STATUS.INTRANSIT : constants_1.ORDER_PRODUCT_STATUS.PENDING });
     }), user, tx);
     await (0, job_sheet_mutation_1.generateJobSheet)(domain, user, createdArrivalNotice, tx);
     // 3. Create arrival notice vas
     if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
         orderVass = await Promise.all(orderVass.map(async (ov) => {
             if (ov.targetProduct) {
-                ov.targetProduct = await tx.getRepository(product_base_1.Product).findOne(ov.targetProduct.id);
+                ov.targetProduct = await tx.getRepository(product_base_1.Product).findOneBy({ id: ov.targetProduct.id });
             }
-            return Object.assign(Object.assign({}, ov), { domain, bizplace: myBizplace, name: order_no_generator_1.OrderNoGenerator.orderVas(), vas: await tx.getRepository(vas_1.Vas).findOne({ domain, id: ov.vas.id }), type: constants_1.ORDER_TYPES.ARRIVAL_NOTICE, arrivalNotice: createdArrivalNotice, status: constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
+            return Object.assign(Object.assign({}, ov), { domain, bizplace: myBizplace, name: order_no_generator_1.OrderNoGenerator.orderVas(), vas: await tx.getRepository(vas_1.Vas).findOneBy({ domain: { id: domain.id }, id: ov.vas.id }), type: constants_1.ORDER_TYPES.ARRIVAL_NOTICE, arrivalNotice: createdArrivalNotice, status: fromPo ? constants_1.ORDER_VAS_STATUS.INTRANSIT : constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
         }));
         await tx.getRepository(order_vas_1.OrderVas).save(orderVass);
     }
@@ -452,9 +477,10 @@ async function confirmArrivalNoticeFunction(name, context, tx) {
     var _a, _b;
     const { user, domain } = context.state;
     const foundArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-        where: { domain, name, status: constants_1.ORDER_STATUS.PENDING },
+        where: { domain: { id: domain.id }, name, status: constants_1.ORDER_STATUS.PENDING },
         relations: [
             'bizplace',
+            'bizplace.domain',
             'releaseGood',
             'orderProducts',
             'orderProducts.product',
@@ -467,18 +493,43 @@ async function confirmArrivalNoticeFunction(name, context, tx) {
     let foundOPs = foundArrivalNotice.orderProducts;
     let foundOVs = foundArrivalNotice.orderVass;
     let customerBizplace = foundArrivalNotice.bizplace;
+    let opStatus = constants_1.ORDER_PRODUCT_STATUS.PENDING_RECEIVE;
+    let anStatus = constants_1.ORDER_STATUS.PENDING_RECEIVE;
+    let ovStatus = constants_1.ORDER_VAS_STATUS.PENDING_RECEIVE;
+    let acceptedByUser = null;
+    let acceptedTime = null;
+    const ganProcessingSetting = await tx.getRepository(setting_base_1.Setting).findOne({
+        where: { domain: { id: domain.id }, category: 'id-rule', name: 'gan-order-processing' }
+    });
+    const partnerGanProcessingSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
+        where: { setting: ganProcessingSetting, domain, partnerDomain: customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.domain }
+    });
+    // If status of GAN is PENDING_RECEIVE then directly to assign warehouse
+    if (ganProcessingSetting) {
+        let setting = !isNaN(partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value)
+            ? partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value
+            : ganProcessingSetting.value;
+        // CONFIRM to assign if setting value is 1
+        if (setting == 1) {
+            opStatus = constants_1.ORDER_PRODUCT_STATUS.ARRIVED;
+            anStatus = constants_1.ORDER_STATUS.ARRIVED;
+            ovStatus = constants_1.ORDER_VAS_STATUS.ARRIVED;
+            acceptedByUser = user;
+            acceptedTime = new Date();
+        }
+    }
     if (!foundArrivalNotice)
         throw new Error(`Arrival notice doesn't exists.`);
     // 1. GAN Status change (PENDING => PENDING_RECEIVE)
-    const arrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { status: constants_1.ORDER_STATUS.PENDING_RECEIVE, updater: user }));
+    let arrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { status: anStatus, updater: user, acceptedBy: acceptedByUser, acceptedAt: acceptedTime }));
     foundOPs = foundOPs.map((op) => {
-        return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.PENDING_RECEIVE });
+        return Object.assign(Object.assign({}, op), { status: opStatus });
     });
     await tx.getRepository(order_product_1.OrderProduct).save(foundOPs);
     // 2. Update order vas status if it exists.
     if (foundOVs && foundOVs.length) {
         foundOVs = foundOVs.map((ov) => {
-            return Object.assign(Object.assign({}, ov), { status: constants_1.ORDER_VAS_STATUS.PENDING_RECEIVE });
+            return Object.assign(Object.assign({}, ov), { status: ovStatus });
         });
         await tx.getRepository(order_vas_1.OrderVas).save(foundOVs);
     }
@@ -509,10 +560,13 @@ async function confirmArrivalNoticeFunction(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 arrivalNotice;
@@ -523,32 +577,56 @@ async function receiveArrivalNoticeFunction(_, name, context) {
     const { user, domain, tx } = context.state;
     try {
         const foundArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-            where: { domain, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
-            relations: ['bizplace', 'collectionOrders', 'orderProducts', 'orderVass']
+            where: { domain: { id: domain.id }, name, status: constants_1.ORDER_STATUS.PENDING_RECEIVE },
+            relations: ['bizplace', 'bizplace.domain', 'collectionOrders', 'orderProducts', 'orderVass']
         });
-        if (!foundArrivalNotice)
-            throw new Error(`Arrival notice doesn't exists.`);
         let foundOPs = foundArrivalNotice.orderProducts;
         let foundOVs = foundArrivalNotice.orderVass;
         let foundCOs = await tx.getRepository(collection_order_1.CollectionOrder).find({
-            where: { domain, refNo: foundArrivalNotice.name }
+            where: { domain: { id: domain.id }, refNo: foundArrivalNotice.name }
+        });
+        let customerBizplace = foundArrivalNotice.bizplace;
+        let opStatus = constants_1.ORDER_PRODUCT_STATUS.INTRANSIT;
+        let anStatus = constants_1.ORDER_STATUS.INTRANSIT;
+        let ovStatus = constants_1.ORDER_VAS_STATUS.INTRANSIT;
+        let coStatus = constants_1.ORDER_STATUS.READY_TO_DISPATCH;
+        const ganProcessingSetting = await tx.getRepository(setting_base_1.Setting).findOne({
+            where: { domain: { id: domain.id }, category: 'id-rule', name: 'gan-order-processing' }
         });
+        const partnerGanProcessingSetting = await tx.getRepository(setting_base_1.PartnerSetting).findOne({
+            where: { setting: ganProcessingSetting, domain, partnerDomain: customerBizplace === null || customerBizplace === void 0 ? void 0 : customerBizplace.domain }
+        });
+        // If status of GAN is INTRANSIT then directly to assign warehouse
+        if (ganProcessingSetting) {
+            let setting = !isNaN(partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value)
+                ? partnerGanProcessingSetting === null || partnerGanProcessingSetting === void 0 ? void 0 : partnerGanProcessingSetting.value
+                : ganProcessingSetting.value;
+            // RECEIVE to assign if setting value is 2
+            if (setting == 2) {
+                opStatus = constants_1.ORDER_PRODUCT_STATUS.ARRIVED;
+                anStatus = constants_1.ORDER_STATUS.ARRIVED;
+                ovStatus = constants_1.ORDER_VAS_STATUS.ARRIVED;
+                coStatus = constants_1.ORDER_STATUS.READY_TO_DISPATCH;
+            }
+        }
+        if (!foundArrivalNotice)
+            throw new Error(`Arrival notice doesn't exists.`);
         // 1. Update status of order products (PENDING_RECEIVE => INTRANSIT)
         foundOPs = foundOPs.map((op) => {
-            return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.INTRANSIT, updater: user });
+            return Object.assign(Object.assign({}, op), { status: opStatus, updater: user });
         });
         await tx.getRepository(order_product_1.OrderProduct).save(foundOPs);
         // 2. Update status of order vass if it exists (PENDING_RECEIVE => INTRANSIT)
         if (foundOVs && foundOVs.length) {
             foundOVs = foundOVs.map((ov) => {
-                return Object.assign(Object.assign({}, ov), { status: constants_1.ORDER_VAS_STATUS.INTRANSIT, updater: user });
+                return Object.assign(Object.assign({}, ov), { status: ovStatus, updater: user });
             });
             await tx.getRepository(order_vas_1.OrderVas).save(foundOVs);
         }
         // 3. If there's collection order, update status of collection order (PENDING_RECEIVE => READY_TO_DISPATCH)
         if (foundCOs) {
             foundCOs = foundCOs.map((co) => {
-                return Object.assign(Object.assign({}, co), { status: constants_1.ORDER_STATUS.READY_TO_DISPATCH, updater: user });
+                return Object.assign(Object.assign({}, co), { status: coStatus, updater: user });
             });
         }
         // notification logics
@@ -562,13 +640,16 @@ async function receiveArrivalNoticeFunction(_, name, context) {
                 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 }
+            // })
         }
         // 4. Update status of arrival notice (PENDING_RECEIVE => INTRANSIT)
-        await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { status: constants_1.ORDER_STATUS.INTRANSIT, acceptedBy: user, acceptedAt: new Date(), updater: user }));
+        let rcvArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, foundArrivalNotice), { status: anStatus, acceptedBy: user, acceptedAt: new Date(), updater: user }));
         return foundArrivalNotice;
     }
     catch (e) {
@@ -581,7 +662,7 @@ async function checkArrivedNoticeFunction(name, context, tx) {
     const { user, domain } = context.state;
     try {
         const foundArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-            where: { domain, name, status: constants_1.ORDER_STATUS.INTRANSIT },
+            where: { domain: { id: domain.id }, name, status: constants_1.ORDER_STATUS.INTRANSIT },
             relations: ['bizplace', 'collectionOrders', 'orderProducts', 'orderVass']
         });
         debug('ganNo', name, foundArrivalNotice);
@@ -622,10 +703,13 @@ async function checkArrivedNoticeFunction(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 foundArrivalNotice;
     }
@@ -638,7 +722,7 @@ async function rejectArrivalNotice(tx, name, remark, context) {
     var _a;
     const { user, domain } = context.state;
     const foundArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).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', 'orderProducts', 'orderVass', 'collectionOrders']
     });
     if (!foundArrivalNotice)
@@ -688,33 +772,36 @@ async function rejectArrivalNotice(tx, name, remark, context) {
             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 foundArrivalNotice;
 }
 exports.rejectArrivalNotice = rejectArrivalNotice;
 async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts, user, tx) {
     var _a;
-    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, typeorm_1.getRepository)(product_base_1.Product);
-    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_product_1.OrderProduct)) || (0, typeorm_1.getRepository)(order_product_1.OrderProduct);
+    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, shell_1.getRepository)(product_base_1.Product);
+    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_product_1.OrderProduct)) || (0, shell_1.getRepository)(order_product_1.OrderProduct);
     if (!(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace) || !((_a = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.orderProducts) === null || _a === void 0 ? void 0 : _a.length)) {
         arrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
-            where: { domain, name: arrivalNotice.name },
+            where: { domain: { id: domain.id }, name: arrivalNotice.name },
             relations: ['bizplace', 'orderProducts']
         });
     }
     const createdOrderProducts = await Promise.all(newOrderProducts.map(async (op) => {
-        return Object.assign(Object.assign({}, op), { domain, bizplace: arrivalNotice.bizplace, name: order_no_generator_1.OrderNoGenerator.orderProduct(), product: await productRepo.findOne(op.product.id), arrivalNotice, creator: user });
+        return Object.assign(Object.assign({}, op), { domain, bizplace: arrivalNotice.bizplace, name: order_no_generator_1.OrderNoGenerator.orderProduct(), product: await productRepo.findOneBy({ id: op.product.id }), arrivalNotice, creator: user });
     }));
     debug('gan-created-order-products', createdOrderProducts);
     await orderProductRepo.save(createdOrderProducts);
 }
 exports.addArrivalNoticeProducts = addArrivalNoticeProducts;
 async function editArrivalNoticeProducts(existingOrderProducts, user, tx) {
-    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_product_1.OrderProduct)) || (0, typeorm_1.getRepository)(order_product_1.OrderProduct);
+    const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_product_1.OrderProduct)) || (0, shell_1.getRepository)(order_product_1.OrderProduct);
     const updatedOrderProducts = await Promise.all(existingOrderProducts.map(async (op) => {
         return Object.assign(Object.assign({}, op), { status: constants_1.ORDER_PRODUCT_STATUS.EDITED, updater: user });
     }));