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

package/dist-server/service/delivery-order/delivery-order-mutation.js

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateDeliveryOrder = exports.createDeliveryOrder = exports.DeliveryOrderMutation = void 0;
 const tslib_1 = require("tslib");
@@ -17,6 +16,9 @@ const constants_1 = require("../../constants");
 const order_no_generator_1 = require("../../utils/order-no-generator");
 const order_inventory_1 = require("../order-inventory/order-inventory");
 const order_inventory_types_1 = require("../order-inventory/order-inventory-types");
+const release_good_1 = require("../release-good/release-good");
+const release_good_types_1 = require("../release-good/release-good-types");
+const shipping_order_1 = require("../shipping-order/shipping-order");
 const delivery_order_1 = require("./delivery-order");
 const delivery_order_types_1 = require("./delivery-order-types");
 let DeliveryOrderMutation = class DeliveryOrderMutation {
@@ -28,7 +30,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
         const { tx, domain, user } = context.state;
         const deliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 name,
                 bizplace: (0, typeorm_1.In)(await (0, biz_base_1.getPermittedBizplaceIds)(domain, user))
             }
@@ -38,11 +40,11 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
     async deleteDeliveryOrder(name, context) {
         const { tx, domain } = context.state;
         const foundDO = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-            where: { domain, name }
+            where: { domain: { id: domain.id }, name }
         });
         if (foundDO) {
             const previousAttachment = await tx.getRepository(attachment_base_1.Attachment).findOne({
-                where: { domain, refBy: foundDO.id }
+                where: { domain: { id: domain.id }, refBy: foundDO.id }
             });
             if (previousAttachment)
                 await (0, attachment_base_1.deleteAttachment)(null, { id: previousAttachment.id }, context);
@@ -57,7 +59,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
     async confirmDeliveryOrder(name, context) {
         const { tx, domain, user } = context.state;
         const foundDeliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-            where: { domain, name },
+            where: { domain: { id: domain.id }, name },
             relations: ['creator', 'updater']
         });
         let deliveryOrder;
@@ -73,7 +75,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
         try {
             const { tx, domain, user } = context.state;
             const deliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name }
+                where: { domain: { id: domain.id }, name }
             });
             if (!deliveryOrder)
                 throw new Error(`Delivery order doesn't exists.`);
@@ -90,7 +92,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
         try {
             const { tx, domain, user } = context.state;
             const deliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name },
+                where: { domain: { id: domain.id }, name },
                 relations: ['bizplace', 'transportDriver', 'transportVehicle']
             });
             if (!deliveryOrder)
@@ -98,7 +100,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             if (deliveryOrder.status !== constants_1.ORDER_STATUS.DELIVERING)
                 throw new Error(`Status is not receivable.`);
             let orderInventories = await tx.getRepository(order_inventory_1.OrderInventory).find({
-                where: { domain, deliveryOrder: deliveryOrder },
+                where: { domain: { id: domain.id }, deliveryOrder: { id: deliveryOrder.id } },
                 relations: ['product']
             });
             // update order inventory status for manual DO only
@@ -122,21 +124,39 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             throw e;
         }
     }
-    async dispatchDeliveryOrder(context, orderInfo, orderItems) {
+    /**
+     * comment start
+     * detailed review needed 06 Aug 2022 by @ChrisLim-git
+     * @param context
+     * @param orderInfo
+     * @param orderItems
+     * @param shippingOrderInfo
+     * @param exportInfo
+     * @returns DeliveryOrder
+     */
+    async dispatchDeliveryOrder(context, orderInfo, orderItems, shippingOrderInfo, exportInfo) {
         try {
             const { tx, domain, user } = context.state;
             const foundDeliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name: orderInfo.name },
+                where: { domain: { id: domain.id }, name: orderInfo.name },
                 relations: ['transportVehicle', 'bizplace']
             });
+            const foundReleaseGood = await tx.getRepository(release_good_1.ReleaseGood).findOne({
+                where: {
+                    name: orderInfo.releaseGoodNo,
+                    domain
+                },
+                relations: ['shippingOrder']
+            });
             if (!foundDeliveryOrder)
                 throw new Error(`Delivery order doesn't exists.`);
             if (foundDeliveryOrder.status === constants_1.ORDER_STATUS.PENDING_CANCEL)
                 throw new Error('Release order is pending for cancel');
