@things-factory/sales-base 4.3.656 → 4.3.660

package/dist-server/service/arrival-notice/arrival-notice-mutation.js

@@ -46,6 +46,8 @@ const _1 = require("./");
 const arrival_notice_1 = require("./arrival-notice");
 const arrival_notice_types_1 = require("./arrival-notice-types");
 const i18next_1 = __importDefault(require("i18next"));
+const order_inventory_1 = require("../order-inventory/order-inventory");
+const goods_receival_note_1 = require("../goods-receival-note/goods-receival-note");
 const debug = require('debug')('things-factory:operato-wms:addArrivalNotice');
 let ArrivalNoticeMutation = class ArrivalNoticeMutation {
     async deleteArrivalNotice(name, context) {
@@ -61,7 +63,7 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
     async confirmArrivalNotice(name, context) {
         const { tx } = context.state;
         const arrivalNotice = await confirmArrivalNoticeFunction(name, context, tx);
-        // If current GAN has cross docking
+        // If current has cross docking
         if (arrivalNotice.crossDocking) {
             const { releaseGood } = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne(arrivalNotice.id, {
                 relations: ['releaseGood']
@@ -97,6 +99,274 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
         }
         return arrivalNotice;
     }
+    async submitDirectInboundArrivalNotice(context, arrivalNotice, files) {
+        const { user, domain, tx } = context.state;
+        let orderProducts = arrivalNotice.orderProducts;
+        let myBizplace;
+        if (arrivalNotice.customerBizplaceId) {
+            const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
+            let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId);
+            if (!foundPermittedBizplace)
+                throw new Error(`This user does not permitted for this company`);
+            myBizplace = { id: arrivalNotice.customerBizplaceId };
+        }
+        else if (arrivalNotice.partnerBizplaceId) {
+            const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
+            let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.partnerBizplaceId);
+            if (!foundPermittedBizplace)
+                throw new Error(`This user does not permitted for this company`);
+            myBizplace = { id: arrivalNotice.partnerBizplaceId };
+        }
+        else if (arrivalNotice.warehouseId)
+            myBizplace = await (0, biz_base_1.getOutletBizplace)(arrivalNotice.warehouseId);
+        else
+            myBizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
+        let orderProductsMap = mergeDuplicateRow(orderProducts, ['product.id', 'location.id', 'batchId', 'expDate'], 'packQty');
+        orderProducts = [...orderProductsMap.values()];
+        const pendingArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: order_no_generator_1.OrderNoGenerator.arrivalNotice(), domain, bizplace: myBizplace, status: constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+        const orderProductRepo = tx.getRepository(order_product_1.OrderProduct);
+        const pendingOrderProducts = orderProducts.map(op => {
+            var _a;
+            return ({
+                name: order_no_generator_1.OrderNoGenerator.orderProduct(),
+                product_id: op.product.id,
+                product_detail_id: op.productDetail.id,
+                batch_id: op.batchId,
+                batch_id_ref: op.batchIdRef,
+                packing_type: op.packingType,
+                packing_size: op.packingSize,
+                uom: op.uom,
+                uom_value: op.uomValue || 0,
+                pack_qty: op.packQty || 0,
+                total_uom_value: op.totalUomValue,
+                pallet_qty: op.palletQty,
+                pallet_id: op.palletId,
+                unit_price: op.unitPrice,
+                remark: op.remark,
+                manufacture_date: op.manufactureDate,
+                status: constants_1.ORDER_STATUS.PENDING,
+                adjusted_batch_id: op.adjustedBatchId,
+                adjusted_batch_id_ref: op.adjustedBatchIdRef,
+                adjusted_packing_type: op.adjustedPackingType,
+                adjusted_uom_value: op.adjustedUomValue,
+                adjusted_uom: op.adjustedUom,
+                adjusted_pack_qty: op.adjustedPackQty,
+                adjusted_total_uom_value: op.adjustedTotalUomValue,
+                adjusted_pallet_qty: op.adjustedPalletQty,
+                adjusted_unit_price: op.adjustedUnitPrice,
+                domain_id: domain.id,
+                bizplace_id: pendingArrivalNotice.bizplaceId || ((_a = pendingArrivalNotice.bizplace) === null || _a === void 0 ? void 0 : _a.id),
+                arrival_notice_id: pendingArrivalNotice.id,
+                creator_id: user.id,
+                updater_id: user.id,
+                warehouse_id: op.warehouse.id,
+                location_id: op.location.id,
+                exp_date: op.expDate
+            });
+        });
+        await orderProductRepo.query(`
+      INSERT INTO order_products (
+        "name", "product_detail_id", "product_id", 
+        "batch_id", "batch_id_ref", "packing_type", 
+        "packing_size", "uom", "uom_value", 
+        "pack_qty", "total_uom_value", "pallet_qty", 
+        "pallet_id", "unit_price", "remark", 
+        "manufacture_date", "status", "adjusted_batch_id", 
+        "adjusted_batch_id_ref", "adjusted_packing_type", 
+        "adjusted_uom_value", "adjusted_uom", 
+        "adjusted_pack_qty", "adjusted_total_uom_value", 
+        "adjusted_pallet_qty", "adjusted_unit_price", 
+        "domain_id", "bizplace_id", "arrival_notice_id", 
+        "creator_id", "updater_id", "warehouse_id", "location_id", "exp_date"
+      ) 
+      SELECT 
+        "name", 
+        "product_detail_id", 
+        "product_id", 
+        "batch_id", 
+        "batch_id_ref", 
+        "packing_type", 
+        "packing_size", 
+        "uom", 
+        "uom_value", 
+        "pack_qty", 
+        "total_uom_value", 
+        "pallet_qty", 
+        "pallet_id", 
+        "unit_price", 
+        "remark", 
+        "manufacture_date", 
+        "status", 
+        "adjusted_batch_id", 
+        "adjusted_batch_id_ref", 
+        "adjusted_packing_type", 
+        "adjusted_uom_value", 
+        "adjusted_uom", 
+        "adjusted_pack_qty", 
+        "adjusted_total_uom_value", 
+        "adjusted_pallet_qty", 
+        "adjusted_unit_price", 
+        "domain_id", 
+        "bizplace_id", 
+        "arrival_notice_id", 
+        "creator_id", 
+        "updater_id",
+        "warehouse_id",
+        "location_id",
+        "exp_date"
+      FROM 
+        JSON_POPULATE_RECORDSET(NULL :: order_products, $1) op
+      `, [JSON.stringify(pendingOrderProducts)]);
+        return pendingArrivalNotice;
+    }
+    async confirmDirectInboundArrivalNotice(context, name) {
+        const { user, domain, tx } = context.state;
+        const pendingArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
+            where: { domain, name, status: constants_1.ORDER_STATUS.PENDING },
+            relations: [
+                'bizplace',
+                'bizplace.domain',
+                'releaseGood',
+                'orderProducts',
+                'orderProducts.product',
+                'orderVass',
+                'orderVass.vas',
+                'creator',
+                'updater'
+            ]
+        });
+        if (!pendingArrivalNotice)
+            throw new Error(`Arrival notice doesn't exist.`);
+        await tx.getRepository(arrival_notice_1.ArrivalNotice).update({ id: pendingArrivalNotice.id }, {
+            status: constants_1.ORDER_STATUS.DONE,
+            updater: user,
+            acceptedBy: user,
+            acceptedAt: new Date()
+        });
+        // find orderProducts tied to the arrival notice and assign inventory, inventory_histories, order_inventories
+        let pendingOrderProducts = await tx.getRepository(order_product_1.OrderProduct).find({
+            where: { arrivalNotice: { id: pendingArrivalNotice.id } },
+            relations: ['bizplace', 'domain', 'warehouse', 'location']
+        });
+        const inventoryRepo = tx.getRepository(warehouse_base_1.Inventory);
+        const opRepo = tx.getRepository(order_product_1.OrderProduct);
+        const inventoryHistoryRepo = tx.getRepository(warehouse_base_1.InventoryHistory);
+        const orderInventoryRepo = tx.getRepository(order_inventory_1.OrderInventory);
+        const inventories = [];
+        for (const op of pendingOrderProducts) {
+            const palletId = op.palletId ||
+                (await (0, id_rule_base_1.generateId)({ domain, type: warehouse_base_1.RULE_TYPE.LOT_NUMBER_ID, seed: { date: warehouse_base_1.DateGenerator.generateDate() } }));
+            const numericTotalUomValue = typeof op.totalUomValue === 'string' ? parseFloat(op.totalUomValue) : op.totalUomValue;
+            const cartonId = await (0, id_rule_base_1.generateId)({
+                domain,
+                type: warehouse_base_1.RULE_TYPE.CARTON_NUMBER_ID,
+                seed: { date: warehouse_base_1.DateGenerator.generateDate() }
+            });
+            const inventory = inventoryRepo.create({
+                domain,
+                bizplace: pendingArrivalNotice.bizplace,
+                name: warehouse_base_1.InventoryNoGenerator.inventoryName(),
+                cartonId: cartonId,
+                refOrderId: pendingArrivalNotice.id,
+                product: op.productId,
+                productDetail: op.productDetailId,
+                palletId,
+                packingType: op.packingType,
+                packingSize: op.packingSize,
+                batchId: op.batchId,
+                batchIdRef: op.batchIdRef,
+                expirationDate: op.expDate,
+                manufactureDate: op.manufactureDate,
+                uom: op.uom,
+                qty: op.packQty,
+                uomValue: numericTotalUomValue,
+                status: warehouse_base_1.INVENTORY_STATUS.STORED,
+                warehouse: op.warehouse,
+                zone: op.location.zone,
+                location: op.location,
+                creator: user,
+                updater: user
+            });
+            inventories.push(inventory);
+            op.status = constants_1.ORDER_PRODUCT_STATUS.STORED;
+            op.updater = user;
+            op.updatedAt = new Date();
+            op.actualPackQty = op.packQty;
+            await opRepo.save(op);
+            const newInventoryHistory = inventoryHistoryRepo.create({
+                name: warehouse_base_1.InventoryNoGenerator.inventoryHistoryName(),
+                refOrderId: pendingArrivalNotice.id,
+                orderNo: pendingArrivalNotice.name,
+                uom: inventory.uom,
+                transactionType: warehouse_base_1.INVENTORY_TRANSACTION_TYPE.NEW,
+                status: inventory.status,
+                qty: inventory.qty,
+                uomValue: inventory.uomValue,
+                openingQty: 0,
+                openingUomValue: 0,
+                seq: 0,
+                domain: inventory.domain,
+                bizplace: pendingArrivalNotice.bizplace,
+                inventory: inventory,
+                product: inventory.product,
+                productDetail: inventory.productDetail,
+                warehouse: inventory.warehouse,
+                location: inventory.location,
+                cartonId: inventory.cartonId,
+                palletId: inventory.palletId,
+                batchId: inventory.batchId,
+                zone: inventory.zone,
+                packingType: inventory.packingType,
+                description: inventory.description,
+                expirationDate: inventory.expirationDate,
+                unitCost: inventory.unitCost,
+                batchIdRef: inventory.batchIdRef,
+                manufactureDate: inventory.manufactureDate,
+                creator: user,
+                updater: user
+            });
+            await inventoryHistoryRepo.save(newInventoryHistory);
+            const orderInventory = orderInventoryRepo.create({
+                domain,
+                bizplace: inventory.bizplace,
+                name: order_no_generator_1.OrderNoGenerator.orderInventory(),
+                status: constants_1.ORDER_INVENTORY_STATUS.DONE,
+                batchId: inventory.batchId,
+                batchIdRef: inventory.batchIdRef,
+                packingType: inventory.packingType,
+                actualPackQty: inventory.qty,
+                actualPackUomValue: inventory.uomValue,
+                uom: inventory.uom,
+                product: inventory.product,
+                productDetail: inventory.productDetail,
+                unloadedBy: inventory.creator,
+                unloadedAt: inventory.createdAt,
+                putawayBy: inventory.creator,
+                putawayAt: inventory.createdAt,
+                type: constants_1.ORDER_TYPES.ARRIVAL_NOTICE,
+                arrivalNotice: pendingArrivalNotice,
+                inventory,
+                creator: user,
+                updater: user
+            });
+            await orderInventoryRepo.save(orderInventory);
+        }
+        await inventoryRepo.save(inventories);
+        const grnRepo = tx.getRepository(goods_receival_note_1.GoodsReceivalNote);
+        const orderNo = order_no_generator_1.OrderNoGenerator.goodsReceiveNote();
+        const grn = {
+            refNo: pendingArrivalNotice.name,
+            name: orderNo,
+            bizplace: pendingArrivalNotice.bizplace,
+            domain,
+            status: constants_1.GRN_STATUS.PENDING_RECEIVE,
+            creator: user,
+            updater: user,
+            arrivalNotice: pendingArrivalNotice
+        };
+        await grnRepo.save(grn);
+        return pendingArrivalNotice;
+    }
     async addEditArrivalNoticeProducts(context, ganNo, approvedAddEditProducts, newOrderProducts, existingOrderProducts) {
         var _a;
         const { user, domain, tx } = context.state;
@@ -125,6 +395,9 @@ let ArrivalNoticeMutation = class ArrivalNoticeMutation {
                         .set({
                         batchId: op.batchId,
                         batchIdRef: op.batchIdRef,
+                        expDate: op.expDate,
+                        warehouse: op.warehouse ? { id: op.warehouse.id } : null,
+                        location: op.location ? { id: op.location.id } : null,
                         manufactureDate: op.manufactureDate,
                         packQty: op.packQty,
                         packingType: op.packingType,
@@ -360,6 +633,27 @@ __decorate([
     __metadata("design:paramtypes", [String, arrival_notice_types_1.ArrivalNoticePatch, Object]),
     __metadata("design:returntype", Promise)
 ], ArrivalNoticeMutation.prototype, "rejectArrivalNotice", null);
+__decorate([
+    (0, type_graphql_1.Directive)('@privilege(category: "order_warehouse", privilege: "mutation")'),
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => arrival_notice_1.ArrivalNotice),
+    __param(0, (0, type_graphql_1.Ctx)()),
+    __param(1, (0, type_graphql_1.Arg)('arrivalNotice', type => arrival_notice_types_1.NewArrivalNotice)),
+    __param(2, (0, type_graphql_1.Arg)('files', type => [graphql_upload_1.GraphQLUpload], { nullable: true })),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, arrival_notice_types_1.NewArrivalNotice, Array]),
+    __metadata("design:returntype", Promise)
+], ArrivalNoticeMutation.prototype, "submitDirectInboundArrivalNotice", null);
+__decorate([
+    (0, type_graphql_1.Directive)('@privilege(category: "order_warehouse", privilege: "mutation")'),
+    (0, type_graphql_1.Directive)('@transaction'),
+    (0, type_graphql_1.Mutation)(returns => arrival_notice_1.ArrivalNotice),
+    __param(0, (0, type_graphql_1.Ctx)()),
+    __param(1, (0, type_graphql_1.Arg)('name')),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, String]),
+    __metadata("design:returntype", Promise)
+], ArrivalNoticeMutation.prototype, "confirmDirectInboundArrivalNotice", null);
 __decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "order_warehouse", privilege: "mutation")'),
     (0, type_graphql_1.Directive)('@transaction'),
