@things-factory/worksheet-base 5.0.0-alpha.4 → 5.0.0-alpha.40

package/dist-server/constants/template.js

@@ -8,6 +8,7 @@ exports.TEMPLATE_TYPE = {
     JOB_TEMPLATE: 'JOB_TEMPLATE',
     MANIFEST_TEMPLATE: 'MANIFEST_TEMPLATE',
     INVOICE_TEMPLATE: 'INVOICE_TEMPLATE',
+    PO_TEMPLATE: "PO_TEMPLATE",
     COP: 'COP',
     SIGNATURE: 'SIGNATURE',
     LOGO: 'LOGO'

package/dist-server/constants/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../server/constants/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG;IAC3B,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,kBAAkB;IACpC,GAAG,EAAE,KAAK;IACV,SAAS,EAAE,WAAW;IACtB,IAAI,EAAE,MAAM;CACb,CAAA"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../server/constants/template.ts"],"names":[],"mappings":";;;AAAa,QAAA,aAAa,GAAG;IAC3B,WAAW,EAAE,aAAa;IAC1B,WAAW,EAAE,aAAa;IAC1B,YAAY,EAAE,cAAc;IAC5B,YAAY,EAAE,cAAc;IAC5B,iBAAiB,EAAE,mBAAmB;IACtC,gBAAgB,EAAE,kBAAkB;IACpC,WAAW,EAAC,aAAa;IACzB,GAAG,EAAE,KAAK;IACV,SAAS,EAAE,WAAW;IACtB,IAAI,EAAE,MAAM;CACb,CAAA"}

package/dist-server/controllers/ecommerce/sellercraft-controller.js

@@ -125,6 +125,7 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
         });
         let inventories = await qb.getMany();
         let inventoryTotalQty = 0;
+        let inventoryTotalLockedQty = 0;
         let defaultProductDetail = product.productDetails.find(productDetail => productDetail.isDefault);
         if ((inventories === null || inventories === void 0 ? void 0 : inventories.length) > 0) {
             const sellercraftInvs = await Promise.all(inventories.map(async (inventory) => {
@@ -134,10 +135,14 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
                     const unmatchingProductDetail = product.productDetails.find(productDetail => productDetail.packingType === inventoryPackingType);
                     packingSize = await this.getChildPackingSize(productDetails, defaultProductDetail, unmatchingProductDetail);
                 }
-                return { quantity: inventory.qty * packingSize - inventory.lockedQty * packingSize };
+                return { totalQty: inventory.qty * packingSize, totalLockedQty: inventory.lockedQty * packingSize };
             }));
             inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
-                total += currentValue.quantity;
+                total += currentValue.totalQty;
+                return total;
+            }, 0);
+            inventoryTotalQty = sellercraftInvs.reduce((total, currentValue) => {
+                total += currentValue.totalLockedQty;
                 return total;
             }, 0);
         }
@@ -146,7 +151,8 @@ class SellercraftController extends worksheet_controller_1.WorksheetController {
                 sku: product.sku,
                 gtin: defaultProductDetail.gtin,
                 stock: {
-                    quantity: inventoryTotalQty,
+                    quantity_total: inventoryTotalQty,
+                    quantity_reserved: inventoryTotalLockedQty,
                     unit_of_measure: 'EA'
                 },
                 package_weight_gm: defaultProductDetail.nettWeight < 1 ? 1 : defaultProductDetail.nettWeight,

package/dist-server/controllers/ecommerce/sellercraft-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sellercraft-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/sellercraft-controller.ts"],"names":[],"mappings":"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"}

package/dist-server/controllers/inbound/unloading-worksheet-controller.js

@@ -4,6 +4,7 @@ exports.UnloadingWorksheetController = void 0;
 const typeorm_1 = require("typeorm");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
 const sales_base_1 = require("@things-factory/sales-base");
+const setting_base_1 = require("@things-factory/setting-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../constants");
 const entities_1 = require("../../entities");
@@ -52,13 +53,15 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
         });
         if (!worksheetDetail)
             throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
+        const targetProduct = worksheetDetail.targetProduct;
+        if (targetProduct.status == sales_base_1.ORDER_PRODUCT_STATUS.EDITED)
+            throw new Error('this product is pending for changes approval');
         const bizplace = worksheetDetail.bizplace;
         const companyDomain = (_a = bizplace === null || bizplace === void 0 ? void 0 : bizplace.company) === null || _a === void 0 ? void 0 : _a.domain;
         const worksheet = worksheetDetail.worksheet;
         const arrivalNotice = worksheet.arrivalNotice;
         const returnOrder = worksheet.returnOrder;
         const orderId = Boolean(arrivalNotice === null || arrivalNotice === void 0 ? void 0 : arrivalNotice.id) ? arrivalNotice.id : returnOrder.id;