+            foundDeliveryOrder.ownCollection = orderInfo.transportType == 'Own Transport' ? true : false;
             let deliveryOrderStatus = foundDeliveryOrder.status;
             let orderInventories;
             orderInventories = await tx.getRepository(order_inventory_1.OrderInventory).find({
-                where: { domain, deliveryOrder: foundDeliveryOrder },
+                where: { domain: { id: domain.id }, deliveryOrder: { id: foundDeliveryOrder.id } },
                 relations: ['inventory', 'inventory.product', 'inventory.reusablePallet']
             });
             orderInventories = orderInventories.map((orderInventory) => {
@@ -172,19 +192,19 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             }
             else {
                 foundCP = await tx.getRepository(biz_base_1.ContactPoint).findOne({
-                    where: { domain, id: orderInfo.contactPoint, bizplace: foundDeliveryOrder.bizplace }
+                    where: { domain: { id: domain.id }, id: orderInfo.contactPoint, bizplace: foundDeliveryOrder.bizplace }
                 });
             }
             let transportDriver = null;
             let transportVehicle = null;
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownDriver) {
                 transportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
-                    where: { domain, name: orderInfo.ownDriver }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownDriver }
                 });
             }
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck) {
                 transportVehicle = await tx.getRepository(transport_base_1.TransportVehicle).findOne({
-                    where: { domain, name: orderInfo.ownTruck }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownTruck }
                 });
                 await tx.getRepository(transport_base_1.TransportVehicle).save(Object.assign(Object.assign({}, transportVehicle), { status: transport_base_1.TRUCK_STATUS.IN_USE, updater: user }));
             }
@@ -192,19 +212,66 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
                 // update status to DELIVERING if current status is READY_TO_DISPATCH
                 deliveryOrderStatus = constants_1.ORDER_STATUS.DELIVERING;
             }