@@ -476,132 +770,137 @@ async function generateArrivalNoticeFunction(_, arrivalNotice, fromPo, files, co
     let myBizplace;
     let orderNo = '';
     const settingRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(setting_base_1.Setting)) || (0, typeorm_1.getRepository)(setting_base_1.Setting);
-    if (arrivalNotice.bizplace)
-        myBizplace = arrivalNotice.bizplace;
-    else if (arrivalNotice.customerBizplaceId) {
-        const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
-        let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId);
-        if (!foundPermittedBizplace)
-            throw new Error(`This user does not permitted for this company`);
-        myBizplace = arrivalNotice.customerBizplaceId;
-    }
-    else if (arrivalNotice.partnerBizplaceId) {
-        const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
-        let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.partnerBizplaceId);
-        if (!foundPermittedBizplace)
-            throw new Error(`This user does not permitted for this company`);
-        myBizplace = arrivalNotice.partnerBizplaceId;
-    }
-    else if (arrivalNotice.warehouseId)
-        myBizplace = await (0, biz_base_1.getOutletBizplace)(arrivalNotice.warehouseId);
-    else
-        myBizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
-    // Add validation for decimal quantities
-    for (let patch of orderProducts) {
-        // Get product details to check isInventoryDecimal
-        const product = (await tx.getRepository(product_base_1.Product).findOne({
-            where: { id: patch.product.id }
-        }));
-        if (!product) {
-            throw new Error(`Product not found for ID: ${patch.product.id}`);
+    try {
+        if (arrivalNotice.bizplace)
+            myBizplace = arrivalNotice.bizplace;
+        else if (arrivalNotice.customerBizplaceId) {
+            const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
+            let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.customerBizplaceId);
+            if (!foundPermittedBizplace)
+                throw new Error(`This user does not permitted for this company`);
+            myBizplace = arrivalNotice.customerBizplaceId;
         }
-        // Validate packQty based on isInventoryDecimal flag
-        const validatePackQty = (qty) => {
-            if (qty === null || qty === undefined)
-                return true;
-            const numQty = Number(qty);
-            if (isNaN(numQty))
-                return false;
-            if (product.isInventoryDecimal) {
-                // For decimal products, check if decimal places <= 3
-                const decimalPlaces = (numQty.toString().split('.')[1] || '').length;
-                return decimalPlaces <= 3;
-            }
-            else {
-                // For non-decimal products, check if it's a whole number
-                return numQty === Math.floor(numQty);
-            }
-        };
-        // Validate only packQty
-        if (!validatePackQty(patch.packQty)) {
-            throw new Error(`Invalid pack quantity for product ${product.name} (SKU: ${product.sku}). ${product.isInventoryDecimal
-                ? 'Decimal quantities must have at most 3 decimal places'
-                : 'Only whole numbers are allowed'}`);
+        else if (arrivalNotice.partnerBizplaceId) {
+            const permittedBizplaces = await (0, biz_base_1.getPermittedBizplaces)(domain, user);
+            let foundPermittedBizplace = permittedBizplaces.find(biz => biz.id == arrivalNotice.partnerBizplaceId);
+            if (!foundPermittedBizplace)
+                throw new Error(`This user does not permitted for this company`);
+            myBizplace = arrivalNotice.partnerBizplaceId;
         }
-        // Check for existing LotID in Inventory
-        let foundInventoryPallet = await tx.getRepository(warehouse_base_1.Inventory).findOne({
-            where: {
-                domain,
-                palletId: patch.palletId
+        else if (arrivalNotice.warehouseId)
+            myBizplace = await (0, biz_base_1.getOutletBizplace)(arrivalNotice.warehouseId);
+        else
+            myBizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
+        // Add validation for decimal quantities
+        for (let patch of orderProducts) {
+            // Get product details to check isInventoryDecimal
+            const product = (await tx.getRepository(product_base_1.Product).findOne({
+                where: { id: patch.product.id }
+            }));
+            if (!product) {
+                throw new Error(`Product not found for ID: ${patch.product.id}`);
             }
-        });
-        if (patch.palletId) {
-            // Check for existing LotID in OrderProduct
-            let foundOrderProductsPallet = await tx.getRepository(order_product_1.OrderProduct).find({
+            // Validate packQty based on isInventoryDecimal flag
+            const validatePackQty = (qty) => {
+                if (qty === null || qty === undefined)
+                    return true;
+                const numQty = Number(qty);
+                if (isNaN(numQty))
+                    return false;
+                if (product.isInventoryDecimal) {
+                    // For decimal products, check if decimal places <= 3
+                    const decimalPlaces = (numQty.toString().split('.')[1] || '').length;
+                    return decimalPlaces <= 3;
+                }
+                else {
+                    // For non-decimal products, check if it's a whole number
+                    return numQty === Math.floor(numQty);
+                }
+            };
+            // Validate only packQty
+            if (!validatePackQty(patch.packQty)) {
+                throw new Error(`Invalid pack quantity for product ${product.name} (SKU: ${product.sku}). ${product.isInventoryDecimal
+                    ? 'Decimal quantities must have at most 3 decimal places'
+                    : 'Only whole numbers are allowed'}`);
+            }
+            // Check for existing LotID in Inventory
+            let foundInventoryPallet = await tx.getRepository(warehouse_base_1.Inventory).findOne({
                 where: {
                     domain,
                     palletId: patch.palletId
                 }
             });
-            // Check for existing LotID in ArrivalNotice
-            let arrivalNotices = await Promise.all(foundOrderProductsPallet.map(async (product) => {
-                return await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
+            if (patch.palletId) {
+                // Check for existing LotID in OrderProduct
+                let foundOrderProductsPallet = await tx.getRepository(order_product_1.OrderProduct).find({
                     where: {
-                        id: product.arrivalNoticeId
+                        domain,
+                        palletId: patch.palletId
                     }
                 });
-            }));
-            //Allow the reuse if PalletID if all the entered products has at least one of the conditions
-            let allProductsValid = foundOrderProductsPallet.every((product, index) => {
-                let arrivalNotice = arrivalNotices[index];
-                return product.status === 'REJECTED' || product.issue || (arrivalNotice && arrivalNotice.status === 'CANCELLED');
-            });
-            if (!allProductsValid || foundInventoryPallet) {
-                throw new Error(i18next_1.default.t('Lot ID is already in use. Please enter a new Lot ID.'));
+                // Check for existing LotID in ArrivalNotice
+                let arrivalNotices = await Promise.all(foundOrderProductsPallet.map(async (product) => {
+                    return await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
+                        where: {
+                            id: product.arrivalNoticeId
+                        }
+                    });
+                }));
+                //Allow the reuse if PalletID if all the entered products has at least one of the conditions
+                let allProductsValid = foundOrderProductsPallet.every((product, index) => {
+                    let arrivalNotice = arrivalNotices[index];
+                    return (product.status === 'REJECTED' || product.issue || (arrivalNotice && arrivalNotice.status === 'CANCELLED'));
+                });
+                if (!allProductsValid || foundInventoryPallet) {
+                    throw new Error(i18next_1.default.t('Lot ID is already in use. Please enter a new Lot ID.'));
+                }
             }
         }
-    }
-    // find GAN number rule setting
-    const ganNoSetting = await settingRepo.findOne({
-        where: {
-            domain,
-            name: constants_1.ORDER_NUMBER_SETTING_KEY.GAN_NUMBER_RULE
-        }
-    });
-    if (ganNoSetting) {
-        orderNo = await (0, id_rule_base_1.generateId)({ domain, type: constants_1.ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} });
-    }
-    else {
-        orderNo = order_no_generator_1.OrderNoGenerator.arrivalNotice();
-    }
-    // 1. Create arrival notice
-    const createdArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: orderNo, domain, bizplace: myBizplace, looseItem: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.looseItem) ? arrivalNotice.looseItem : false, status: fromPo ? constants_1.ORDER_STATUS.INTRANSIT : constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
-    // 2. Create arrival notice product
-    await addArrivalNoticeProducts(domain, createdArrivalNotice, orderProducts.map((op) => {
-        return Object.assign(Object.assign({}, op), { status: fromPo ? constants_1.ORDER_PRODUCT_STATUS.INTRANSIT : constants_1.ORDER_PRODUCT_STATUS.PENDING });
-    }), user, tx);
-    await (0, job_sheet_mutation_1.generateJobSheet)(domain, user, createdArrivalNotice, tx);
-    // 3. Create arrival notice vas
-    if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
-        orderVass = await Promise.all(orderVass.map(async (ov) => {
-            if (ov.targetProduct) {
-                ov.targetProduct = await tx.getRepository(product_base_1.Product).findOne(ov.targetProduct.id);
+        // find GAN number rule setting
+        const ganNoSetting = await settingRepo.findOne({
+            where: {
+                domain,
+                name: constants_1.ORDER_NUMBER_SETTING_KEY.GAN_NUMBER_RULE
             }
-            return Object.assign(Object.assign({}, ov), { domain, bizplace: myBizplace, name: order_no_generator_1.OrderNoGenerator.orderVas(), vas: await tx.getRepository(vas_1.Vas).findOne({ domain, id: ov.vas.id }), type: constants_1.ORDER_TYPES.ARRIVAL_NOTICE, arrivalNotice: createdArrivalNotice, status: fromPo ? constants_1.ORDER_VAS_STATUS.INTRANSIT : constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
-        }));
-        await tx.getRepository(order_vas_1.OrderVas).save(orderVass);
-    }
-    if (files === null || files === void 0 ? void 0 : files.length) {
-        const attachments = files.map(attachment => {
-            return {
-                file: attachment,
-                refBy: createdArrivalNotice.id,
-                category: attachment_type_1.ATTACHMENT_TYPE.GAN
-            };
         });
-        await (0, attachment_base_1.createAttachments)(_, { attachments }, context);
+        if (ganNoSetting) {
+            orderNo = await (0, id_rule_base_1.generateId)({ domain, type: constants_1.ORDER_NUMBER_RULE_TYPE.GAN_NUMBER, seed: {} });
+        }
+        else {
+            orderNo = order_no_generator_1.OrderNoGenerator.arrivalNotice();
+        }
+        // 1. Create arrival notice
+        const createdArrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).save(Object.assign(Object.assign({}, arrivalNotice), { name: orderNo, domain, bizplace: myBizplace, looseItem: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.looseItem) ? arrivalNotice.looseItem : false, status: fromPo ? constants_1.ORDER_STATUS.INTRANSIT : constants_1.ORDER_STATUS.PENDING, creator: user, updater: user }));
+        // 2. Create arrival notice product
+        await addArrivalNoticeProducts(domain, createdArrivalNotice, orderProducts.map((op) => {
+            return Object.assign(Object.assign({}, op), { status: fromPo ? constants_1.ORDER_PRODUCT_STATUS.INTRANSIT : constants_1.ORDER_PRODUCT_STATUS.PENDING });
+        }), user, tx);
+        await (0, job_sheet_mutation_1.generateJobSheet)(domain, user, createdArrivalNotice, tx);
+        // 3. Create arrival notice vas
+        if (orderVass === null || orderVass === void 0 ? void 0 : orderVass.length) {
+            orderVass = await Promise.all(orderVass.map(async (ov) => {
+                if (ov.targetProduct) {
+                    ov.targetProduct = await tx.getRepository(product_base_1.Product).findOne(ov.targetProduct.id);
+                }
+                return Object.assign(Object.assign({}, ov), { domain, bizplace: myBizplace, name: order_no_generator_1.OrderNoGenerator.orderVas(), vas: await tx.getRepository(vas_1.Vas).findOne({ domain, id: ov.vas.id }), type: constants_1.ORDER_TYPES.ARRIVAL_NOTICE, arrivalNotice: createdArrivalNotice, status: fromPo ? constants_1.ORDER_VAS_STATUS.INTRANSIT : constants_1.ORDER_VAS_STATUS.PENDING, creator: user, updater: user });
+            }));
+            await tx.getRepository(order_vas_1.OrderVas).save(orderVass);
+        }
+        if (files === null || files === void 0 ? void 0 : files.length) {
+            const attachments = files.map(attachment => {
+                return {
+                    file: attachment,
+                    refBy: createdArrivalNotice.id,
+                    category: attachment_type_1.ATTACHMENT_TYPE.GAN
+                };
+            });
+            await (0, attachment_base_1.createAttachments)(_, { attachments }, context);
+        }
+        return createdArrivalNotice;
+    }
+    catch (error) {
+        throw new Error(error.message);
     }
-    return createdArrivalNotice;
 }
 exports.generateArrivalNoticeFunction = generateArrivalNoticeFunction;
 async function confirmArrivalNoticeFunction(name, context, tx) {
@@ -931,7 +1230,7 @@ async function rejectArrivalNotice(tx, name, remark, context) {
 }
 exports.rejectArrivalNotice = rejectArrivalNotice;
 async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts, user, tx) {
-    var _a, _b;
+    var _a, _b, _c, _d, _e;
     const orderProductRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(order_product_1.OrderProduct)) || (0, typeorm_1.getRepository)(order_product_1.OrderProduct);
     if (!(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace) || !((_a = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.orderProducts) === null || _a === void 0 ? void 0 : _a.length)) {
         arrivalNotice = await tx.getRepository(arrival_notice_1.ArrivalNotice).findOne({
@@ -946,6 +1245,8 @@ async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts,
             name: order_no_generator_1.OrderNoGenerator.orderProduct(),
             product_id: op.product.id,
             product_detail_id: op.productDetail.id,
+            warehouse_id: ((_b = op.warehouse) === null || _b === void 0 ? void 0 : _b.id) || null,
+            location_id: ((_c = op.location) === null || _c === void 0 ? void 0 : _c.id) || null,
             batch_id: op.batchId,
             batch_id_ref: op.batchIdRef,
             packing_type: op.packingType,
@@ -958,6 +1259,7 @@ async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts,
             pallet_id: op.palletId,
             unit_price: op.unitPrice,
             remark: op.remark,
+            exp_date: (_d = op.expDate) !== null && _d !== void 0 ? _d : null,
             manufacture_date: op.manufactureDate,
             status: op.status,
             adjusted_batch_id: op.adjustedBatchId,
@@ -970,20 +1272,66 @@ async function addArrivalNoticeProducts(domain, arrivalNotice, newOrderProducts,
             adjusted_pallet_qty: op.adjustedPalletQty,
             adjusted_unit_price: op.adjustedUnitPrice,
             domain_id: domain.id,
-            bizplace_id: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplaceId) || ((_b = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace) === null || _b === void 0 ? void 0 : _b.id) || (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace),
+            bizplace_id: (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplaceId) || ((_e = arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace) === null || _e === void 0 ? void 0 : _e.id) || (arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.bizplace),
             arrival_notice_id: arrivalNotice.id,
             creator_id: user.id,
             updater_id: user.id
         });
     }
     await orderProductRepo.query(`
-    INSERT INTO order_products ("name", "product_detail_id", "product_id", "batch_id", "batch_id_ref", "packing_type", "packing_size", "uom", "uom_value", "pack_qty", "total_uom_value", "pallet_qty", "pallet_id", "unit_price", "remark", "manufacture_date", "status", 
-    "adjusted_batch_id", "adjusted_batch_id_ref", "adjusted_packing_type", "adjusted_uom_value", "adjusted_uom", "adjusted_pack_qty", "adjusted_total_uom_value", "adjusted_pallet_qty", "adjusted_unit_price", 
-    "domain_id", "bizplace_id", "arrival_notice_id", "creator_id", "updater_id")
-    SELECT "name", "product_detail_id", "product_id", "batch_id", "batch_id_ref", "packing_type", "packing_size", "uom", "uom_value", "pack_qty", "total_uom_value", "pallet_qty", "pallet_id", "unit_price", "remark", "manufacture_date", "status",
-    "adjusted_batch_id", "adjusted_batch_id_ref", "adjusted_packing_type", "adjusted_uom_value", "adjusted_uom", "adjusted_pack_qty", "adjusted_total_uom_value", "adjusted_pallet_qty", "adjusted_unit_price",
-    "domain_id", "bizplace_id", "arrival_notice_id", "creator_id", "updater_id"
-    FROM JSON_POPULATE_RECORDSET(NULL::order_products, $1) op
+    INSERT INTO order_products (
+      "name", "product_detail_id", "product_id", 
+      "warehouse_id", "location_id",
+      "batch_id", "batch_id_ref", "packing_type", 
+      "packing_size", "uom", "uom_value", 
+      "pack_qty", "total_uom_value", "pallet_qty", 
+      "pallet_id", "unit_price", "remark", 
+      "exp_date", 
+      "manufacture_date", "status", "adjusted_batch_id", 
+      "adjusted_batch_id_ref", "adjusted_packing_type", 
+      "adjusted_uom_value", "adjusted_uom", 
+      "adjusted_pack_qty", "adjusted_total_uom_value", 
+      "adjusted_pallet_qty", "adjusted_unit_price", 
+      "domain_id", "bizplace_id", "arrival_notice_id", 
+      "creator_id", "updater_id"
+    ) 
+    SELECT 
+      "name", 
+      "product_detail_id", 
+      "product_id", 
+      "warehouse_id",
+      "location_id",
+      "batch_id", 
+      "batch_id_ref", 
+      "packing_type", 
+      "packing_size", 
+      "uom", 
+      "uom_value", 
+      "pack_qty", 
+      "total_uom_value", 
+      "pallet_qty", 
+      "pallet_id", 
+      "unit_price", 
+      "remark", 
+      "exp_date",
+      "manufacture_date",
+      "status", 
+      "adjusted_batch_id", 
+      "adjusted_batch_id_ref", 
+      "adjusted_packing_type", 
+      "adjusted_uom_value", 
+      "adjusted_uom", 
+      "adjusted_pack_qty", 
+      "adjusted_total_uom_value", 
+      "adjusted_pallet_qty", 
+      "adjusted_unit_price", 
+      "domain_id", 
+      "bizplace_id", 
+      "arrival_notice_id", 
+      "creator_id", 
+      "updater_id" 
+    FROM 
+      JSON_POPULATE_RECORDSET(NULL :: order_products, $1) op
   `, [JSON.stringify(createdOrderProducts)]);
 }
 exports.addArrivalNoticeProducts = addArrivalNoticeProducts;
@@ -1082,4 +1430,21 @@ function formRawArrivalNotices(arrivalNotice, errorMsg) {
     }
     return rawArrivalNotices;
 }
+function mergeDuplicateRow(arr, groupByKey, qty) {
+    return arr.reduce((acc, currentItem) => {
+        const getNestedValue = (obj, path) => {
+            return path.split('.').reduce((o, p) => (o ? o[p] : undefined), obj);
+        };
+        const compositeKey = groupByKey.map(key => getNestedValue(currentItem, key)).join('::');
+        if (acc.has(compositeKey)) {
+            const existingItem = acc.get(compositeKey);
+            existingItem[qty] = parseFloat(existingItem[qty]) + parseFloat(currentItem[qty]);
+            existingItem['palletQty'] = parseFloat(existingItem['palletQty']) + parseFloat(currentItem['palletQty']);
+            existingItem['totalUomValue'] = (parseFloat(existingItem['totalUomValue']) + parseFloat(currentItem['totalUomValue'])).toString();
+        }
+        else
+            acc.set(compositeKey, Object.assign({}, currentItem));
+        return acc;
+    }, new Map());
+}
 //# sourceMappingURL=arrival-notice-mutation.js.map