@things-factory/worksheet-base 4.3.393 → 4.3.395

package/dist-server/controllers/outbound/index.js

@@ -14,9 +14,12 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOrderPackageAndItems = void 0;
 __exportStar(require("./loading-worksheet-controller"), exports);
 __exportStar(require("./packing-worksheet-controller"), exports);
 __exportStar(require("./picking-worksheet-controller"), exports);
 __exportStar(require("./returning-worksheet-controller"), exports);
 __exportStar(require("./sorting-worksheet-controller"), exports);
+var picking_worksheet_controller_1 = require("./picking-worksheet-controller");
+Object.defineProperty(exports, "createOrderPackageAndItems", { enumerable: true, get: function () { return picking_worksheet_controller_1.createOrderPackageAndItems; } });
 //# sourceMappingURL=index.js.map

package/dist-server/controllers/outbound/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/outbound/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA8C;AAC9C,iEAA8C;AAC9C,iEAA8C;AAC9C,mEAAgD;AAChD,iEAA8C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/controllers/outbound/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iEAA8C;AAC9C,iEAA8C;AAC9C,iEAA8C;AAC9C,mEAAgD;AAChD,iEAA8C;AAE9C,+EAAyE;AAAjE,0IAAA,0BAA0B,OAAA"}

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

@@ -11,7 +11,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PickingWorksheetController = void 0;
+exports.createOrderPackageAndItems = exports.PickingWorksheetController = void 0;
 const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const env_1 = require("@things-factory/env");
@@ -156,11 +156,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             'releaseGood.bizplace.domain',
             'releaseGood.orderProducts',
             'releaseGood.orderProducts.productDetail',
+            'releaseGood.orderProducts.product',
             'releaseGood.orderProducts.productDetail.product',
             'releaseGood.orderPackages',
             'releaseGood.orderPackages.orderPackageItems',
             'releaseGood.orderPackages.orderPackageItems.orderProduct',
             'releaseGood.orderPackages.orderPackageItems.orderProduct.product',
+            'releaseGood.orderPackages.orderPackageItems.orderProduct.productDetail',
             'domain',
             'bizplace',
             'bizplace.domain',
@@ -247,6 +249,21 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     });
                     break;
                 default:
+                    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: releaseGood.creator,
+                        updater: releaseGood.updater
+                    };
+                    await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
                     break;
             }
         }
@@ -266,6 +283,12 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .leftJoinAndSelect('w.worksheetDetails', 'wd')
                 .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('op2.product', 'p')
+                .leftJoinAndSelect('op2.productDetail', 'pd')
                 .leftJoinAndSelect('rg.bizplace', 'rgbz')
                 .leftJoinAndSelect('rgbz.domain', 'bzd')
                 .leftJoinAndSelect('b.domain', 'bd')
@@ -291,9 +314,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 }
             }
             const groupedWsBiz = [...groupWs.entries()];
-            await Promise.all(groupedWsBiz.map(async ([bizplaceId, worksheetIds]) => {
+            const updatedWs = await Promise.all(groupedWsBiz.map(async ([bizplaceId, worksheetIds]) => {
                 return await this.activateBulkWorksheets(bizplaceId, worksheetIds);
             }));
+            worksheets = updatedWs.flat();
         }
         catch (error) {
             throw error;
@@ -349,7 +373,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'releaseGood.orderPackages',
                 'releaseGood.orderPackages.orderPackageItems',
                 'releaseGood.orderPackages.orderPackageItems.orderProduct',
-                'releaseGood.orderPackages.orderPackageItems.orderProduct.product'
+                'releaseGood.orderPackages.orderPackageItems.orderProduct.product',
+                'releaseGood.orderPackages.orderPackageItems.orderProduct.productDetail',
+                'releaseGood.orderProducts',
+                'releaseGood.orderProducts.productDetail',
+                'releaseGood.orderProducts.product',
             ]
         });
         let releaseGoods = pickingOrderInventory.reduce((data, oi) => {
@@ -401,6 +429,21 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             });
                             break;
                         default:
+                            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: releaseGood.creator,
+                                updater: releaseGood.updater
+                            };
+                            await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
                             break;
                     }
                 }