-            await tx.getRepository(delivery_order_1.DeliveryOrder).save(Object.assign(Object.assign({}, foundDeliveryOrder), { transportDriver,
-                transportVehicle, contactPointRefId: foundCP.id || null, otherDriver: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherDriver) || null, truckNo: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherTruck) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck), to: foundCP.address, deliveryDate: orderInfo.deliveryDate, remark: orderInfo.remark, status: deliveryOrderStatus, reusablePallet: orderInfo.reusablePallet, updater: user }));
+            // save export option information
+            if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.exportOption) {
+                let savedShippingOrder = '';
+                /**
+                 * Could potentially override important data
+                 */
+                if (foundReleaseGood.shippingOrder == null) {
+                    savedShippingOrder = await tx.getRepository(shipping_order_1.ShippingOrder).save({
+                        name: order_no_generator_1.OrderNoGenerator.shippingOrder(),
+                        shipName: exportInfo.shipName,
+                        containerNo: exportInfo.containerNo,
+                        containerArrivalDate: exportInfo.containerArrivalDate,
+                        containerLeavingDate: exportInfo.containerLeavingDate,
+                        status: constants_1.ORDER_STATUS.PENDING,
+                        domain,
+                        bizplace: foundDeliveryOrder.bizplace,
+                        creator: user,
+                        updater: user
+                    });
+                }
+                /**
+                 * @oscarchuaweiwen-fsd
+                 * I think the expectation here is to update instead of save
+                 * Should use .update instead of .save as it will override data that was not meant to be updated
+                 * example:
+                 *
+                 * savedShippingOrder = await tx.getRepository(ShippingOrder).update({
+                 *  shipName: exportInfo.shipName,
+                 *  containerNo: exportInfo.containerNo,
+                 *  containerArrivalDate: exportInfo.containerArrivalDate,
+                 *  containerLeavingDate: exportInfo.containerLeavingDate,
+                 *  status: ORDER_STATUS.PENDING,
+                 *  updater: user
+                 * })
+                 *
+                 * Unless the intention was not to update but to insert
+                 */
+                savedShippingOrder = await tx.getRepository(shipping_order_1.ShippingOrder).save(Object.assign(Object.assign({}, foundReleaseGood.shippingOrder), { name: order_no_generator_1.OrderNoGenerator.shippingOrder(), shipName: exportInfo.shipName, containerNo: exportInfo.containerNo, containerArrivalDate: exportInfo.containerArrivalDate, containerLeavingDate: exportInfo.containerLeavingDate, status: constants_1.ORDER_STATUS.PENDING, domain, bizplace: foundDeliveryOrder.bizplace, creator: user, updater: user }));
+                /** */
+                exportInfo = savedShippingOrder;
+                foundReleaseGood.exportOption = true;
+            }
+            else {
+                foundReleaseGood.exportOption = false;
+                foundReleaseGood.collectionOrderNo = '';
+            }
+            await tx.getRepository(release_good_1.ReleaseGood).save(Object.assign(Object.assign({}, foundReleaseGood), { shippingOrder: Object.assign({}, exportInfo), collectionOrderNo: orderInfo.coNo }));
+            await tx.getRepository(delivery_order_1.DeliveryOrder).save(Object.assign(Object.assign({}, foundDeliveryOrder), { transportDriver, palletQty: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.totalPalletQty, transportVehicle, contactPointRefId: (foundCP === null || foundCP === void 0 ? void 0 : foundCP.id) || null, otherDriver: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherDriver) || null, truckNo: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherTruck) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck), to: foundCP === null || foundCP === void 0 ? void 0 : foundCP.address, deliveryDate: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.deliveryDate, deliveryDateTime: new Date(), remark: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.remark, status: deliveryOrderStatus, reusablePallet: orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.reusablePallet, attentionTo: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.attentionTo) || null, attentionCompany: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.attentionCompany) || null, city: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.city) || null, state: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.state) || null, postalCode: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.postalCode) || null, country: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.country) || null, phone1: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.phone1) || null, deliveryAddress1: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.deliveryAddress1) || null, billingAddress: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.billingAddress) || null, billingCountry: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.billingCountry) || null, billingPostalCode: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.billingPostalCode) || null, billingState: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.billingState) || null, billingCity: (shippingOrderInfo === null || shippingOrderInfo === void 0 ? void 0 : shippingOrderInfo.billingCity) || null, updater: user }));
             return foundDeliveryOrder;
         }
         catch (e) {
             throw e;
         }
     }
+    /** */
     async dispatchManualDeliveryOrder(context, orderInfo, orderItems) {
         try {
             const { tx, domain, user } = context.state;
             const foundDeliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name: orderInfo.name },
+                where: { domain: { id: domain.id }, name: orderInfo.name },
                 relations: ['transportVehicle', 'bizplace']
             });
             if (!foundDeliveryOrder)
@@ -214,7 +281,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             let deliveryOrderStatus = foundDeliveryOrder.status;
             let orderInventories;
             orderInventories = await tx.getRepository(order_inventory_1.OrderInventory).find({
-                where: { domain, deliveryOrder: foundDeliveryOrder },
+                where: { domain: { id: domain.id }, deliveryOrder: { id: foundDeliveryOrder.id } },
                 relations: ['product']
             });
             // if there is other destination value, create a new contact point
@@ -236,19 +303,19 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             }
             else {
                 foundCP = await tx.getRepository(biz_base_1.ContactPoint).findOne({
-                    where: { domain, id: orderInfo.contactPoint }
+                    where: { domain: { id: domain.id }, id: orderInfo.contactPoint }
                 });
             }
             let transportDriver = null;
             let transportVehicle = null;
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownDriver) {
                 transportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
-                    where: { domain, name: orderInfo.ownDriver }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownDriver }
                 });
             }
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck) {
                 transportVehicle = await tx.getRepository(transport_base_1.TransportVehicle).findOne({
-                    where: { domain, name: orderInfo.ownTruck }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownTruck }
                 });
                 await tx.getRepository(transport_base_1.TransportVehicle).save(Object.assign(Object.assign({}, transportVehicle), { status: transport_base_1.TRUCK_STATUS.IN_USE, updater: user }));
             }
