@things-factory/worksheet-base 4.3.538 → 4.3.541

package/dist-server/controllers/outbound/picking-worksheet-controller.js

@@ -11,8 +11,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createOrderPackageAndItems = exports.PickingWorksheetController = void 0;
+exports.sortingProduct = exports.createConsignmentWithMultipackage = exports.createConsignmentPackageItem = exports.createConsignmentPackage = exports.createOrderConsignment = exports.splitOrderConsignment = exports.createOrderPackageAndItems = exports.PickingWorksheetController = void 0;
 const typeorm_1 = require("typeorm");
+const uuid_1 = require("uuid");
 const auth_base_1 = require("@things-factory/auth-base");
 const env_1 = require("@things-factory/env");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
@@ -149,7 +150,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         return await this.createWorksheetDetails(worksheet, constants_1.WORKSHEET_TYPE.PICKING, [targetInventory]);
     }
     async activatePicking(worksheetNo) {
-        var _a;
+        var _a, _b;
         let worksheet = await this.findActivatableWorksheet(worksheetNo, constants_1.WORKSHEET_TYPE.PICKING, [
             'releaseGood',
             'releaseGood.bizplace',
@@ -186,8 +187,19 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'orderPackageItems.orderProduct.productDetail'
             ]
         });
-        worksheet.releaseGood = Object.assign(Object.assign({}, worksheet.releaseGood), { orderProducts, orderPackages });
+        let orderConsignments = await this.trxMgr.getRepository(sales_base_1.OrderConsignment).find({
+            where: { releaseGood: worksheet.releaseGood },
+            relations: [
+                'orderPackages',
+                'orderPackages.orderPackageItems',
+                'orderPackages.orderPackageItems.orderProduct',
+                'orderPackages.orderPackageItems.orderProduct.product',
+                'orderPackages.orderPackageItems.orderProduct.productDetail'
+            ]
+        });
+        worksheet.releaseGood = Object.assign(Object.assign({}, worksheet.releaseGood), { orderProducts, orderPackages, orderConsignments });
         let releaseGood = Object.assign(new sales_base_1.ReleaseGood(), worksheet.releaseGood);
+        let newReleaseGood;
         // assign inventory if unassigned
         if (!releaseGood.assignedInventory) {
             worksheetDetails = await this.assignInventoriesForUnassignedOrder(worksheet);
@@ -269,22 +281,32 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     break;
                 default:
                     if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
-                        let orderPackage = {
-                            name: sales_base_1.OrderNoGenerator.orderPackage(),
-                            packageId: null,
-                            trackingNo: null,
-                            transporter: null,
-                            airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
-                            invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
-                            status: sales_base_1.ORDER_STATUS.PROCESSING,
-                            releaseGood,
-                            domain: releaseGood.domain,
-                            bizplace: releaseGood.bizplace,
-                            creator: this.user,
-                            updater: this.user
-                        };
-                        worksheet.releaseGood = await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
-                        //worksheet.releaseGood = releaseGood
+                        let mps = (_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lastMileDelivery) === null || _b === void 0 ? void 0 : _b.mps;
+                        switch (mps) {
+                            case true:
+                                newReleaseGood = await splitOrderConsignment(this.trxMgr, releaseGood, this.user, this.domain);
+                                break;
+                            case false:
+                            case undefined:
+                                let orderConsignment = await createOrderConsignment(this.trxMgr, {}, releaseGood, this.user);
+                                let orderPackage = {
+                                    name: sales_base_1.OrderNoGenerator.orderPackage(),
+                                    packageId: null,
+                                    trackingNo: null,
+                                    transporter: null,
+                                    airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
+                                    invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
+                                    status: sales_base_1.ORDER_STATUS.PROCESSING,
+                                    releaseGood,
+                                    domain: releaseGood.domain,
+                                    bizplace: releaseGood.bizplace,
+                                    creator: this.user,
+                                    updater: this.user,
+                                    orderConsignment: orderConsignment
+                                };
+                                newReleaseGood = await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
+                                break;
+                        }
                     }
                     break;
             }
@@ -292,6 +314,9 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         catch (error) {
             env_1.logger.error(`picking-worksheet-controller[activatePicking]: ${error}`);
         }
