npm - @things-factory/worksheet-base - Versions diffs - 4.3.156 → 4.3.157 - Mend

@things-factory/worksheet-base 4.3.156 → 4.3.157

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js CHANGED Viewed

@@ -14,7 +14,6 @@ const sales_base_1 = require("@things-factory/sales-base");
 const setting_base_1 = require("@things-factory/setting-base");
 const constants_1 = require("../../../../constants");
 const controllers_1 = require("../../../../controllers/");
-const warehouse_base_1 = require("@things-factory/warehouse-base");
 const ecommerce_1 = require("../../../../controllers/ecommerce");
 const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
 const entities_1 = require("../../../../entities");
@@ -53,8 +52,7 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     });
     const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
         'worksheetDetails',
-        'worksheetDetails.targetInventory',
-        'worksheetDetails.targetInventory.inventory'
+        'worksheetDetails.targetInventory'
     ]);
     const warehouseContactPoint = await tx.getRepository(biz_base_1.ContactPoint).findOne({
         where: {
@@ -64,276 +62,249 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     });
     const worksheetDetails = worksheet.worksheetDetails;
     const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
-    const inventories = targetInventories.map((ti) => ti.inventory);
     const pickedTargetInventories = targetInventories.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED);
-    let foundObsoleteInventories = await pickingWSCtrl.completePicking(releaseGood, worksheet, inventories);
-    if (foundObsoleteInventories === null || foundObsoleteInventories === void 0 ? void 0 : foundObsoleteInventories.type) {
-        const orderSource = releaseGood.source;
-        switch (orderSource) {
-            case auth_base_1.ApplicationType.SELLERCRAFT:
-                const sellercraft = await tx
-                    .getRepository(integration_sellercraft_1.Sellercraft)
-                    .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
-                if (sellercraft) {
-                    const initSCOrderShipment = async (sellercraft) => {
-                        await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
-                            var _a;
-                            const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
-                            if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketPackCallSuccess)) {
-                                const orderProducts = await txMgr.getRepository(sales_base_1.OrderProduct).find({
-                                    where: { releaseGood },
-                                    relations: ['product', 'product.productDetails']
-                                });
-                                await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
-                            }
-                            const rtsTriggerLevel = await txMgr.getRepository(setting_base_1.Setting).findOne({
-                                where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
+    await pickingWSCtrl.completePicking(releaseGoodNo);
+    const orderSource = releaseGood.source;
+    switch (orderSource) {
+        case auth_base_1.ApplicationType.SELLERCRAFT:
+            const sellercraft = await tx
+                .getRepository(integration_sellercraft_1.Sellercraft)
+                .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+            if (sellercraft) {
+                const initSCOrderShipment = async (sellercraft) => {
+                    await (0, typeorm_1.getManager)().transaction(async (txMgr) => {
+                        var _a;
+                        const sellercraftCtrl = new controllers_1.SellercraftController(txMgr, domain, user);
+                        if (!((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) && !(releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.marketPackCallSuccess)) {
+                            const orderProducts = await txMgr.getRepository(sales_base_1.OrderProduct).find({
+                                where: { releaseGood },
+                                relations: ['product', 'product.productDetails']
                             });
-                            if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
-                                await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
-                            }
+                            await sellercraftCtrl.packOrder(sellercraft, Object.assign(Object.assign({}, releaseGood), { orderProducts }));
+                        }
+                        const rtsTriggerLevel = await txMgr.getRepository(setting_base_1.Setting).findOne({
+                            where: { domain, category: 'id-rule', name: 'rts-trigger-level' }
                         });
-                    };
-                    // asynchronouly call to initiate sellercraft order shipment/ RTS
-                    initSCOrderShipment(sellercraft);
+                        if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
+                            await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood);
+                        }
+                    });
+                };
+                // asynchronouly call to initiate sellercraft order shipment/ RTS
+                initSCOrderShipment(sellercraft);
+            }
+            break;
+        case auth_base_1.ApplicationType.MMS:
+            const companyDomain = releaseGood.bizplace.company.domain;
+            let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+                where: { orderNo: releaseGood.refNo, domain: companyDomain },
+                relations: [
+                    'marketplaceStore',
+                    'marketplaceStore.marketplaceDistributors',
+                    'marketplaceOrderItems',
+                    'marketplaceOrderItems.marketplaceOrderShippingItems',
+                    'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+                ]
+            });
+            if (marketplaceOrder) {
+                const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
+                const marketplaceStore = marketplaceOrder.marketplaceStore;
+                let eTraxOption;
+                if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
+                    await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
+                    await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
                 }
-                break;
-            case auth_base_1.ApplicationType.MMS:
-                const companyDomain = releaseGood.bizplace.company.domain;
-                let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                    where: { orderNo: releaseGood.refNo, domain: companyDomain },
-                    relations: [
-                        'marketplaceStore',
-                        'marketplaceStore.marketplaceDistributors',
-                        'marketplaceOrderItems',
-                        'marketplaceOrderItems.marketplaceOrderShippingItems',
-                        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-                    ]
-                });
-                if (marketplaceOrder) {
-                    const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
-                    const marketplaceStore = marketplaceOrder.marketplaceStore;
-                    let eTraxOption;
-                    if (marketplaceStore === null || marketplaceStore === void 0 ? void 0 : marketplaceStore.isAutoUpdateShipment) {
-                        await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
-                        await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain);
-                    }
-                    if (!marketplaceOrder) {
-                        throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
-                    }
-                    eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
-                    // if eTrax option is true
-                    if (eTraxOption) {
-                        const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
-                        // access every marketplaceOrderItems for shipping information you need
-                        // trigger the controller from integration-lmd that trigger the API, build the parameters needed
-                        // for etrax didn't support multi awb per order
-                        const marketplaceOrderShippingItems = marketplaceOrderItems[0].marketplaceOrderShippingItems;
-                        const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
-                        const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
-                            where: {
-                                domain,
-                                platform: 'eTrax'
+                if (!marketplaceOrder) {
+                    throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
+                }
+                eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
+                // if eTrax option is true
+                if (eTraxOption) {
+                    const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
+                    // access every marketplaceOrderItems for shipping information you need
+                    // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+                    // for etrax didn't support multi awb per order
+                    const marketplaceOrderShippingItems = marketplaceOrderItems[0].marketplaceOrderShippingItems;
+                    const marketplaceOrderShipping = marketplaceOrderShippingItems[0].marketplaceOrderShipping;
+                    const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
+                        where: {
+                            domain,
+                            platform: 'eTrax'
+                        }
+                    });
+                    //Get which transporter to use
+                    const marketplaceTransporter = await tx
+                        .getRepository(integration_marketplace_1.MarketplaceTransporter)
+                        .findOne({
+                        where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+                        relations: ['pickupTransporter', 'deliveryTransporter']
+                    });
+                    const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
+                        orderNo: marketplaceOrder.orderNo,
+                        clientId: lmd.clientId,
+                        clientType: lmd.clientType,
+                        clientName: lmd.clientName,
+                        transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+                        pickupName: warehouseContactPoint.name,
+                        pickupAddress1: warehouseContactPoint.address,
+                        pickupAddress2: warehouseContactPoint.address2,
+                        pickupPostcode: warehouseContactPoint.postCode,
+                        pickupState: warehouseContactPoint.state,
+                        pickupCity: warehouseContactPoint.city,
+                        pickupPhone: warehouseContactPoint.phone,
+                        pickupEmail: warehouseContactPoint.email,
+                        name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
+                        address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
+                        address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
+                        postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
+                        city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
+                        state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
+                        phone: marketplaceOrderShipping.phone1 || '',
+                        email: marketplaceOrderShipping.email || '',
+                        attentionTo: marketplaceOrderShipping.attentionTo,
+                        quantity: marketplaceOrderItems.length
+                    });
+                    const delay = (ms) => {
+                        return new Promise(resolve => setTimeout(resolve, ms));
+                    };
+                    if (resp.Status === 'SUCCESS') {
+                        //Success
+                        let awbObtained = false;
+                        let retry = 0;
+                        while (!awbObtained) {
+                            const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+                                where: { releaseOrderId: releaseGood.id },
+                                relations: [
+                                    'marketplaceStore',
+                                    'marketplaceOrderItems',
+                                    'marketplaceOrderItems.marketplaceOrderShippingItems',
+                                    'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+                                ]
+                            });
+                            const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
+                            if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
+                                awbObtained = true;
                             }