@@ -267,7 +334,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             });
             await tx.getRepository(order_inventory_1.OrderInventory).save(orderInventories);
             await tx.getRepository(delivery_order_1.DeliveryOrder).save(Object.assign(Object.assign({}, foundDeliveryOrder), { transportDriver,
-                transportVehicle, contactPointRefId: foundCP.id || null, otherDriver: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherDriver) || null, truckNo: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherTruck) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck), to: foundCP.address, deliveryDate: orderInfo.deliveryDate, remark: orderInfo.remark, status: deliveryOrderStatus, reusablePallet: orderInfo.reusablePallet, updater: user }));
+                transportVehicle, contactPointRefId: foundCP.id || null, otherDriver: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherDriver) || null, truckNo: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.otherTruck) || (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck), to: foundCP.address, deliveryDate: orderInfo.deliveryDate, deliveryDateTime: new Date(), remark: orderInfo.remark, status: deliveryOrderStatus, reusablePallet: orderInfo.reusablePallet, updater: user }));
             return foundDeliveryOrder;
         }
         catch (e) {
@@ -278,7 +345,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
         try {
             const { tx, domain, user } = context.state;
             const foundDeliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name: orderInfo.name },
+                where: { domain: { id: domain.id }, name: orderInfo.name },
                 relations: ['transportVehicle', 'bizplace']
             });
             if (!foundDeliveryOrder)
@@ -288,7 +355,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             let deliveryOrderStatus = foundDeliveryOrder.status;
             let orderInventories;
             orderInventories = await tx.getRepository(order_inventory_1.OrderInventory).find({
-                where: { domain, deliveryOrder: foundDeliveryOrder },
+                where: { domain: { id: domain.id }, deliveryOrder: { id: foundDeliveryOrder.id } },
                 relations: ['inventory', 'inventory.product', 'inventory.reusablePallet']
             });
             orderInventories = orderInventories.map((orderInventory) => {
@@ -309,12 +376,12 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
             let transportVehicle = null;
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownDriver) {
                 transportDriver = await tx.getRepository(transport_base_1.TransportDriver).findOne({
-                    where: { domain, name: orderInfo.ownDriver }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownDriver }
                 });
             }
             if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.ownTruck) {
                 transportVehicle = await tx.getRepository(transport_base_1.TransportVehicle).findOne({
-                    where: { domain, name: orderInfo.ownTruck }
+                    where: { domain: { id: domain.id }, name: orderInfo.ownTruck }
                 });
                 await tx.getRepository(transport_base_1.TransportVehicle).save(Object.assign(Object.assign({}, transportVehicle), { status: transport_base_1.TRUCK_STATUS.IN_USE, updater: user }));
             }
@@ -335,7 +402,7 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
         try {
             const { tx, domain, user } = context.state;
             const deliveryOrder = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-                where: { domain, name }
+                where: { domain: { id: domain.id }, name }
             });
             if (!deliveryOrder)
                 throw new Error(`Delivery order doesn't exists.`);