-        const targetProduct = worksheetDetail.targetProduct;
         const targetInventory = worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory;
         const originInventory = targetInventory ? targetInventory.inventory : null;
         const batchId = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId;
@@ -171,7 +174,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
             this.updateOrderTargets([targetInventory]);
         }
     }
-    async scanProductUnload(worksheetDetailName, productBarcode, inventory) {
+    async scanSerialNumberUnload(worksheetDetailName, serialNumber, inventory) {
         var _a;
         const worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).findOne({
             where: {
@@ -203,11 +206,185 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
                 type: constants_1.RULE_TYPE.LOT_NUMBER_ID,
                 seed: { date: utils_1.DateGenerator.generateDate() }
             });
+        const targetProduct = worksheetDetail.targetProduct;
+        if (targetProduct.status == sales_base_1.ORDER_PRODUCT_STATUS.EDITED)
+            throw new Error('this product is pending for changes approval');
         const bizplace = worksheetDetail.bizplace;
         const worksheet = worksheetDetail.worksheet;
         const arrivalNotice = worksheet.arrivalNotice;
         const returnOrder = worksheet.returnOrder;
+        const targetInventory = worksheetDetail.targetInventory;
+        const product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product;
+        const packingType = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType;
+        const packingSize = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize;
+        const batchId = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId;
+        let qty = 0;
+        let uom = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom;
+        const cartonId = inventory.cartonId;
+        const orderId = Boolean(arrivalNotice) ? arrivalNotice.id : returnOrder.id;
+        await this.checkSerialNumberDuplication(serialNumber, product);
+        qty++;
+        const invQb = await this.trxMgr
+            .getRepository(warehouse_base_1.Inventory)
+            .createQueryBuilder('INV')
+            .where('INV.domain_id = :domainId', { domainId: this.domain.id })
+            .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
+            .andWhere('INV.product_id = :productId', { productId: product.id })
+            .andWhere('INV.batch_id = :batchId', { batchId: batchId })
+            .andWhere('INV.packing_type = :packingType', { packingType: packingType })
+            .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize });
+        if (arrivalNotice)
+            invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id });
+        else if (returnOrder)
+            invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id });
+        if (inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate) {
+            invQb.andWhere('INV.expiration_date = :expirationDate', {
+                expirationDate: inventory.expirationDate
+            });
+        }
+        if (inventory === null || inventory === void 0 ? void 0 : inventory.cartonId)
+            invQb.andWhere('INV.carton_id = :cartonId', { cartonId: inventory.cartonId });
+        else
+            invQb.andWhere('INV.pallet_id = :palletId', { palletId: inventory.palletId });
+        let foundInventory = await invQb.getOne();
+        const batchIdRef = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null;
+        const remark = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark;
+        const manufactureDate = Boolean(arrivalNotice) ? targetProduct.manufactureDate : null;
+        const location = worksheet.bufferLocation;
+        const warehouse = location.warehouse;
+        const zone = location.zone;
+        const unitCost = Boolean(arrivalNotice)
+            ? (targetProduct === null || targetProduct === void 0 ? void 0 : targetProduct.unitPrice)
+                ? ((targetProduct.packQty * targetProduct.unitPrice + targetProduct.miscAmt - targetProduct.discountAmt) *
+                    (1 + targetProduct.taxRate / 100)) /
+                    targetProduct.packQty
+                : 0
+            : null;
+        if (!foundInventory) {
+            let newInventory = new warehouse_base_1.Inventory();
+            newInventory.bizplace = bizplace;
+            newInventory.domain = this.domain;
+            newInventory.name = warehouse_base_1.InventoryNoGenerator.inventoryName();
+            newInventory.palletId = inventory.palletId;
+            newInventory.cartonId = inventory.cartonId;
+            newInventory.batchId = batchId;
+            newInventory.batchIdRef = batchIdRef;
+            newInventory.product = product;
+            newInventory.packingType = packingType;
+            newInventory.packingSize = packingSize;
+            newInventory.uom = uom;
+            newInventory.remark = remark;
+            newInventory.qty = qty;
+            newInventory.uomValue =
+                Math.round(qty *
+                    (Boolean(arrivalNotice)
+                        ? targetProduct.uomValue
+                        : targetInventory.returnUomValue / targetInventory.returnQty) *
+                    100) / 100;
+            newInventory.manufactureDate = manufactureDate;
+            newInventory.refOrderId = orderId;
+            newInventory.unitCost = unitCost;
+            if ((_a = inventory.reusablePallet) === null || _a === void 0 ? void 0 : _a.id) {
+                newInventory.reusablePallet = await this.trxMgr.getRepository(warehouse_base_1.Pallet).findOne(inventory.reusablePallet.id);
+            }
+            newInventory.orderProductId = Boolean(arrivalNotice) ? targetProduct.id : null;
+            newInventory.orderInventoryId = Boolean(returnOrder) ? targetInventory.id : null;
+            newInventory.warehouse = warehouse;
+            newInventory.location = location;
+            newInventory.zone = zone;
+            newInventory.status = warehouse_base_1.INVENTORY_STATUS.CHECKED;
+            newInventory.creator = this.user;
+            if (inventory === null || inventory === void 0 ? void 0 : inventory.expirationDate) {
+                newInventory.expirationDate = new Date(inventory.expirationDate);
+            }
+            if (arrivalNotice) {
+                targetProduct.actualPalletQty++;
+                targetProduct.actualPackQty = Boolean(targetProduct.actualPackQty) ? targetProduct.actualPackQty + qty : qty;
+            }
+            else if (returnOrder) {
+                targetInventory.actualPalletQty++;
+                targetInventory.actualPackQty = Boolean(targetInventory.actualPackQty)
+                    ? targetInventory.actualPackQty + qty
+                    : qty;
+            }
+            foundInventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).save(newInventory);
+        }
+        else {
+            const updatedQty = foundInventory.qty + qty;
+            foundInventory.expirationDate = new Date(foundInventory.expirationDate);
+            foundInventory.qty = updatedQty;
+            foundInventory.uomValue +=
+                Math.round(qty *
+                    (Boolean(arrivalNotice)
+                        ? targetProduct.uomValue
+                        : targetInventory.returnUomValue / targetInventory.returnQty) *
+                    100) / 100;
+            if (arrivalNotice)
+                targetProduct.actualPackQty = targetProduct.actualPackQty + qty;
+            else if (returnOrder)
+                targetInventory.actualPackQty = targetInventory.actualPackQty + qty;
+            foundInventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).save(foundInventory);
+        }
+        let inventoryItem = new warehouse_base_1.InventoryItem();
+        inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
+        inventoryItem.serialNumber = serialNumber;
+        inventoryItem.status = foundInventory.status;
+        inventoryItem.inboundOrderId = foundInventory.refOrderId;
+        inventoryItem.product = product;
+        inventoryItem.inventory = foundInventory;
+        inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.INBOUND;
+        inventoryItem.domain = this.domain;
+        inventoryItem.creator = this.user;
+        inventoryItem.updater = this.user;
+        await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
+        if (arrivalNotice) {
+            targetProduct.updater = this.user;
+            this.updateOrderTargets([targetProduct]);
+        }
+        else if (returnOrder) {
+            targetInventory.updater = this.user;
+            this.updateOrderTargets([targetInventory]);
+        }
+    }
+    async scanProductUnload(worksheetDetailName, productBarcode, inventory) {
+        var _a;
+        const worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).findOne({
+            where: {
+                name: worksheetDetailName,
+                status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(constants_1.WORKSHEET_STATUS.DEACTIVATED))
+            },
+            relations: [
+                'bizplace',
+                'worksheet',
+                'worksheet.arrivalNotice',
+                'worksheet.returnOrder',
+                'worksheet.bufferLocation',
+                'worksheet.bufferLocation.warehouse',
+                'targetProduct',
+                'targetProduct.product',
+                'targetProduct.product.productDetails',
+                'targetProduct.product.productDetails.childProductDetail',
+                'targetInventory',
+                'targetInventory.product',
+                'targetInventory.product.productDetails',
+                'targetInventory.product.productDetails.childProductDetail'
+            ]
+        });
+        if (!worksheetDetail)
+            throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
+        if (!(inventory === null || inventory === void 0 ? void 0 : inventory.palletId))
+            inventory.palletId = await (0, id_rule_base_1.generateId)({
+                domain: this.domain,
+                type: constants_1.RULE_TYPE.LOT_NUMBER_ID,
+                seed: { date: utils_1.DateGenerator.generateDate() }
+            });
         const targetProduct = worksheetDetail.targetProduct;