-                        });
-                        //Get which transporter to use
-                        const marketplaceTransporter = await tx
-                            .getRepository(integration_marketplace_1.MarketplaceTransporter)
-                            .findOne({
-                            where: { marketplaceStore: marketplaceOrder.marketplaceStore },
-                            relations: ['pickupTransporter', 'deliveryTransporter']
-                        });
-                        const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
-                            orderNo: marketplaceOrder.orderNo,
-                            clientId: lmd.clientId,
-                            clientType: lmd.clientType,
-                            clientName: lmd.clientName,
-                            transporterId: marketplaceTransporter.pickupTransporter.transporterId,
-                            pickupName: warehouseContactPoint.name,
-                            pickupAddress1: warehouseContactPoint.address,
-                            pickupAddress2: warehouseContactPoint.address2,
-                            pickupPostcode: warehouseContactPoint.postCode,
-                            pickupState: warehouseContactPoint.state,
-                            pickupCity: warehouseContactPoint.city,
-                            pickupPhone: warehouseContactPoint.phone,
-                            pickupEmail: warehouseContactPoint.email,
-                            name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
-                            address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
-                            address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
-                            postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
-                            city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
-                            state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
-                            phone: marketplaceOrderShipping.phone1 || '',
-                            email: marketplaceOrderShipping.email || '',
-                            attentionTo: marketplaceOrderShipping.attentionTo,
-                            quantity: marketplaceOrderItems.length
-                        });
-                        const delay = (ms) => {
-                            return new Promise(resolve => setTimeout(resolve, ms));
-                        };
-                        if (resp.Status === 'SUCCESS') {
-                            //Success
-                            let awbObtained = false;
-                            let retry = 0;
-                            while (!awbObtained) {
-                                const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                                    where: { releaseOrderId: releaseGood.id },
-                                    relations: [
-                                        'marketplaceStore',
-                                        'marketplaceOrderItems',
-                                        'marketplaceOrderItems.marketplaceOrderShippingItems',
-                                        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-                                    ]
-                                });
-                                const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping;
-                                if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
-                                    awbObtained = true;
-                                }
-                                await delay(5000);
-                                //Timeout after 15sec
-                                if (++retry > 3) {
-                                    break;
-                                }
+                            await delay(5000);
+                            //Timeout after 15sec
+                            if (++retry > 3) {
+                                break;
                             }
                         }
