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

package/dist-server/service/draft-release-good/draft-release-good-mutation.js

@@ -10,6 +10,7 @@ const biz_base_1 = require("@things-factory/biz-base");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
 const product_base_1 = require("@things-factory/product-base");
 const setting_base_1 = require("@things-factory/setting-base");
+const shell_1 = require("@things-factory/shell");
 // import { Location } from '@things-factory/warehouse-base'
 const __1 = require("../");
 const constants_1 = require("../../constants");
@@ -48,7 +49,7 @@ let DraftReleaseGoodMutation = class DraftReleaseGoodMutation {
         const { domain, user, tx } = context.state;
         const repository = tx.getRepository(__1.DraftReleaseGood);
         const draftReleaseGood = await repository.findOne({
-            where: { domain, id }
+            where: { domain: { id: domain.id }, id }
         });
         return await repository.save(Object.assign(Object.assign(Object.assign({}, draftReleaseGood), patch), { updater: user }));
     }
@@ -68,7 +69,7 @@ let DraftReleaseGoodMutation = class DraftReleaseGoodMutation {
         if (_updateRecords.length > 0) {
             for (let i = 0; i < _updateRecords.length; i++) {
                 const newRecord = _updateRecords[i];
-                const draftReleaseGood = await draftReleaseGoodRepo.findOne(newRecord.id);
+                const draftReleaseGood = await draftReleaseGoodRepo.findOneBy({ id: newRecord.id });
                 const result = await draftReleaseGoodRepo.save(Object.assign(Object.assign(Object.assign({}, draftReleaseGood), newRecord), { updater: user }));
                 results.push(Object.assign(Object.assign({}, result), { cuFlag: 'M' }));
             }
@@ -77,13 +78,13 @@ let DraftReleaseGoodMutation = class DraftReleaseGoodMutation {
     }
     async deleteDraftReleaseGood(id, context) {
         const { domain, tx } = context.state;
-        await tx.getRepository(__1.DraftReleaseGood).delete({ domain, id });
+        await tx.getRepository(__1.DraftReleaseGood).delete({ domain: { id: domain.id }, id });
         return true;
     }
     async deleteDraftReleaseGoods(ids, context) {
         const { domain, tx } = context.state;
         await tx.getRepository(__1.DraftReleaseGood).delete({
-            domain,
+            domain: { id: domain.id },
             id: (0, typeorm_1.In)(ids)
         });
         return true;
@@ -92,11 +93,10 @@ let DraftReleaseGoodMutation = class DraftReleaseGoodMutation {
     // @Arg('rawReleaseGoods', type => [NewReleaseGood], { nullable: true }) rawReleaseGoods: NewReleaseGood[],
     // @Arg('bizplaceId', type => String) bizplaceId: string
     ) {
-        var _a;
         const { domain, user, tx } = context.state;
         const updatableDraftOrders = await tx.getRepository(__1.DraftReleaseGood).find({
             where: {
-                domain,
+                domain: { id: domain.id },
                 id: (0, typeorm_1.In)(ids),
                 status: constants_1.DRAFT_RELEASE_ORDER_STATUS.DRAFT
             },
@@ -113,143 +113,151 @@ let DraftReleaseGoodMutation = class DraftReleaseGoodMutation {
         });
         if (updatableDraftOrders.length > 0) {
             let createdReleaseGoods = [];
-            const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+            const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
             const roNoSetting = await settingRepo.findOne({
                 where: {
-                    domain,
+                    dodomain: { id: domain.id },
                     name: constants_1.ORDER_NUMBER_SETTING_KEY.RO_NUMBER_RULE
                 }
             });
             for (let index = 0; index < updatableDraftOrders.length; index++) {
-                const draftOrder = updatableDraftOrders[index];
-                let foundPermittedBizplace;
-                let companyBizplace;
-                if ((_a = draftOrder === null || draftOrder === void 0 ? void 0 : draftOrder.bizplace) === null || _a === void 0 ? void 0 : _a.id) {
-                    foundPermittedBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne(draftOrder.bizplace.id, {
-                        relations: ['company', 'company.domain']
-                    });
-                    const companyDomain = foundPermittedBizplace.company.domain;
-                    companyBizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({ where: { domain: companyDomain } });
-                }
-                else {
-                    return false;
-                }
-                const bizplaces = [foundPermittedBizplace, companyBizplace];
-                let productInventory = await utils_1.InventoryUtil.bizplaceProductInventory(bizplaces, {
-                    filters: [
-                        {
-                            name: 'productId',
-                            operator: 'in',
-                            value: [
-                                ...draftOrder.orderProducts
-                                    .filter(itm => itm === null || itm === void 0 ? void 0 : itm.product)
-                                    .map(itm => {
-                                    return itm.product.id;
-                                }),
-                                ...draftOrder.orderProducts
-                                    .filter(itm => itm === null || itm === void 0 ? void 0 : itm.productBundle)
-                                    .map(itm => {
-                                    return itm.productBundle.id;
-                                })
-                            ]
-                        }
-                    ]
-                }, context, tx);
-                draftOrder.orderProducts = draftOrder.orderProducts.map(itm => {
-                    let foundProductInv = productInventory.items.find(i => {
-                        var _a, _b;
-                        return (i.productId == ((_a = itm === null || itm === void 0 ? void 0 : itm.product) === null || _a === void 0 ? void 0 : _a.id) || i.productId == ((_b = itm === null || itm === void 0 ? void 0 : itm.productBundle) === null || _b === void 0 ? void 0 : _b.id)) &&
-                            i.packingType == itm.packingType &&
-                            i.packingSize == itm.packingSize &&
-                            i.uom == itm.uom &&
-                            itm.releaseQty <= i.remainQty;
-                    });
-                    return Object.assign(Object.assign({}, itm), { status: foundProductInv ? 'suffice' : 'insufficient' });
-                });
-                let insufficient = draftOrder.orderProducts.find(op => op.status == 'insufficient');
-                if (!insufficient) {
-                    //create RO
-                    let releaseGood = Object.assign({}, draftOrder);
-                    delete releaseGood.id;
-                    delete releaseGood.name;
-                    delete releaseGood.createdAt;
-                    delete releaseGood.createdBy;
-                    delete releaseGood.updatedAt;
-                    delete releaseGood.updatedBy;
-                    let orderInventories = [];
-                    for (let index = 0; index < draftOrder.orderProducts.length; index++) {
-                        const itm = draftOrder.orderProducts[index];
-                        let data = [];
-                        if (itm.productBundle) {
-                            let bundle = await tx.getRepository(product_base_1.ProductBundle).findOne({
-                                where: { id: itm.productBundle.id },
-                                relations: [
-                                    'productBundleSettings',
-                                    'productBundleSettings.productDetail',
-                                    'productBundleSettings.product'
+                await (0, typeorm_1.getConnection)().transaction(async (parentTx) => {
+                    var _a;
+                    const draftOrder = updatableDraftOrders[index];
+                    let foundPermittedBizplace;
+                    let companyBizplace;
+                    if ((_a = draftOrder === null || draftOrder === void 0 ? void 0 : draftOrder.bizplace) === null || _a === void 0 ? void 0 : _a.id) {
+                        foundPermittedBizplace = await parentTx.getRepository(biz_base_1.Bizplace).findOne({
+                            where: { id: draftOrder.bizplace.id },
+                            relations: ['company', 'company.domain']
+                        });
+                        const companyDomain = foundPermittedBizplace.company.domain;
+                        companyBizplace = await parentTx.getRepository(biz_base_1.Bizplace).findOne({ where: { domain: companyDomain } });
+                    }
+                    else {
+                        return false;
+                    }
+                    const bizplaces = [foundPermittedBizplace, companyBizplace];
+                    let productInventory = await utils_1.InventoryUtil.bizplaceProductInventory(bizplaces, {
+                        filters: [
+                            {
+                                name: 'productId',
+                                operator: 'in',
+                                value: [
+                                    ...draftOrder.orderProducts
+                                        .filter(itm => itm === null || itm === void 0 ? void 0 : itm.product)
+                                        .map(itm => {
+                                        return itm.product.id;
+                                    }),
+                                    ...draftOrder.orderProducts
+                                        .filter(itm => itm === null || itm === void 0 ? void 0 : itm.productBundle)
+                                        .map(itm => {
+                                        return itm.productBundle.id;
+                                    })
                                 ]
-                            });
-                            for (let index2 = 0; index2 < bundle.productBundleSettings.length; index2++) {
-                                const objProductBundleSetting = bundle.productBundleSettings[index2];
-                                data.push({
-                                    sku: objProductBundleSetting.product.sku,
-                                    packing_type: objProductBundleSetting.productDetail.packingType,
-                                    packing_size: objProductBundleSetting.productDetail.packingSize,
-                                    uom: objProductBundleSetting.productDetail.uom,
-                                    release_qty: objProductBundleSetting.bundleQty * itm.releaseQty,
-                                    assignedQty: undefined,
-                                    assignedUomValue: undefined,
-                                    releaseUomValue: undefined
-                                });
                             }
-                        }
-                        else {
-                            data = [
-                                {
-                                    sku: itm.product.sku,
-                                    packing_type: itm.packingType,
-                                    packing_size: itm.packingSize,
-                                    uom: itm.uom,
-                                    release_qty: itm.releaseQty,
-                                    assignedQty: undefined,
-                                    assignedUomValue: undefined,
-                                    releaseUomValue: undefined
+                        ]
+                    }, context, parentTx);
+                    draftOrder.orderProducts = draftOrder.orderProducts.map(itm => {
+                        let foundProductInv = productInventory.items.find(i => {
+                            var _a, _b;
+                            return (i.productId == ((_a = itm === null || itm === void 0 ? void 0 : itm.product) === null || _a === void 0 ? void 0 : _a.id) || i.productId == ((_b = itm === null || itm === void 0 ? void 0 : itm.productBundle) === null || _b === void 0 ? void 0 : _b.id)) &&
+                                i.packingType == itm.packingType &&
+                                i.packingSize == itm.packingSize &&
+                                i.uom == itm.uom &&
+                                itm.releaseQty <= i.remainQty;
+                        });
+                        return Object.assign(Object.assign({}, itm), { releaseUomValue: (foundProductInv.remainUomValue / foundProductInv.remainQty) * itm.releaseQty, status: foundProductInv ? 'suffice' : 'insufficient' });
+                    });
+                    let insufficient = draftOrder.orderProducts.find(op => op.status == 'insufficient');
+                    if (!insufficient) {
+                        //create RO
+                        let releaseGood = Object.assign({}, draftOrder);
+                        delete releaseGood.id;
+                        delete releaseGood.name;
+                        delete releaseGood.createdAt;
+                        delete releaseGood.createdBy;
+                        delete releaseGood.updatedAt;
+                        delete releaseGood.updatedBy;
+                        let orderInventories = [];
+                        for (let index = 0; index < draftOrder.orderProducts.length; index++) {
+                            const itm = draftOrder.orderProducts[index];
+                            let data = [];
+                            if (itm.productBundle) {
+                                let bundle = await parentTx.getRepository(product_base_1.ProductBundle).findOne({
+                                    where: { id: itm.productBundle.id },
+                                    relations: [
+                                        'productBundleSettings',
+                                        'productBundleSettings.productDetail',
+                                        'productBundleSettings.product'
+                                    ]
+                                });
+                                for (let index2 = 0; index2 < bundle.productBundleSettings.length; index2++) {
+                                    const objProductBundleSetting = bundle.productBundleSettings[index2];
+                                    data.push({
+                                        sku: objProductBundleSetting.product.sku,
+                                        packingType: objProductBundleSetting.productDetail.packingType,
+                                        packingSize: objProductBundleSetting.productDetail.packingSize,
+                                        uom: objProductBundleSetting.productDetail.uom,
+                                        releaseQty: objProductBundleSetting.bundleQty * itm.releaseQty,
+                                        assignedQty: undefined,
+                                        assignedUomValue: undefined,
+                                        releaseUomValue: objProductBundleSetting.bundleQty * itm.releaseQty * itm.releaseUomValue
+                                    });
                                 }
-                            ];
-                        }
-                        data.forEach(data => {
-                            let existingOI = orderInventories.find(itm => itm.sku == data.sku &&
-                                itm.packing_type == data.packing_type &&
-                                itm.packing_size == data.packing_size &&
-                                itm.uom == data.uom);
-                            if (existingOI) {
-                                existingOI.release_qty = existingOI.release_qty + data.release_qty;
                             }
                             else {
-                                orderInventories.push(data);
+                                data = [
+                                    {
+                                        sku: itm.product.sku,
+                                        packingType: itm.packingType,
+                                        packingSize: itm.packingSize,
+                                        uom: itm.uom,
+                                        releaseQty: itm.releaseQty,
+                                        assignedQty: undefined,
+                                        assignedUomValue: undefined,
+                                        releaseUomValue: itm.releaseUomValue
+                                    }
+                                ];
                             }
-                        });
-                    }
-                    try {
-                        await (0, typeorm_1.getConnection)().transaction(async (childTx) => {
-                            let availableItems = await (0, release_good_query_1.bulkReleaseGoodsAvailableItemsFunction)(orderInventories, draftOrder.bizplace.id, context, childTx);
-                            if (availableItems.some(item => !item.release_qty || item.release_qty > item.assignedQty))
-                                throw new errors_1.ValidationError(Object.assign(Object.assign({}, errors_1.ValidationError.ERROR_CODES.INSUFFICIENT_STOCK), { detail: { data: JSON.stringify(availableItems) } }));
-                            // update orderInventories if availableItems are valid
-                            releaseGood.orderInventories = availableItems.map(itm => {
-                                return Object.assign(Object.assign({}, itm), { releaseQty: itm.release_qty });
+                            data.forEach(data => {
+                                let existingOI = orderInventories.find(itm => itm.sku == data.sku &&
+                                    itm.packingType == data.packingType &&
+                                    itm.packingSize == data.packingSize &&
+                                    itm.uom == data.uom);
+                                if (existingOI) {
+                                    existingOI.releaseQty = existingOI.releaseQty + data.releaseQty;
+                                    existingOI.releaseUomValue = existingOI.releaseUomValue + data.uomValue;
+                                    existingOI.uomValue = existingOI.uomValue + data.uomValue;
+                                }
+                                else {
+                                    orderInventories.push(Object.assign(Object.assign({}, data), { orderProduct: itm }));
+                                }
                             });
-                            let createdReleaseGood = await (0, release_good_mutation_1.bulkGenerateReleaseGood)(releaseGood, releaseGood.bizplace.id, roNoSetting, domain, user, childTx);
-                            await childTx
-                                .getRepository(__1.DraftReleaseGood)
-                                .update({ id: draftOrder.id }, { releaseGood: createdReleaseGood, status: constants_1.DRAFT_RELEASE_ORDER_STATUS.SUBMITTED });
-                            createdReleaseGood = await (0, release_good_mutation_1.confirmReleaseGood)(createdReleaseGood.name, context, childTx);
-                        });
-                    }
-                    catch (error) {
-                        console.error(error);
+                        }
+                        try {
+                            await (0, typeorm_1.getConnection)().transaction(async (childTx) => {
+                                let availableItems = await (0, release_good_query_1.bulkReleaseGoodsAvailableItemsFunction)(orderInventories, draftOrder.bizplace.id, context, childTx);
+                                if (availableItems.some(item => !item.releaseQty || item.releaseQty > item.assignedQty)) {
+                                    throw new errors_1.ValidationError(Object.assign(Object.assign({}, errors_1.ValidationError.ERROR_CODES.INSUFFICIENT_STOCK), { detail: { data: JSON.stringify(availableItems) } }));
+                                }
+                                // update orderInventories if availableItems are valid
+                                ;
+                                releaseGood.orderInventories = availableItems.map(itm => {
+                                    return Object.assign(Object.assign({}, itm), { releaseQty: itm.releaseQty, releaseUomValue: itm.releaseUomValue, uomValue: itm.uomValue });
+                                });
+                                let createdReleaseGood = await (0, release_good_mutation_1.bulkGenerateReleaseGood)(releaseGood, releaseGood.bizplace.id, roNoSetting, domain, user, childTx);
+                                await childTx
+                                    .getRepository(__1.DraftReleaseGood)
+                                    .update({ id: draftOrder.id }, { releaseGood: createdReleaseGood, status: constants_1.DRAFT_RELEASE_ORDER_STATUS.SUBMITTED });
+                                createdReleaseGood = await (0, release_good_mutation_1.confirmReleaseGood)(createdReleaseGood.name, context, childTx);
+                            });
+                        }
+                        catch (error) {
+                            console.error(error);
+                        }
                     }
-                }
+                });
             }
         }
         return true;
@@ -344,7 +352,7 @@ async function createDraftReleaseGoodFunction(_, draftReleaseGood, orderProducts
     let myBizplace;
     let orderNo = '';
     let arrError = [];
-    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
+    const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, shell_1.getRepository)(setting_base_1.Setting);
     if ((_a = draftReleaseGood === null || draftReleaseGood === void 0 ? void 0 : draftReleaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.id) {
         const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
         let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == draftReleaseGood.bizplace.id);
@@ -361,7 +369,7 @@ async function createDraftReleaseGoodFunction(_, draftReleaseGood, orderProducts
     // // find DRO number rule setting
     const droNoSetting = await settingRepo.findOne({
         where: {
-            domain,
+            domain: { id: domain.id },
             name: constants_1.ORDER_NUMBER_SETTING_KEY.DO_NUMBER_RULE
         }
     });
@@ -371,11 +379,16 @@ async function createDraftReleaseGoodFunction(_, draftReleaseGood, orderProducts
     else {
         orderNo = utils_1.OrderNoGenerator.draftReleaseGood();
     }
-    // // 1. Create draft release good
+    // // 1. Create shipping order if found
+    if (shippingOrder) {
+        let newShippingOrder = await tx.getRepository(shipping_order_1.ShippingOrder).save(Object.assign(Object.assign({}, shippingOrder), { name: utils_1.OrderNoGenerator.shippingOrder(), domain, bizplace: draftReleaseGood.bizplace, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+        draftReleaseGood.shippingOrder = newShippingOrder;
+    }
+    // // 2. Create draft release good
     const createdDraftReleaseGood = await tx.getRepository(__1.DraftReleaseGood).save(Object.assign(Object.assign({}, draftReleaseGood), { name: orderNo, status: constants_1.DRAFT_RELEASE_ORDER_STATUS.DRAFT, domain, creator: user, updater: user }));
-    // // 2. Create draft release good product
+    // // 3. Create draft release good product
     await upsertDraftReleaseGoodProducts(domain, draftReleaseGood.bizplace, createdDraftReleaseGood, orderProducts, user, tx);
-    // // 3. Create Attachments
+    // // 4. Create Attachments
     if (files === null || files === void 0 ? void 0 : files.length) {
         const attachments = files.map(attachment => {
             return {
@@ -418,13 +431,13 @@ async function updateDraftReleaseGoodFunction(_, draftReleaseGood, orderProducts
         }
     }
     // // 1. Update draft release good
-    const updateDraftReleaseGood = await tx.getRepository(__1.DraftReleaseGood).save(Object.assign(Object.assign(Object.assign({}, existingDraftReleaseGood), draftReleaseGood), { domain, creator: user, updater: user }));
+    const updateDraftReleaseGood = await tx.getRepository(__1.DraftReleaseGood).save(Object.assign(Object.assign(Object.assign({}, existingDraftReleaseGood), draftReleaseGood), { domain, creator: existingDraftReleaseGood.creator, updater: user }));
     // // 2. Update draft release good product
     await upsertDraftReleaseGoodProducts(domain, draftReleaseGood.bizplace, draftReleaseGood, orderProducts, user, tx);
     // // 3. Remove Purchase Order Attachment
-    const foundAttachments = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).find({
+    const foundAttachments = await (0, shell_1.getRepository)(attachment_base_1.Attachment).find({
         where: {
-            domain,
+            domain: { id: domain.id },
             refBy: draftReleaseGood.id,
             category: constants_1.ATTACHMENT_TYPE.DGRN
         }
@@ -451,11 +464,11 @@ exports.updateDraftReleaseGoodFunction = updateDraftReleaseGoodFunction;
 async function upsertDraftReleaseGoodProducts(domain, bizplace, draftReleaseGood, orderProductsPatch, user, tx) {
     try {
         let orderProducts = [];
-        const draftReleaseGoodRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(__1.DraftReleaseGood)) || (0, typeorm_1.getRepository)(__1.DraftReleaseGood);
-        const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(biz_base_1.Bizplace)) || (0, typeorm_1.getRepository)(biz_base_1.Bizplace);
-        const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(__1.OrderProduct)) || (0, typeorm_1.getRepository)(__1.OrderProduct);
-        const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, typeorm_1.getRepository)(product_base_1.Product);
-        const productBundleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.ProductBundle)) || (0, typeorm_1.getRepository)(product_base_1.ProductBundle);
+        const draftReleaseGoodRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(__1.DraftReleaseGood)) || (0, shell_1.getRepository)(__1.DraftReleaseGood);
+        const bizplaceRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(biz_base_1.Bizplace)) || (0, shell_1.getRepository)(biz_base_1.Bizplace);
+        const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(__1.OrderProduct)) || (0, shell_1.getRepository)(__1.OrderProduct);
+        const productRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.Product)) || (0, shell_1.getRepository)(product_base_1.Product);
+        const productBundleRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(product_base_1.ProductBundle)) || (0, shell_1.getRepository)(product_base_1.ProductBundle);
         draftReleaseGood = await draftReleaseGoodRepo.findOne({
             where: { id: draftReleaseGood.id },
             relations: [
@@ -473,7 +486,8 @@ async function upsertDraftReleaseGoodProducts(domain, bizplace, draftReleaseGood
         // })
         if (removeOP.length > 0)
             await orderProductRepo.delete(removeOP.map(itm => itm.id));
-        bizplace = await bizplaceRepo.findOne(bizplace.id, {
+        bizplace = await bizplaceRepo.findOne({
+            where: { id: bizplace.id },
             relations: ['domain', 'company', 'company.domain']
         });
         orderProducts = await Promise.all(orderProductsPatch.map(async (op) => {