+        if (newReleaseGood) {
+            worksheet.releaseGood = newReleaseGood;
+        }
         return worksheet;
     }
     async activateBulkPicking(worksheetNo) {
@@ -306,13 +331,19 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .leftJoinAndSelect('w.releaseGood', 'rg')
                 .leftJoinAndSelect('rg.domain', 'rgd')
                 .leftJoinAndSelect('rg.lastMileDelivery', 'lmd')
-                .leftJoinAndSelect('rg.orderPackages', 'rgop')
-                .leftJoinAndSelect('rgop.orderPackageItems', 'rgopi')
-                .leftJoinAndSelect('rgopi.orderProduct', 'op2')
+                .leftJoinAndSelect('rg.orderPackages', 'op')
+                .leftJoinAndSelect('op.orderPackageItems', 'opi')
+                .leftJoinAndSelect('opi.orderProduct', 'op2')
                 .leftJoinAndSelect('op2.product', 'p')
                 .leftJoinAndSelect('op2.productDetail', 'pd')
-                .leftJoinAndSelect('rg.bizplace', 'rgbz')
-                .leftJoinAndSelect('rgbz.domain', 'bzd')
+                .leftJoinAndSelect('rg.orderConsignments', 'oc')
+                .leftJoinAndSelect('oc.orderPackages', 'ocop')
+                .leftJoinAndSelect('ocop.orderPackageItems', 'ocpi')
+                .leftJoinAndSelect('ocpi.orderProduct', 'ocp2')
+                .leftJoinAndSelect('ocp2.product', 'ocp')
+                .leftJoinAndSelect('ocp2.productDetail', 'ocpd')
+                .leftJoinAndSelect('rg.bizplace', 'rgb')
+                .leftJoinAndSelect('rgb.domain', 'rgbd')
                 .leftJoinAndSelect('b.domain', 'bd')
                 .leftJoinAndSelect('b.company', 'c')
                 .leftJoinAndSelect('c.domain', 'cd')
@@ -387,32 +418,51 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         // retrieve order inventory
         const pickingOrderInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).find({
             where: { domain: this.domain, refWorksheetId: worksheet.id, status: sales_base_1.ORDER_STATUS.PICKING },
-            relations: [
-                'releaseGood',
-                'releaseGood.domain',
-                'releaseGood.lastMileDelivery',
-                'releaseGood.bizplace',
-                'releaseGood.bizplace.domain',
-                'releaseGood.orderPackages',
-                'releaseGood.orderPackages.orderPackageItems',
-                'releaseGood.orderPackages.orderPackageItems.orderProduct',
-                'releaseGood.orderPackages.orderPackageItems.orderProduct.product',
-                'releaseGood.orderPackages.orderPackageItems.orderProduct.productDetail',
-                'releaseGood.orderProducts',
-                'releaseGood.orderProducts.productDetail',
-                'releaseGood.orderProducts.product'
-            ]
+            relations: ['releaseGood']
         });