@@ -351,13 +418,13 @@ let DeliveryOrderMutation = class DeliveryOrderMutation {
     async submitGoodsDeliveryNote(context, name, file) {
         const { tx, domain, user } = context.state;
         const foundDO = await tx.getRepository(delivery_order_1.DeliveryOrder).findOne({
-            where: { domain, name },
+            where: { domain: { id: domain.id }, name },
             relations: ['bizplace']
         });
         if (!foundDO)
             throw new Error(`DO doesn't exists.`);
         const foundAttachment = await tx.getRepository(attachment_base_1.Attachment).findOne({
-            where: { domain, refBy: foundDO.id }
+            where: { domain: { id: domain.id }, refBy: foundDO.id }
         });
         const attachment = {
             refType: 'DO',
@@ -385,7 +452,8 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, type_graphql_1.Arg)('targetInventories', type => [order_inventory_types_1.NewOrderInventory], { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('file', type => [GraphQLUpload_js_1.default], { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.NewDeliveryOrder, typeof (_a = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _a : Object, Array, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.NewDeliveryOrder,
+        shell_1.ObjectRef, Array, Array]),
     tslib_1.__metadata("design:returntype", Promise)
 ], DeliveryOrderMutation.prototype, "createDeliveryOrder", null);
 tslib_1.__decorate([
@@ -416,7 +484,9 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, type_graphql_1.Arg)('releaseGood', type => shell_1.ObjectRef, { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('targetInventories', type => [shell_1.ObjectRef], { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.DeliveryOrderPatch, typeof (_b = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _b : Object, typeof (_c = typeof shell_1.ObjectRef !== "undefined" && shell_1.ObjectRef) === "function" ? _c : Object, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.DeliveryOrderPatch,
+        shell_1.ObjectRef,
+        shell_1.ObjectRef, Array]),
     tslib_1.__metadata("design:returntype", Promise)
 ], DeliveryOrderMutation.prototype, "generateDeliveryOrder", null);
 tslib_1.__decorate([
@@ -453,8 +523,11 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Ctx)()),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('orderInfo', type => delivery_order_types_1.DeliveryOrderPatch, { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('orderItems', type => [order_inventory_types_1.OrderInventoryPatch], { nullable: true })),
+    tslib_1.__param(3, (0, type_graphql_1.Arg)('shippingInfo', type => release_good_types_1.ShippingOrderInfoPatch, { nullable: true })),
+    tslib_1.__param(4, (0, type_graphql_1.Arg)('exportInfo', type => release_good_types_1.ExportInformationPatch, { nullable: true })),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.DeliveryOrderPatch, Array]),
+    tslib_1.__metadata("design:paramtypes", [Object, delivery_order_types_1.DeliveryOrderPatch, Array, release_good_types_1.ShippingOrderInfoPatch,
+        release_good_types_1.ExportInformationPatch]),
     tslib_1.__metadata("design:returntype", Promise)
 ], DeliveryOrderMutation.prototype, "dispatchDeliveryOrder", null);
 tslib_1.__decorate([
@@ -502,13 +575,13 @@ DeliveryOrderMutation = tslib_1.__decorate([
 ], DeliveryOrderMutation);
 exports.DeliveryOrderMutation = DeliveryOrderMutation;
 async function createDeliveryOrder(orderInfo, customerBizplace, targetInventories, file, domain, user, tx) {
-    const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(biz_base_1.Bizplace)) || (0, typeorm_1.getRepository)(biz_base_1.Bizplace);
-    const deliveryOrderRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(delivery_order_1.DeliveryOrder)) || (0, typeorm_1.getRepository)(delivery_order_1.DeliveryOrder);
-    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, typeorm_1.getRepository)(product_base_1.Product);
-    const transportVehicleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportVehicle)) || (0, typeorm_1.getRepository)(transport_base_1.TransportVehicle);
-    const transportDriverRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportDriver)) || (0, typeorm_1.getRepository)(transport_base_1.TransportDriver);
-    const orderInventoryRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_inventory_1.OrderInventory)) || (0, typeorm_1.getRepository)(order_inventory_1.OrderInventory);
-    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+    const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(biz_base_1.Bizplace)) || (0, shell_1.getRepository)(biz_base_1.Bizplace);
+    const deliveryOrderRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(delivery_order_1.DeliveryOrder)) || (0, shell_1.getRepository)(delivery_order_1.DeliveryOrder);
+    const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, shell_1.getRepository)(product_base_1.Product);
+    const transportVehicleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportVehicle)) || (0, shell_1.getRepository)(transport_base_1.TransportVehicle);
+    const transportDriverRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportDriver)) || (0, shell_1.getRepository)(transport_base_1.TransportDriver);
+    const orderInventoryRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_inventory_1.OrderInventory)) || (0, shell_1.getRepository)(order_inventory_1.OrderInventory);
+    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
     const foundBizplace = await bizplaceRepo.findOne({
         where: {
             id: customerBizplace.id,
@@ -520,7 +593,7 @@ async function createDeliveryOrder(orderInfo, customerBizplace, targetInventorie
     // #1 find order number setting and set as DO name
     const doNoSetting = await settingRepo.findOne({
         where: {
-            domain,
+            domain: { id: domain.id },
             name: constants_1.ORDER_NUMBER_SETTING_KEY.DO_NUMBER_RULE
         }
     });
@@ -537,13 +610,13 @@ async function createDeliveryOrder(orderInfo, customerBizplace, targetInventorie
     if (!orderInfo.ownCollection) {
         transportVehicle = await transportVehicleRepo.findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 id: orderInfo.transportVehicle
             }
         });
         transportDriver = await transportDriverRepo.findOne({
             where: {
-                domain,
+                domain: { id: domain.id },
                 id: orderInfo.transportDriver
             }
         });
@@ -570,7 +643,7 @@ async function createDeliveryOrder(orderInfo, customerBizplace, targetInventorie
     }
     else {
         foundCP = await tx.getRepository(biz_base_1.ContactPoint).findOne({
-            where: { domain, id: orderInfo.contactPointRefId, bizplace: foundBizplace }
+            where: { domain: { id: domain.id }, id: orderInfo.contactPointRefId, bizplace: foundBizplace }
         });
     }
     // #4 save the delivery order info
@@ -626,26 +699,26 @@ async function generateDeliveryOrder(orderInfo, targetInventories, customerBizpl
     /**
      * 1. Validation for creating DO - data existing
      */
-    const deliveryOrderRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(delivery_order_1.DeliveryOrder)) || (0, typeorm_1.getRepository)(delivery_order_1.DeliveryOrder);
-    const transportVehicleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportVehicle)) || (0, typeorm_1.getRepository)(transport_base_1.TransportVehicle);
-    const transportDriverRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportDriver)) || (0, typeorm_1.getRepository)(transport_base_1.TransportDriver);
-    const orderInventoryRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_inventory_1.OrderInventory)) || (0, typeorm_1.getRepository)(order_inventory_1.OrderInventory);
-    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+    const deliveryOrderRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(delivery_order_1.DeliveryOrder)) || (0, shell_1.getRepository)(delivery_order_1.DeliveryOrder);
+    const transportVehicleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportVehicle)) || (0, shell_1.getRepository)(transport_base_1.TransportVehicle);
+    const transportDriverRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(transport_base_1.TransportDriver)) || (0, shell_1.getRepository)(transport_base_1.TransportDriver);
+    const orderInventoryRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_inventory_1.OrderInventory)) || (0, shell_1.getRepository)(order_inventory_1.OrderInventory);
+    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
     let transportVehicle = null;
     if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.truckNo) {
         transportVehicle = await transportVehicleRepo.findOne({
-            where: { domain, name: orderInfo.truckNo }
+            where: { domain: { id: domain.id }, name: orderInfo.truckNo }
         });
     }
     let transportDriver = null;
     if (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.transportDriver) {
         transportDriver = await transportDriverRepo.findOne({
-            where: { domain, id: orderInfo.transportDriver.id }
+            where: { domain: { id: domain.id }, id: orderInfo.transportDriver.id }
         });
     }
     const doNoSetting = await settingRepo.findOne({
         where: {
-            domain,
+            domain: { id: domain.id },
             name: constants_1.ORDER_NUMBER_SETTING_KEY.DO_NUMBER_RULE
         }
     });
@@ -656,6 +729,7 @@ async function generateDeliveryOrder(orderInfo, targetInventories, customerBizpl
     else {
         orderNo = order_no_generator_1.OrderNoGenerator.deliveryOrder();
     }
+    // insert shipping information from r/o to d/o
     let deliveryOrder = {
         domain,
         name: orderNo,
@@ -669,6 +743,19 @@ async function generateDeliveryOrder(orderInfo, targetInventories, customerBizpl
         transportDriver,
         status: constants_1.ORDER_STATUS.READY_TO_DISPATCH,
         contactPointRefId: (orderInfo === null || orderInfo === void 0 ? void 0 : orderInfo.contactPointRefId) || 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,
+        deliveryAddress1: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliveryAddress1) || null,
+        billingAddress: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingAddress) || null,
+        billingCountry: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingCountry) || null,
+        billingPostalCode: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingPostalCode) || null,
+        billingState: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingState) || null,
+        billingCity: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.billingCity) || null,
         creator: user,
         updater: user
     };