+        if (targetProduct.status == sales_base_1.ORDER_PRODUCT_STATUS.EDITED)
+            throw new Error('this product is pending for changes approval');
+        const bizplace = worksheetDetail.bizplace;
+        const worksheet = worksheetDetail.worksheet;
+        const arrivalNotice = worksheet.arrivalNotice;
+        const returnOrder = worksheet.returnOrder;
         const targetInventory = worksheetDetail.targetInventory;
         const product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product;
         const packingType = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType;
@@ -449,6 +626,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
                 }
                 else {
                     targetProduct.actualPackQty--;
+                    // targetProduct.actualPalletQty--
                 }
                 targetProduct.updater = this.user;
                 await this.updateOrderTargets([targetProduct]);
@@ -472,6 +650,7 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
                 }
                 else {
                     targetInventory.actualPackQty--;
+                    // targetInventory.actualPalletQty--
                 }
                 targetInventory.updater = this.user;
                 await this.updateOrderTargets([targetInventory]);
@@ -518,6 +697,49 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
             await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
         }
     }
+    async undoSerialNumberUnload(worksheetDetailName, inventoryItemId) {
+        const worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).findOne({
+            where: { name: worksheetDetailName, domain: this.domain, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(constants_1.WORKSHEET_STATUS.DEACTIVATED)) },
+            relations: [
+                'worksheet',
+                'worksheet.arrivalNotice',
+                'worksheet.returnOrder',
+                'targetProduct',
+                'targetProduct.product'
+            ]
+        });
+        let worksheet = worksheetDetail.worksheet;
+        let arrivalNotice = worksheet.arrivalNotice;
+        let returnOrder = worksheet.returnOrder;
+        let targetInventory = worksheetDetail.targetInventory;
+        let targetProduct = worksheetDetail.targetProduct;
+        let inventoryItem = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).findOne({
+            where: { domain: this.domain, id: inventoryItemId },
+            relations: ['inventory', 'product']
+        });
+        let inventory = inventoryItem.inventory;
+        await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).delete(inventoryItem.id);
+        inventory.qty--;
+        inventory.uomValue =
+            Math.round(inventory.qty *
+                (Boolean(arrivalNotice)
+                    ? targetProduct.uomValue
+                    : targetInventory.returnUomValue / targetInventory.returnQty) *
+                100) / 100;
+        await this.trxMgr
+            .getRepository(warehouse_base_1.Inventory)
+            .update({ id: inventory.id }, { qty: inventory.qty, uomValue: inventory.uomValue });
+        targetProduct.actualPackQty--;
+        const inventoryItems = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).find({
+            where: { domain: this.domain, inboundOrderId: arrivalNotice.id, inventory }
+        });
+        if ((inventoryItems === null || inventoryItems === void 0 ? void 0 : inventoryItems.length) == 0) {
+            await this.trxMgr.getRepository(warehouse_base_1.Inventory).delete(inventory.id);
+            targetProduct.actualPalletQty--;
+        }
+        targetProduct.updater = this.user;
+        await this.updateOrderTargets([targetProduct]);
+    }
     async activateUnloading(worksheetNo, unloadingWorksheetDetails) {
         let worksheet = await this.findActivatableWorksheet(worksheetNo, constants_1.WORKSHEET_TYPE.UNLOADING, [
             'bizplace',
@@ -566,8 +788,60 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
         }
         return worksheet;
     }
+    async getProductScanningVal(arrivalNotice) {
+        var _a;
+        let productScanning = 'false';
+        const enableProductScanning = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+            where: { domain: this.domain, category: 'id-rule', name: 'enable-product-scanning' }
+        });
+        if (enableProductScanning)
+            productScanning = enableProductScanning.value;
+        const partnerEnableProductScanning = await this.trxMgr.getRepository(setting_base_1.PartnerSetting).findOne({
+            where: { setting: enableProductScanning, domain: this.domain, partnerDomain: (_a = arrivalNotice.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
+        });
+        if (partnerEnableProductScanning)
+            productScanning = partnerEnableProductScanning.value;
+        return productScanning;
+    }
+    async getInputQtyVal(arrivalNotice) {
+        var _a;
+        let inputQty = 'false';
+        const enableInputQty = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+            where: { domain: this.domain, category: 'id-rule', name: 'enable-input-qty' }
+        });
+        if (enableInputQty)
+            inputQty = enableInputQty.value;
+        const partnerEnableInputQty = await this.trxMgr.getRepository(setting_base_1.PartnerSetting).findOne({
+            where: { setting: enableInputQty, domain: this.domain, partnerDomain: (_a = arrivalNotice.bizplace) === null || _a === void 0 ? void 0 : _a.domain }
+        });
+        if (partnerEnableInputQty)
+            inputQty = partnerEnableInputQty.value;
+        return inputQty;
+    }
+    // only creates inventory history upon partial or full unload when
+    // productScanning is true
+    // inputQty is false
+    async createInventoryHistory(arrivalNotice, inventories) {
+        try {
+            if (inventories === undefined) {
+                const inventoryList = await this.trxMgr.getRepository(warehouse_base_1.Inventory).findAndCount({
+                    where: {
+                        domain: this.domain,
+                        refOrderId: arrivalNotice.id
+                    }
+                });
+                inventories = inventoryList[0];
+            }
+            for (const inventory of inventories) {
+                await this.transactionInventory(inventory, arrivalNotice, inventory.qty, inventory.uomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.UNLOADING);
+            }
+        }
+        catch (e) {
+            throw e;
+        }
+    }
     async completeUnloading(arrivalNoticeNo, unloadingWorksheetDetails) {
-        let arrivalNotice = await this.findRefOrder(sales_base_1.ArrivalNotice, { domain: this.domain, name: arrivalNoticeNo, status: (0, typeorm_1.In)([sales_base_1.ORDER_STATUS.PROCESSING, sales_base_1.ORDER_STATUS.PUTTING_AWAY]) }, ['orderProducts', 'releaseGood']);
+        let arrivalNotice = await this.findRefOrder(sales_base_1.ArrivalNotice, { domain: this.domain, name: arrivalNoticeNo, status: (0, typeorm_1.In)([sales_base_1.ORDER_STATUS.PROCESSING, sales_base_1.ORDER_STATUS.PUTTING_AWAY]) }, ['orderProducts', 'releaseGood', 'bizplace', 'bizplace.domain']);
         if (arrivalNotice.crossDocking) {
             // Picking worksheet for cross docking should be completed before complete it
             // Find picking worksheet
@@ -619,6 +893,32 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
         else {
             await this.completeWorksheet(worksheet);
         }
+        const productScanning = await this.getProductScanningVal(arrivalNotice);
+        const inputQty = await this.getInputQtyVal(arrivalNotice);
+        if (productScanning === 'true' && inputQty === 'false')
+            await this.createInventoryHistory(arrivalNotice);
+        const inventories = await this.trxMgr.getRepository(warehouse_base_1.Inventory).find({
+            where: {
+                domain: this.domain,
+                refOrderId: arrivalNotice.id,
+                status: (0, typeorm_1.In)([warehouse_base_1.INVENTORY_STATUS.UNLOADED, warehouse_base_1.INVENTORY_STATUS.CHECKED])
+            },
+            relations: ['domain', 'bizplace', 'product', 'warehouse', 'location']
+        });
+        for (let inventory of inventories) {
+            let inventoryItems = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).find({
+                where: { domain: this.domain, inventory }
+            });
+            if (inventoryItems === null || inventoryItems === void 0 ? void 0 : inventoryItems.length) {
+                inventory.status = warehouse_base_1.INVENTORY_STATUS.STORED;
+                await Promise.all(inventoryItems.map(async (inventoryItem) => {
+                    await this.trxMgr
+                        .getRepository(warehouse_base_1.InventoryItem)
+                        .update({ id: inventoryItem.id }, { status: warehouse_base_1.INVENTORY_STATUS.STORED });
+                }));
+                await (0, utils_1.generateInventoryHistory)(inventory, arrivalNotice, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.UNLOADING, inventory.qty, inventory.uomValue, this.user, this.trxMgr);
+            }
+        }
         let vasWorksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
             where: {
                 arrivalNotice,
@@ -651,9 +951,10 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
     }
     async completeUnloadingPartially(arrivalNoticeNo, unloadingWorksheetDetail) {
         const arrivalNotice = await this.findRefOrder(sales_base_1.ArrivalNotice, {
+            domain: this.domain,
             name: arrivalNoticeNo,
             status: (0, typeorm_1.In)([sales_base_1.ORDER_STATUS.PROCESSING, sales_base_1.ORDER_STATUS.PUTTING_AWAY])
-        });
+        }, ['bizplace', 'bizplace.domain']);
         const worksheet = await this.findWorksheetByRefOrder(arrivalNotice, constants_1.WORKSHEET_TYPE.UNLOADING, [
             'worksheetDetails',
             'worksheetDetails.targetProduct'
@@ -682,6 +983,10 @@ class UnloadingWorksheetController extends vas_worksheet_controller_1.VasWorkshe
             inventory.updater = this.user;
         });
         await this.trxMgr.getRepository(warehouse_base_1.Inventory).save(inventories);
+        const productScanning = await this.getProductScanningVal(arrivalNotice);
+        const inputQty = await this.getInputQtyVal(arrivalNotice);
+        if (productScanning === 'true' && inputQty === 'false')
+            await this.createInventoryHistory(arrivalNotice, inventories);
         let vasWorksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
             where: {
                 arrivalNotice,