@@ -519,6 +562,47 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
       `, worksheetDetailFilters.map((data, idx) => {
                 return data.value;
             }));
+            // find directly without going through the materialized view
+            if ((worksheetDetailRaw.length < 1)) {
+                worksheetDetailRaw = await this.trxMgr.query(`
+          select
+          wd.id AS "worksheetDetailId",
+          wd.name as "worksheetDetailName",
+          w.id as "worksheetId",
+          w.domain_id as "domainId",
+          op.id as "targetProductId",
+          oi.product_id as "productId",
+          oi.product_detail_id as "productDetailId",
+          op.uom_value as "uomValue",
+          pb.id  as "productBarcodeId",
+          pb.gtin,
+          p.is_require_serial_number_scanning_outbound as "productIsRequireSerialNumberScanningOutbound",
+          oi.release_good_id as "releaseGoodId",
+          oi.id as "orderInventoryId",
+          oi.status as "orderInventoryStatus",
+          oi.bizplace_id as "bizplaceId",
+          i.id as "inventoryId",
+          i.carton_id as "inventoryCartonId",
+          i.status as "inventoryStatus",
+          ici.status as "inventoryCheckItemStatus",
+          rg.name as "releaseGoodName",
+          rg.ref_no as "refNo"
+          FROM worksheet_details wd
+          INNER JOIN worksheets w ON wd.worksheet_id = w.id
+          inner JOIN order_inventories oi ON oi.id = wd.target_inventory_id
+          inner JOIN order_products op ON op.id = oi.order_product_id
+          inner join inventories i on i.id = oi.inventory_id
+          inner join release_goods rg on rg.id = oi.release_good_id
+          left join inventory_check_items ici on ici.inventory_id = oi.inventory_id
+          inner join products p on p.id = oi.product_id
+          left join product_bundles pb2 on pb2.id = op.product_bundle_id
+          LEFT JOIN product_barcodes pb ON pb.product_detail_id = oi.product_detail_id 
+          left join product_bundle_settings pbs on pbs.product_bundle_id = pb2.id and pbs.product_id = oi.product_id and pbs.product_detail_id = oi.product_detail_id
+          WHERE w.type::text = 'PICKING'::text AND w.status::text = 'EXECUTING'::text
+          and wd.name = $1 and w.domain_id = $2 and i.carton_id = $3
+          ORDER BY w.domain_id, w.bizplace_id, wd.id
+        `, [worksheetDetailName, this.domain.id, cartonId]);
+            }
             //validation to check matching worksheet detail based on name
             if ((worksheetDetailRaw.length < 1))
                 throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
@@ -1756,29 +1840,36 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         return newWorksheetDetails;
     }
     async activateBulkWorksheets(bizplaceId, worksheetIds) {
+        const updatedWs = [];
         try {
             for (const worksheetId of worksheetIds) {
                 try {
                     let releaseGood;
                     let domain;
-                    (0, typeorm_1.getManager)().transaction(async (tx) => {
+                    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('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('w.worksheetDetails', 'wd')
-                            .leftJoinAndSelect('w.releaseGood', 'rg')
-                            .leftJoinAndSelect('rg.domain', 'rgd')
-                            .leftJoinAndSelect('rg.bizplace', 'rgbz')
-                            .leftJoinAndSelect('rgbz.domain', 'bzd')
-                            .leftJoinAndSelect('rg.orderProducts', 'op')
-                            .leftJoinAndSelect('op.productDetail', 'pd')
-                            .leftJoinAndSelect('pd.product', 'p')
-                            .leftJoinAndSelect('b.domain', 'bd')
                             .leftJoinAndSelect('b.company', 'c')
-                            .leftJoinAndSelect('c.domain', 'cd')
+                            .leftJoinAndSelect('c.domain', 'c_d')
+                            .leftJoinAndSelect('w.worksheetDetails', 'wd')
                             .leftJoinAndSelect('wd.targetInventory', 'ti')
                             .leftJoinAndSelect('ti.product', 'tp')
                             .where('w.id = :worksheetId', { worksheetId: worksheetId })
@@ -1806,6 +1897,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [], tx);
                         releaseGood = worksheet.releaseGood;
                         domain = worksheet.domain;
+                        updatedWs.push(worksheet);
                     });
                     const orderSource = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.source;
                     switch (orderSource) {
@@ -1846,6 +1938,21 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             });
                             break;
                         default:
+                            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: releaseGood.creator,
+                                updater: releaseGood.updater
+                            };
+                            await createOrderPackageAndItems(this.trxMgr, releaseGood, orderPackage);
                             break;
                     }
                 }
@@ -1857,7 +1964,46 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         catch (e) {
             console.log(e);
         }
+        return updatedWs;
     }
 }
 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,
+                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];
+}
+exports.createOrderPackageAndItems = createOrderPackageAndItems;
 //# sourceMappingURL=picking-worksheet-controller.js.map