-                        else {
-                            if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
-                                await tx
-                                    .getRepository(marketplace_base_1.MarketplaceOrderShipping)
-                                    .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
-                            else
-                                throw resp;
-                        }
                     }
-                    await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
+                    else {
+                        if ((resp === null || resp === void 0 ? void 0 : resp.AWBurl) && (resp === null || resp === void 0 ? void 0 : resp.TrackingNo))
+                            await tx
+                                .getRepository(marketplace_base_1.MarketplaceOrderShipping)
+                                .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo });
+                        else
+                            throw resp;
+                    }
                 }
-                break;
-            default:
-                const orderPackage = {
-                    name: sales_base_1.OrderNoGenerator.orderPackage(),
-                    packageId: null,
-                    trackingNo: null,
-                    transporter: null,
-                    airwayBill: null,
+                await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
+            }
+            break;
+        default:
+            const orderPackage = {
+                name: sales_base_1.OrderNoGenerator.orderPackage(),
+                packageId: null,
+                trackingNo: null,
+                transporter: null,
+                airwayBill: null,
+                status: sales_base_1.ORDER_STATUS.PROCESSING,
+                releaseGood,
+                domain: releaseGood.domain,
+                bizplace: releaseGood.bizplace,
+                creator: releaseGood.creator,
+                updater: releaseGood.updater
+            };
+            let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
+            const orderPackageItems = releaseGood.orderProducts.map(op => {
+                return {
+                    name: sales_base_1.OrderNoGenerator.orderPackageItem(),
+                    orderProduct: op,
                     status: sales_base_1.ORDER_STATUS.PROCESSING,
-                    releaseGood,
+                    releaseQty: op.releaseQty,
+                    orderPackage: savedOrderPackage,
                     domain: releaseGood.domain,
                     bizplace: releaseGood.bizplace,
                     creator: releaseGood.creator,
                     updater: releaseGood.updater
                 };
-                let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
-                const orderPackageItems = releaseGood.orderProducts.map(op => {
-                    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
-                    };
-                });
-                await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
-                break;
-        }
-        const account = await tx
-            .getRepository(integration_accounting_1.Account)
-            .findOne({ domain: releaseGood.bizplace.domain, status: 'active' });
-        // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
-        const createSalesOrder = async (account, tx) => {
-            if (account) {
-                try {
-                    if (account.platform == 'xilnex') {
-                        const salesOrder = await integration_accounting_1.AccountingAPI.createSalesOrder(account, {
-                            releaseGood,
-                            orderProducts: releaseGood.orderProducts
+            });
+            await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
+            break;
+    }
+    const account = await tx
+        .getRepository(integration_accounting_1.Account)
+        .findOne({ domain: releaseGood.bizplace.domain, status: 'active' });
+    // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
+    const createSalesOrder = async (account, tx) => {
+        if (account) {
+            try {
+                if (account.platform == 'xilnex') {
+                    const salesOrder = await integration_accounting_1.AccountingAPI.createSalesOrder(account, {
+                        releaseGood,
+                        orderProducts: releaseGood.orderProducts
+                    });
+                    if (salesOrder) {
+                        const salesInvoice = await integration_accounting_1.AccountingAPI.postSalesOrderToSalesInvoice(account, {
+                            orderId: (salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.id) || null
                         });
-                        if (salesOrder) {
-                            const salesInvoice = await integration_accounting_1.AccountingAPI.postSalesOrderToSalesInvoice(account, {
-                                orderId: (salesOrder === null || salesOrder === void 0 ? void 0 : salesOrder.id) || null
-                            });
-                            const salesOrderItems = salesInvoice.sale.items;
-                            await Promise.all(releaseGood.orderProducts.map(async (op) => {
-                                const matchedProduct = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode);
-                                if (matchedProduct) {
-                                    await tx.getRepository(sales_base_1.OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id });
-                                }
-                            }));
-                            await tx
-                                .getRepository(sales_base_1.ReleaseGood)
-                                .update({ id: releaseGood.id }, { collectionOrderNo: salesInvoice.salesId, updater: releaseGood.updater });
-                        }
+                        const salesOrderItems = salesInvoice.sale.items;
+                        await Promise.all(releaseGood.orderProducts.map(async (op) => {
+                            const matchedProduct = salesOrderItems.find(soi => soi.itemId == op.productDetail.refCode);
+                            if (matchedProduct) {
+                                await tx.getRepository(sales_base_1.OrderProduct).update({ id: op.id }, { refItemId: matchedProduct.id });
+                            }
+                        }));
+                        await tx
+                            .getRepository(sales_base_1.ReleaseGood)
+                            .update({ id: releaseGood.id }, { collectionOrderNo: salesInvoice.salesId, updater: releaseGood.updater });
                     }
                 }
-                catch (error) {
-                    env_1.logger.error(`complete-picking[createSalesOrder]: ${error}`);
-                }
             }
-        };
-        if (releaseGood.type == 'b2c') {
-            await createSalesOrder(account, tx);
-        }
-        if (releaseGood.packingOption) {
-            const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
-            await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
+            catch (error) {
+                env_1.logger.error(`complete-picking[createSalesOrder]: ${error}`);
+            }
         }
-        else {
-            // Find Existing Loading Worksheet if any
-            let existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-                where: {
-                    releaseGood,
-                    type: constants_1.WORKSHEET_TYPE.LOADING,
-                    status: constants_1.WORKSHEET_STATUS.DEACTIVATED
-                }
-            });
-            if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
-                if (pickedTargetInventories.length > 0) {
-                    const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
-                    let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
-                    if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
-                        loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
-                    }
-                    const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
-                    await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
-                }
+    };
+    if (releaseGood.type == 'b2c') {
+        await createSalesOrder(account, tx);
+    }
+    if (releaseGood.packingOption) {
+        const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
+        await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
+    }
+    else {
+        // Find Existing Loading Worksheet if any
+        let existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+            where: {
+                releaseGood,
+                type: constants_1.WORKSHEET_TYPE.LOADING,
+                status: constants_1.WORKSHEET_STATUS.DEACTIVATED
             }
-            else {
+        });
+        if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
+            if (pickedTargetInventories.length > 0) {
                 const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
-                let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
-                if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
+                let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
+                if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
                     loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
                 }
                 const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
                 await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
             }
         }