-        let releaseGoods = pickingOrderInventory.reduce((data, oi) => {
-            if (!data.find(x => x.id == oi.releaseGood.id)) {
-                data.push(oi.releaseGood);
+        const releaseGoodIds = pickingOrderInventory.reduce((data, order) => {
+            const id = order.releaseGood.id;
+            if (!data.includes(id)) {
+                data.push(id);
             }
             return data;
         }, []);
+        let releaseGoods = await this.trxMgr.getRepository(sales_base_1.ReleaseGood).find({
+            where: { id: (0, typeorm_1.In)(releaseGoodIds) },
+            relations: [
+                'domain',
+                'lastMileDelivery',
+                'bizplace',
+                'bizplace.domain',
+                'orderPackages',
+                'orderPackages.orderPackageItems',
+                'orderPackages.orderPackageItems.orderProduct',
+                'orderPackages.orderPackageItems.orderProduct.product',
+                'orderPackages.orderPackageItems.orderProduct.productDetail',
+                'orderProducts',
+                'orderProducts.productDetail',
+                'orderProducts.product',
+                'orderConsignments',
+                'orderConsignments.orderPackages',
+                'orderConsignments.orderPackages.orderPackageItems',
+                'orderConsignments.orderPackages.orderPackageItems.orderProduct',
+                'orderConsignments.orderPackages.orderPackageItems.orderProduct.product',
+                'orderConsignments.orderPackages.orderPackageItems.orderProduct.productDetail'
+            ]
+        });
+        pickingOrderInventory.forEach(order => {
+            order.releaseGood = releaseGoods.find(rg => rg.id === order.releaseGood.id);
+        });
+        // let releaseGoodss: ReleaseGood[] = pickingOrderInventory.reduce((data, oi: OrderInventory) => {
+        //   if (!data.find(x => x.id == oi.releaseGood.id)) {
+        //     data.push(oi.releaseGood)
+        //   }
+        //   return data
+        // }, [])
         // massage data and trigger SC pack order asynchronously
         if (releaseGoods === null || releaseGoods === void 0 ? void 0 : releaseGoods.length) {
             releaseGoods = await Promise.all(releaseGoods.map(async (releaseGood) => {
-                var _a;
+                var _a, _b;
                 try {
                     const orderSource = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.source;
                     switch (orderSource) {
@@ -458,21 +508,32 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             break;
                         default:
                             if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
-                                let orderPackage = {
-                                    name: sales_base_1.OrderNoGenerator.orderPackage(),
-                                    packageId: null,
-                                    trackingNo: null,
-                                    transporter: null,
-                                    airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
-                                    invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
-                                    status: sales_base_1.ORDER_STATUS.PROCESSING,
-                                    releaseGood,
-                                    domain: releaseGood.domain,
-                                    bizplace: releaseGood.bizplace,
-                                    creator: this.user,
-                                    updater: this.user
-                                };
-                                releaseGood = await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
+                                let mps = (_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lastMileDelivery) === null || _b === void 0 ? void 0 : _b.mps;
+                                switch (mps) {
+                                    case true:
+                                        await splitOrderConsignment(this.trxMgr, releaseGood, this.user, this.domain);
+                                        break;
+                                    case false:
+                                    case undefined:
+                                        let orderConsignment = await createOrderConsignment(this.trxMgr, {}, releaseGood, this.user);
+                                        let orderPackage = {
+                                            name: sales_base_1.OrderNoGenerator.orderPackage(),
+                                            packageId: null,
+                                            trackingNo: null,
+                                            transporter: null,
+                                            airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
+                                            invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
+                                            status: sales_base_1.ORDER_STATUS.PROCESSING,
+                                            releaseGood,
+                                            domain: releaseGood.domain,
+                                            bizplace: releaseGood.bizplace,
+                                            creator: this.user,
+                                            updater: this.user,
+                                            orderConsignment: orderConsignment
+                                        };
+                                        await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
+                                        break;
+                                }
                             }
                             break;
                     }
@@ -482,7 +543,12 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 }
                 return Object.assign(Object.assign({}, releaseGood), { status: releaseGood.status != 'PENDING_CANCEL' ? sales_base_1.ORDER_STATUS.PICKING : releaseGood.status, updater: this.user, assignedInventory: true });
             }));
-            await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGoods);
+            await Promise.all(releaseGoods.map(rg => this.trxMgr.getRepository(sales_base_1.ReleaseGood).update(rg.id, {
+                status: rg.status,
+                updater: this.user,
+                assignedInventory: true,
+                updatedAt: () => 'CURRENT_TIMESTAMP'
+            })));
         }
         for (const releaseGood of releaseGoods) {
             (0, integration_base_1.webhookHandler)(releaseGood, releaseGood.bizplace, integration_base_1.WebhookEvents.PickingStarted);
@@ -1898,7 +1964,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         return newWorksheetDetails;
     }
     async activateBulkWorksheets(bizplaceId, worksheetIds) {
-        var _a;
+        var _a, _b;
         const updatedWs = [];
         try {
             for (const worksheetId of worksheetIds) {
@@ -1908,36 +1974,55 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     await (0, typeorm_1.getManager)().transaction(async (tx) => {
                         var _a;
                         const worksheetRepo = tx.getRepository(entities_1.Worksheet);
-                        let worksheet = await worksheetRepo
-                            .createQueryBuilder('w')
-                            .leftJoinAndSelect('w.releaseGood', 'rg')
-                            .leftJoinAndSelect('rg.bizplace', 'rg_b')
-                            .leftJoinAndSelect('rg.domain', 'rg_d')
-                            .leftJoinAndSelect('rg.lastMileDelivery', 'rg_lmd')
-                            .leftJoinAndSelect('rg_b.domain', 'b_d')
-                            .leftJoinAndSelect('rg.orderProducts', 'rg_op')
-                            .leftJoinAndSelect('rg_op.product', 'op_p')
-                            .leftJoinAndSelect('rg_op.productDetail', 'op_pd')
-                            .leftJoinAndSelect('rg_op.productBundle', 'op_pb')
-                            .leftJoinAndSelect('op_pb.productBundleSettings', 'pb_ps')
-                            .leftJoinAndSelect('pb_ps.productDetail', 'ps_pd')
-                            .leftJoinAndSelect('op_pd.product', 'pd_p')
-                            .leftJoinAndSelect('rg.orderPackages', 'rg_opc')
-                            .leftJoinAndSelect('rg_opc.orderPackageItems', 'opc_opi')
-                            .leftJoinAndSelect('opc_opi.orderProduct', 'opi_op')
-                            .leftJoinAndSelect('opi_op.product', 'op_p2')
-                            .leftJoinAndSelect('opi_op.productDetail', 'op_pd2')
-                            .leftJoinAndSelect('w.domain', 'd')
-                            .leftJoinAndSelect('w.bizplace', 'b')
-                            .leftJoinAndSelect('b.company', 'c')
-                            .leftJoinAndSelect('c.domain', 'c_d')
-                            .leftJoinAndSelect('w.worksheetDetails', 'wd')
-                            .leftJoinAndSelect('wd.targetInventory', 'ti')
-                            .leftJoinAndSelect('ti.product', 'tp')
-                            .where('w.id = :worksheetId', { worksheetId: worksheetId })
-                            .andWhere('w.bizplace_id = :bizplaceId', { bizplaceId: bizplaceId })
-                            .getOne();
+                        let worksheet = await worksheetRepo.findOne({
+                            where: { id: worksheetId, bizplace: bizplaceId },
+                            relations: [
+                                'domain',
+                                'bizplace',
+                                'bizplace.company',
+                                'bizplace.company.domain',
+                                'releaseGood',
+                                'releaseGood.bizplace',
+                                'releaseGood.domain',
+                                'releaseGood.lastMileDelivery',
+                                'releaseGood.bizplace.domain',
+                                'worksheetDetails',
+                                'worksheetDetails.targetInventory',
+                                'worksheetDetails.targetInventory.product'
+                            ]
+                        });
                         let worksheetDetails;
+                        let orderProducts = await tx.getRepository(sales_base_1.OrderProduct).find({
+                            where: { releaseGood: worksheet.releaseGood },
+                            relations: [
+                                'product',
+                                'productDetail',
+                                'productBundle',
+                                'productBundle.productBundleSettings',
+                                'productBundle.productBundleSettings.productDetail',
+                                'productDetail.product'
+                            ]
+                        });
+                        let orderPackages = await tx.getRepository(sales_base_1.OrderPackage).find({
+                            where: { releaseGood: worksheet.releaseGood },
+                            relations: [
+                                'orderPackageItems',
+                                'orderPackageItems.orderProduct',
+                                'orderPackageItems.orderProduct.product',
+                                'orderPackageItems.orderProduct.product.productDetails'
+                            ]
+                        });
+                        let orderConsignments = await tx.getRepository(sales_base_1.OrderConsignment).find({
+                            where: { releaseGood: worksheet.releaseGood },
+                            relations: [
+                                'orderPackages',
+                                'orderPackages.orderPackageItems',
+                                'orderPackages.orderPackageItems.orderProduct',
+                                'orderPackages.orderPackageItems.orderProduct.product',
+                                'orderPackages.orderPackageItems.orderProduct.product.productDetails'
+                            ]
+                        });
+                        worksheet.releaseGood = Object.assign(Object.assign({}, worksheet.releaseGood), { orderProducts, orderPackages, orderConsignments });
                         if (((_a = worksheet.releaseGood) === null || _a === void 0 ? void 0 : _a.assignedInventory) == false) {
                             worksheetDetails = await this.assignInventoriesForUnassignedOrder(worksheet, tx);
                             worksheet.worksheetDetails = worksheetDetails;
@@ -2003,23 +2088,36 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             // Trigger Whole Order Process
                             sales_base_1.WebspertController.triggerOrderProcesses(releaseGood, this.domain, this.user);
                             break;
+                        case auth_base_1.ApplicationType.MMS:
+                            break;
                         default:
                             if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
-                                let orderPackage = {
-                                    name: sales_base_1.OrderNoGenerator.orderPackage(),
-                                    packageId: null,
-                                    trackingNo: null,
-                                    transporter: null,
-                                    airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
-                                    invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
-                                    status: sales_base_1.ORDER_STATUS.PROCESSING,
-                                    releaseGood,
-                                    domain: releaseGood.domain,
-                                    bizplace: releaseGood.bizplace,
-                                    creator: this.user,
-                                    updater: this.user
-                                };
-                                await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
+                                let mps = (_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lastMileDelivery) === null || _b === void 0 ? void 0 : _b.mps;
+                                switch (mps) {
+                                    case true:
+                                        await splitOrderConsignment(this.trxMgr, releaseGood, this.user, this.domain);
+                                        break;
+                                    case false:
+                                    case undefined:
+                                        let orderConsignment = await createOrderConsignment(this.trxMgr, {}, releaseGood, this.user);
+                                        let orderPackage = {
+                                            name: sales_base_1.OrderNoGenerator.orderPackage(),
+                                            packageId: null,
+                                            trackingNo: null,
+                                            transporter: null,
+                                            airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
+                                            invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
+                                            status: sales_base_1.ORDER_STATUS.PROCESSING,
+                                            releaseGood,
+                                            domain: releaseGood.domain,
+                                            bizplace: releaseGood.bizplace,
+                                            creator: this.user,
+                                            updater: this.user,
+                                            orderConsignment: orderConsignment
+                                        };
+                                        await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
+                                        break;
+                                }
                             }
                             break;
                     }
@@ -2037,44 +2135,320 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
 }
 exports.PickingWorksheetController = PickingWorksheetController;
 async function createOrderPackageAndItems(tx, releaseGood, orderPackage) {
-    let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
-    const orderPackageItems = releaseGood.orderProducts
-        .map(op => {
-        if (op.product) {
-            return {
-                name: sales_base_1.OrderNoGenerator.orderPackageItem(),
-                orderProduct: op,
+    try {
+        let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
+        const orderPackageItems = releaseGood.orderProducts
+            .map(op => {
+            if (op.product) {
+                return {
+                    id: (0, uuid_1.v4)(),
+                    name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                    orderProduct: op,
+                    status: sales_base_1.ORDER_STATUS.PROCESSING,
+                    releaseQty: op.releaseQty,
+                    orderPackage: savedOrderPackage,
+                    domain: releaseGood.domain,
+                    bizplace: releaseGood.bizplace,
+                    creator: releaseGood.creator,
+                    updater: releaseGood.updater,
+                    productDetail: op.productDetail
+                };
+            }
+            else {
+                let productBundle = op.productBundle;
+                return productBundle.productBundleSettings.map(pbs => ({
+                    name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                    orderProduct: op,
+                    status: sales_base_1.ORDER_STATUS.PROCESSING,
+                    releaseQty: op.releaseQty * pbs.bundleQty,
+                    orderPackage: savedOrderPackage,
+                    domain: releaseGood.domain,
+                    bizplace: releaseGood.bizplace,
+                    creator: releaseGood.creator,
+                    updater: releaseGood.updater,
+                    productDetail: pbs.productDetail
+                }));
+            }
+        })
+            .flat();
+        await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
+        orderPackage.orderPackageItems = orderPackageItems;
+        releaseGood.orderPackages = [orderPackage];
+        return releaseGood;
+    }
+    catch (e) {
+        env_1.logger.error(`error:${e}`);
+    }
+}
+exports.createOrderPackageAndItems = createOrderPackageAndItems;
+async function splitOrderConsignment(tx, releaseGood, user, domain) {
+    try {
+        let currentConsignment = { id: (0, uuid_1.v4)(), totalWeight: 0, orderPackages: [] };
+        let totalConsignments = [];
+        let currOrderProducts = [];
+        let totalConsignmentWeight = 0;
+        let orderProducts = releaseGood.orderProducts;
+        let maxConsignmentWeight = releaseGood.lastMileDelivery.consignmentWeight;
+        //sort product according to packingType
+        let sortOrderProducts = await sortingProduct(orderProducts);
+        //initialise new orderConsignment created
+        const createdNewConsignment = () => ({
+            id: (0, uuid_1.v4)(),
+            totalWeight: 0,
+            orderPackages: []
+        });
+        //push orderPackage & packageItems into consigment
+        const createPackageConsignment = (consignment, packageWeight, releaseGood, orderProduct, releaseQty, user) => {
+            consignment.totalWeight += packageWeight;
+            currentConsignment.orderPackages.push({
+                id: (0, uuid_1.v4)(),
+                name: sales_base_1.OrderNoGenerator.orderPackage(),
+                packageId: null,
+                trackingNo: null,
+                transporter: null,
+                airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
+                invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
                 status: sales_base_1.ORDER_STATUS.PROCESSING,
-                releaseQty: op.releaseQty,
-                orderPackage: savedOrderPackage,
+                releaseGood,
                 domain: releaseGood.domain,
                 bizplace: releaseGood.bizplace,
-                creator: releaseGood.creator,
-                updater: releaseGood.updater,
-                productDetail: op.productDetail
-            };
+                creator: user,
+                updater: user,
+                orderPackageItems: [
+                    {
+                        id: (0, uuid_1.v4)(),
+                        name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                        releaseQty: releaseQty,
+                        orderProduct: orderProduct,
+                        domain: releaseGood.domain,
+                        bizplace: releaseGood.bizplace,
+                        creator: releaseGood.creator,
+                        updater: releaseGood.updater,
+                        productDetail: orderProduct.productDetail
+                    }
+                ]
+            });
+        };
+        const createPackage = op => {
+            let releaseQty = op.productDetail.packingType.toLowerCase() === 'carton' ? 1 : op.releaseQty;
+            let packageWeight = op.productDetail.packingType.toLowerCase() === 'carton'
+                ? op.productDetail.grossWeight
+                : op.productDetail.grossWeight * releaseQty;
+            const isCarton = op.productDetail.packingType.toLowerCase() === 'carton';
+            totalConsignmentWeight += packageWeight;
+            const requiresNewConsignment = totalConsignmentWeight >= maxConsignmentWeight;
+            if (isCarton || op.releaseQty > 1) {
+                if (requiresNewConsignment) {
+                    //push the current consignment to create new consignment
+                    totalConsignments.push(currentConsignment);
+                    //Initialise the totalConsignment weight to the new data
+                    totalConsignmentWeight = packageWeight + 0;
+                    currentConsignment = createdNewConsignment();
+                }
+                createPackageConsignment(currentConsignment, packageWeight, releaseGood, op, releaseQty, user);
+            }
+            else {
+                currOrderProducts.push(op);
+            }
+        };
+        sortOrderProducts.forEach(item => {
+            if (item.packingType.toLowerCase() === 'carton') {
+                for (let i = 0; i < item.releaseQty; i++) {
+                    createPackage(item);
+                }
+            }
+            else {
+                createPackage(item);
+            }
+        });
+        // Add any remaining items to the last orderPackage
+        if (currOrderProducts.length > 0) {
+            let availableConsignment;
+            for (let i = 0; i < currOrderProducts.length; i++) {
+                let op = currOrderProducts[i];
+                let releaseQty = op.releaseQty;
+                let currProductWeight = op.productDetail.grossWeight * op.releaseQty;
+                let lastOrderPackage = currentConsignment.orderPackages[currentConsignment.orderPackages.length - 1];
+                //push the product into last current consignment orderPackage
+                if (currentConsignment.totalWeight + currProductWeight < maxConsignmentWeight) {
+                    if (lastOrderPackage) {
+                        lastOrderPackage.orderPackageItems.push({
+                            id: (0, uuid_1.v4)(),
+                            name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                            releaseQty: op.releaseQty,
+                            orderProduct: op,
+                            domain: releaseGood.domain,
+                            bizplace: releaseGood.bizplace,
+                            creator: releaseGood.creator,
+                            updater: releaseGood.updater,
+                            productDetail: op.productDetail
+                        });
+                    }
+                    else {
+                        await createPackageConsignment(currentConsignment, currProductWeight, releaseGood, op, releaseQty, user);
+                    }
+                }
+                else {
+                    //push the currentConsignment into list of all the consignments
+                    if (!totalConsignments.some(tc => tc.id === currentConsignment.id)) {
+                        totalConsignments.push(currentConsignment);
+                    }
+                    //find one  order consignment to include the product
+                    availableConsignment = totalConsignments.find(tc => {
+                        tc.totalWeight += currProductWeight < maxConsignmentWeight;
+                    });
+                    if (availableConsignment) {
+                        let lastOrderPackage = availableConsignment.orderPackages[currentConsignment.orderPackages.length - 1];
+                        lastOrderPackage.orderPackageItems.push({
+                            id: (0, uuid_1.v4)(),
+                            name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                            releaseQty: op.releaseQty,
+                            orderProducts: op,
+                            domain: releaseGood.domain,
+                            bizplace: releaseGood.bizplace,
+                            creator: releaseGood.creator,
+                            updater: releaseGood.updater,
+                            productDetail: op.productDetail
+                        });
+                        //update the totalConsignment data
+                        totalConsignments = totalConsignments.map(tc => {
+                            tc.id === availableConsignment.id ? availableConsignment : tc;
+                        });
+                    }
+                    else {
+                        //create new consignment if no consignment available
+                        currentConsignment = createdNewConsignment();
+                        createPackageConsignment(currentConsignment, currProductWeight, releaseGood, op, releaseQty, user);
+                        totalConsignments.push(currentConsignment);
+                    }
+                }
+            }
         }
-        else {
-            let productBundle = op.productBundle;
-            return productBundle.productBundleSettings.map(pbs => ({
-                name: sales_base_1.OrderNoGenerator.orderPackageItem(),
-                orderProduct: op,
-                status: sales_base_1.ORDER_STATUS.PROCESSING,
-                releaseQty: op.releaseQty * pbs.bundleQty,
-                orderPackage: savedOrderPackage,
-                domain: releaseGood.domain,
-                bizplace: releaseGood.bizplace,
-                creator: releaseGood.creator,
-                updater: releaseGood.updater,
-                productDetail: pbs.productDetail
-            }));
+        //totalConsignments.length < 1 ? totalConsignments.push(currentConsignment) : totalConsignments
+        const existingConsignment = totalConsignments.find(tc => tc.id === currentConsignment.id);
+        if (!existingConsignment) {
+            totalConsignments.push(currentConsignment);
         }
-    })
-        .flat();
-    await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
-    orderPackage.orderPackageItems = orderPackageItems;
-    releaseGood.orderPackages = [orderPackage];
-    return releaseGood;
+        let orderConsignment = totalConsignments;
+        let newReleaseGood = await createConsignmentWithMultipackage(tx, orderConsignment, releaseGood, user, domain);
+        return newReleaseGood;
+    }
+    catch (e) {
+        env_1.logger.error(`[lmd-create-consignment-notes]: ${e} `);
+    }
 }
-exports.createOrderPackageAndItems = createOrderPackageAndItems;
+exports.splitOrderConsignment = splitOrderConsignment;
+async function createOrderConsignment(tx, orderCons, releaseGood, user) {
+    var _a;
+    try {
+        let orderConsignment = {
+            id: (0, uuid_1.v4)(),
+            name: sales_base_1.OrderNoGenerator.orderConsignment(),
+            noOfPackages: ((_a = orderCons === null || orderCons === void 0 ? void 0 : orderCons.orderPackages) === null || _a === void 0 ? void 0 : _a.length) ? orderCons.orderPackages.length : 1,
+            domain: releaseGood.domain,
+            bizplace: releaseGood.bizplace,
+            releaseGood: releaseGood,
+            orderPackages: [],
+            creator: user,
+            updater: user
+        };
+        orderConsignment = await tx.getRepository(sales_base_1.OrderConsignment).save(orderConsignment);
+        return orderConsignment;
+    }
+    catch (e) {
+        env_1.logger.error(`[lmd-create-order-consignment]: ${e} `);
+    }
+}
+exports.createOrderConsignment = createOrderConsignment;
+async function createConsignmentPackage(tx, orderPackageData, releaseGood, user, orderConsignment) {
+    try {
+        const orderPackage = {
+            id: (0, uuid_1.v4)(),
+            name: sales_base_1.OrderNoGenerator.orderPackage(),
+            packageId: null,
+            trackingNo: null,
+            transporter: null,
+            airwayBill: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.airwayBill,
+            invoice: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.invoice,
+            status: sales_base_1.ORDER_STATUS.PROCESSING,
+            releaseGood,
+            domain: releaseGood.domain,
+            bizplace: releaseGood.bizplace,
+            creator: user,
+            updater: user,
+            orderConsignment
+        };
+        return tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
+    }
+    catch (e) {
+        env_1.logger.error(`[lmd-create-order-package]: ${e} `);
+    }
+}
+exports.createConsignmentPackage = createConsignmentPackage;
+async function createConsignmentPackageItem(tx, orderPackageItemsData, savedOrderPackage, releaseGood) {
+    try {
+        const orderPackageItems = orderPackageItemsData.map(opi => ({
+            id: opi.id,
+            name: opi.name,
+            orderProduct: opi.orderProduct,
+            status: sales_base_1.ORDER_STATUS.PROCESSING,
+            releaseQty: opi.releaseQty,
+            orderPackage: savedOrderPackage,
+            domain: releaseGood.domain,
+            bizplace: releaseGood.bizplace,
+            creator: releaseGood.creator,
+            updater: releaseGood.updater,
+            productDetail: opi.productDetail
+        }));
+        await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
+        return orderPackageItems;
+    }
+    catch (e) {
+        env_1.logger.error(`[lmd-create-order-package]: ${e} `);
+    }
+}
+exports.createConsignmentPackageItem = createConsignmentPackageItem;
+async function createConsignmentWithMultipackage(tx, orderConsList, releaseGood, user, domain) {
+    try {
+        let newOrderPackages = [];
+        let newOrderConsignments = [];
+        for (const orderCons of orderConsList) {
+            const savedOrderConsignment = await createOrderConsignment(tx, orderCons, releaseGood, user);
+            for (const currentPackage of orderCons.orderPackages) {
+                const savedOrderPackage = await createConsignmentPackage(tx, currentPackage, releaseGood, user, savedOrderConsignment);
+                const orderPackageItems = await createConsignmentPackageItem(tx, currentPackage.orderPackageItems, savedOrderPackage, releaseGood);
+                savedOrderPackage.orderPackageItems = orderPackageItems;
+                savedOrderConsignment.orderPackages.push(savedOrderPackage);
+                newOrderPackages.push(savedOrderPackage);
+            }
+            newOrderConsignments.push(savedOrderConsignment);
+        }
+        releaseGood.orderConsignments = newOrderConsignments;
+        releaseGood.orderPackages = newOrderPackages;
+        return releaseGood;
+    }
+    catch (error) {
+        console.error('Error creating consignment with multiple packages:', error);
+        throw error;
+    }
+}
+exports.createConsignmentWithMultipackage = createConsignmentWithMultipackage;
+async function sortingProduct(orderProducts) {
+    try {
+        orderProducts.sort((a, b) => {
+            if (a.product.packingType !== b.product.packingType) {
+                return a.product.packingType < b.product.packingType ? -1 : 1;
+            }
+            if (a.product.sku !== b.product.sku) {
+                return a.product.sku < b.product.sku ? -1 : 1;
+            }
+            return 0;
+        });
+        return orderProducts;
+    }
+    catch (e) {
+        env_1.logger.error(`[lmd-sort-product]: ${e} `);
+    }
+}
+exports.sortingProduct = sortingProduct;
 //# sourceMappingURL=picking-worksheet-controller.js.map