-    }
-    else {
-        //update inventories obsolete to true
-        await tx.getRepository(warehouse_base_1.Inventory).update({ id: (0, typeorm_1.In)(foundObsoleteInventories) }, { obsolete: true });
-        foundObsoleteInventories = foundObsoleteInventories
-            .map(inv => {
-            return "'" + inv.trim() + "'";
-        })
-            .join(',');
-        //update any orders that is assigned with obsolete inventories
-        await tx.getRepository(sales_base_1.ReleaseGood).query(`
-    update release_goods rg set status = 'OBSOLETE'
-    from order_inventories oi
-    where oi.release_good_id = rg.id
-    and oi.inventory_id in (${foundObsoleteInventories})
-    and rg.status in ('PICKING', 'PENDING_WORKSHEET', 'READY_TO_PICK')`);
-        await tx.getRepository(entities_1.Worksheet).query(`
-    update worksheets w set status = 'DEACTIVATED', updater_id = '${user.id}', assignee_id = null
-    from worksheet_details wd
-    inner join order_inventories oi on oi.id = wd.target_inventory_id
-    where wd.worksheet_id = w.id
-    and oi.inventory_id in (${foundObsoleteInventories})
-    `);
-        return false;
+        else {
+            const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
+            let loadingWorksheet = await loadingWSCtrl.updateLoadingWorksheet(releaseGoodNo, pickedTargetInventories, existLoadingWorksheet);
+            if (!((_b = loadingWorksheet.worksheetDetails) === null || _b === void 0 ? void 0 : _b.length)) {
+                loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
+            }
+            const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
+            await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
+        }
     }
 }
 exports.completePicking = completePicking;

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js CHANGED Viewed

@@ -41,18 +41,10 @@ async function regenerateReleaseGoodWorksheetDetails(tx, domain, user, worksheet
         const prevOrderInventories = prevWSDs.map((wsd) => wsd.targetInventory);
         await Promise.all(prevOrderInventories.map(async (prevOI) => {
             if (prevOI === null || prevOI === void 0 ? void 0 : prevOI.inventory) {
-                if (prevOI.pickedQty == prevOI.releaseQty) {
-                    await tx.getRepository(warehouse_base_1.Inventory).update({ id: prevOI.inventory.id }, {
-                        qty: prevOI.inventory.qty + prevOI.pickedQty,
-                        uomValue: prevOI.inventory.uomValue + prevOI.pickedUomValue
-                    });
-                }
-                else {
-                    await tx.getRepository(warehouse_base_1.Inventory).update({ id: prevOI.inventory.id }, {
-                        lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
-                        lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
-                    });
-                }
+                await tx.getRepository(warehouse_base_1.Inventory).update({ id: prevOI.inventory.id }, {
+                    lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
+                    lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
+                });
             }
         }));
         await tx.getRepository(entities_1.WorksheetDetail).delete(wsdIds);