@things-factory/operato-hub 4.3.676 → 4.3.678

package/dist-server/routers/api/restful-apis/v1/warehouse/add-release-order.js

@@ -17,7 +17,7 @@ const warehouse_base_1 = require("@things-factory/warehouse-base");
 const middlewares_1 = require("../middlewares");
 const error_util_1 = require("../utils/error-util");
 const integration_lmd_2 = require("@things-factory/integration-lmd");
-const debug = require('debug')('things-factory:operato-hub:restful-api:unstable:add-release-order');
+const debug = require('debug')('things-factory:operato-hub:restful-api:v1:add-release-order');
 const apiVersion = 'v1';
 api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middlewares_1.businessMiddleware, middlewares_1.validationMiddleware, middlewares_1.loggingMiddleware, async (context, next) => {
     return await (0, typeorm_1.getConnection)().transaction(async (tx) => {
@@ -152,6 +152,20 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
             if (batchIdStates.withBatchId && batchIdStates.withoutBatchId) {
                 throw new error_util_1.ApiError('E01', 'Please provide batch id for all inventories');
             }
+            // validate warehouseCode (name in warehouses table) if provided on any line
+            const providedWarehouseCodes = Array.from(new Set((bodyReq.orderInventories || [])
+                .map((it) => (it === null || it === void 0 ? void 0 : it.warehouseCode) && String(it.warehouseCode).trim())
+                .filter(Boolean)));
+            if (providedWarehouseCodes.length > 0) {
+                const warehouses = await tx.getRepository(warehouse_base_1.Warehouse).find({
+                    where: { domain, name: (0, typeorm_1.In)(providedWarehouseCodes) }
+                });
+                const foundNames = new Set(warehouses.map(w => w.name));
+                const missing = providedWarehouseCodes.filter(code => !foundNames.has(code));
+                if (missing.length > 0) {
+                    throw new error_util_1.ApiError('E04', `warehouseCode not exist in master: ${missing.join(', ')}`);
+                }
+            }
             // massage data
             massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context); //double check this function
             const invWithoutBatchId = batchIdStates.withoutBatchId;
@@ -159,48 +173,195 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
             if (invWithoutBatchId) {
                 // validation
                 await Promise.all(massagedData.combinedItems.map(async (item) => {
-                    let itemList = await tx.query(`
-            select wboi.* from warehouse_bizplace_onhand_inventories wboi 
-            left join (
-              select i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom, sum(i2.qty) as storage_qty, sum(i2.uom_value) as storage_uom_value from inventories i2 
-              inner join locations l2 on l2.id = i2.location_id 
-              where i2.domain_id = $1 and i2.bizplace_id = $2
-              and i2.product_id = $3 and i2.packing_type= $4 and i2.packing_size= $5 and i2.uom = $6 and i2.status='STORED'
-              and l2.type='STORAGE' 
-              group by i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom
-            ) storageInv on storageInv.product_id = wboi.product_id and storageInv.domain_id=wboi.domain_id and storageInv.bizplace_id=wboi.bizplace_id 
-            and storageInv.packing_type=wboi.packing_type and storageInv.packing_size=wboi.packing_size and storageInv.uom=wboi.uom
-            left join (
-              select i.product_id, i.domain_id, i.bizplace_id, i.packing_type, i.packing_size, i.uom, i.lock_inventory from inventories i 
-              where  i.domain_id = $1  and i.bizplace_id = $2
-              and i.product_id = $3 and i.packing_type= $4 and i.packing_size= $5 and i.uom = $6 and i.status='STORED'
-              group by i.product_id, i.domain_id, i.bizplace_id, i.packing_type, i.packing_size, i.uom, i.lock_inventory
-            ) lockInv on lockInv.product_id = wboi.product_id and lockInv.domain_id=wboi.domain_id and lockInv.bizplace_id=wboi.bizplace_id 
-             and lockInv.packing_type=wboi.packing_type and lockInv.packing_size=wboi.packing_size and lockInv.uom=wboi.uom 
-            where wboi."domain_id"= $1 and 
-            wboi."bizplace_id" = $2 and 
-            wboi."group_type" = 'SINGLE' and 
-            wboi."product_id" = $3 and
-            wboi."packing_type" = $4 and
-            wboi."packing_size" = $5 and
-            wboi."uom" = $6 and
-            lockInv.lock_inventory is not true and 
-            (wboi."remain_qty" - wboi."transfer_qty" - coalesce(storageInv.storage_qty, 0)) >= $7 and
-            (wboi."remain_uom_value" - wboi."transfer_uom_value" - coalesce(storageInv.storage_uom_value, 0)) >= $8
-          `, [
+                    var _a, _b;
+                    const hasWarehouse = !!item.warehouseCode;
+                    if (hasWarehouse) {
+                        // Validate availability within the specific warehouse across pickable locations (exclude Q/R/D/STORAGE)
+                        const rows = await tx.query(`
+                  select
+                    coalesce(sum(
+                      case when (iv.qty - greatest(coalesce(iv.locked_qty,0),0) - greatest(coalesce(pds.unassigned_qty,0),0)) < 0
+                           then 0
+                           else (iv.qty - greatest(coalesce(iv.locked_qty,0),0) - greatest(coalesce(pds.unassigned_qty,0),0))
+                      end
+                    ), 0) as total_available_qty,
+                    coalesce(sum(
+                      case when (iv.uom_value - greatest(coalesce(iv.locked_uom_value,0),0) - greatest(coalesce(pds.unassigned_uom_value,0),0)) < 0
+                           then 0
+                           else (iv.uom_value - greatest(coalesce(iv.locked_uom_value,0),0) - greatest(coalesce(pds.unassigned_uom_value,0),0))
+                      end
+                    ), 0) as total_available_uom_value
+                  from inventories iv
+                  left join product_detail_stocks pds on pds.product_detail_id = iv.product_detail_id
+                  inner join locations loc on loc.id = iv.location_id
+                  inner join warehouses w on w.id = loc.warehouse_id
+                  inner join products p on p.id = iv.product_id
+                  where iv.domain_id = $1
+                    and iv.bizplace_id = $2
+                    and iv.product_id = $3
+                    and iv.packing_type = $4
+                    and iv.packing_size = $5
+                    and iv.uom = $6
+                    and iv.status = 'STORED'
+                    and loc.type not in ('QUARANTINE','RESERVE','DAMAGE','STORAGE')
+                    and iv.obsolete = false
+                    and (case when iv.expiration_date is not null and p.min_outbound_shelf_life is not null then CURRENT_DATE < iv.expiration_date - p.min_outbound_shelf_life else true end)
+                    and w.name = $7
+                    and not exists (
+                      select 1 from inventories i
+                      where i.domain_id = $1 and i.bizplace_id = $2 and i.product_id = $3 and i.packing_type = $4 and i.packing_size = $5 and i.uom = $6 and i.status = 'STORED' and i.lock_inventory is true
+                    )
+                  `, [
+                            domain.id,
+                            customerBizplace.id,
+                            item.product.id,
+                            item.packingType,
+                            item.packingSize,
+                            item.uom,
+                            String(item.warehouseCode).trim()
+                        ]);
+                        const totalQty = parseFloat(((_a = rows === null || rows === void 0 ? void 0 : rows[0]) === null || _a === void 0 ? void 0 : _a.total_available_qty) || '0');
+                        const totalUomVal = parseFloat(((_b = rows === null || rows === void 0 ? void 0 : rows[0]) === null || _b === void 0 ? void 0 : _b.total_available_uom_value) || '0');
+                        let reqQty = item.releaseQty;
+                        let reqUomVal = item.releaseUomValue;
+                        if (!item.product.isInventoryDecimal) {
+                            reqQty = Math.round(reqQty);
+                        }
+                        else {
+                            reqQty = Math.round(reqQty * 1000) / 1000;
+                        }
+                        if (totalQty + 1e-6 < reqQty || totalUomVal + 1e-6 < reqUomVal) {
+                            throw new error_util_1.ApiError('E01', 'INSUFFICIENT_STOCK');
+                        }
+                    }
+                    else {
+                        // Fallback to existing global view-based validation when no warehouseCode provided
+                        let itemList = await tx.query(`
+                  select wboi.* 
+                  from warehouse_bizplace_onhand_inventories wboi 
+                  left join (
+                    select i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom, 
+                          sum(i2.qty) as storage_qty, 
+                          sum(i2.uom_value) as storage_uom_value 
+                    from inventories i2 
+                    inner join locations l2 on l2.id = i2.location_id 
+                    inner join warehouses w on w.id = l2.warehouse_id
+                    where i2.domain_id = $1 
+                      and i2.bizplace_id = $2
+                      and i2.product_id = $3 
+                      and i2.packing_type = $4 
+                      and i2.packing_size = $5 
+                      and i2.uom = $6 
+                      and i2.status = 'STORED'
+                      and l2.type = 'STORAGE' 
+                    group by i2.product_id, i2.domain_id, i2.bizplace_id, i2.packing_type, i2.packing_size, i2.uom
+                  ) storageInv 
+                    on storageInv.product_id = wboi.product_id 
+                  and storageInv.domain_id = wboi.domain_id 
+                  and storageInv.bizplace_id = wboi.bizplace_id 
+                  and storageInv.packing_type = wboi.packing_type 
+                  and storageInv.packing_size = wboi.packing_size 
+                  and storageInv.uom = wboi.uom
+                  left join (
+                    select i.product_id, i.domain_id, i.bizplace_id, i.packing_type, i.packing_size, i.uom, i.lock_inventory 
+                    from inventories i 
+                    where i.domain_id = $1  
+                      and i.bizplace_id = $2
+                      and i.product_id = $3 
+                      and i.packing_type = $4 
+                      and i.packing_size = $5 
+                      and i.uom = $6 
+                      and i.status = 'STORED'
+                    group by i.product_id, i.domain_id, i.bizplace_id, i.packing_type, i.packing_size, i.uom, i.lock_inventory
+                  ) lockInv 
+                    on lockInv.product_id = wboi.product_id 
+                  and lockInv.domain_id = wboi.domain_id 
+                  and lockInv.bizplace_id = wboi.bizplace_id 
+                  and lockInv.packing_type = wboi.packing_type 
+                  and lockInv.packing_size = wboi.packing_size 
+                  and lockInv.uom = wboi.uom 
+                  where wboi.domain_id = $1 
+                    and wboi.bizplace_id = $2 
+                    and wboi.group_type = 'SINGLE' 
+                    and wboi.product_id = $3 
+                    and wboi.packing_type = $4 
+                    and wboi.packing_size = $5 
+                    and wboi.uom = $6 
+                    and lockInv.lock_inventory is not true 
+                    and (wboi.remain_qty - wboi.transfer_qty - coalesce(storageInv.storage_qty, 0)) >= $7 
+                    and (wboi.remain_uom_value - wboi.transfer_uom_value - coalesce(storageInv.storage_uom_value, 0)) >= $8
+                `, [
+                            domain.id,
+                            customerBizplace.id,
+                            item.product.id,
+                            item.packingType,
+                            item.packingSize,
+                            item.uom,
+                            item.releaseQty,
+                            item.releaseUomValue
+                        ]);
+                        if (itemList.length <= 0) {
+                            throw new error_util_1.ApiError('E01', 'INSUFFICIENT_STOCK');
+                        }
+                        console.log();
+                    }
+                }));
+            }
+            // inv with batchId and assignment enabled: validate availability by batch before creating order
+            if (!invWithoutBatchId && (worksheetPickingAssignment === null || worksheetPickingAssignment === void 0 ? void 0 : worksheetPickingAssignment.value) === 'true') {
+                await Promise.all(massagedData.combinedItems.map(async (item) => {
+                    var _a;
+                    const batchId = (item === null || item === void 0 ? void 0 : item.batchId) && item.batchId !== '-' ? String(item.batchId).trim() : null;
+                    if (!batchId)
+                        return;
+                    const warehouseName = (item === null || item === void 0 ? void 0 : item.warehouseCode) ? String(item.warehouseCode).trim() : null;
+                    const rows = await tx.query(`
+                select
+                  coalesce(sum(
+                    case when (iv.qty - greatest(coalesce(iv.locked_qty,0),0) - greatest(coalesce(pds.unassigned_qty,0),0)) < 0
+                         then 0
+                         else (iv.qty - greatest(coalesce(iv.locked_qty,0),0) - greatest(coalesce(pds.unassigned_qty,0),0))
+                    end
+                  ), 0) as total_available_qty
+                from inventories iv
+                left join product_detail_stocks pds on pds.product_detail_id = iv.product_detail_id
+                inner join locations loc on loc.id = iv.location_id
+                inner join warehouses w on w.id = loc.warehouse_id
+                inner join products p on p.id = iv.product_id
+                where iv.domain_id = $1
+                  and iv.bizplace_id = $2
+                  and iv.product_id = $3
+                  and iv.packing_type = $4
+                  and iv.packing_size = $5
+                  and iv.uom = $6
+                  and iv.status = 'STORED'
+                  and loc.type not in ('QUARANTINE','RESERVE','DAMAGE','STORAGE')
+                  and iv.obsolete = false
+                  and (case when iv.expiration_date is not null and p.min_outbound_shelf_life is not null then CURRENT_DATE < iv.expiration_date - p.min_outbound_shelf_life else true end)
+                  and iv.batch_id = $7
+                  and ( $8::text is null or w.name = $8::text )
+              `, [
                         domain.id,
                         customerBizplace.id,
                         item.product.id,
                         item.packingType,
                         item.packingSize,
                         item.uom,
-                        item.releaseQty,
-                        item.releaseUomValue
+                        batchId,
+                        warehouseName
                     ]);
-                    if (itemList.length <= 0) {
+                    const totalQty = parseFloat(((_a = rows === null || rows === void 0 ? void 0 : rows[0]) === null || _a === void 0 ? void 0 : _a.total_available_qty) || '0');
+                    let reqQty = item.releaseQty;
+                    // normalize comparison for decimal vs non-decimal products
+                    if (!item.product.isInventoryDecimal) {
+                        reqQty = Math.round(reqQty);
+                    }
+                    else {
+                        reqQty = Math.round(reqQty * 1000) / 1000;
+                    }
+                    if (totalQty + 1e-6 < reqQty) {
                         throw new error_util_1.ApiError('E01', 'INSUFFICIENT_STOCK');
                     }
-                    console.log();
                 }));
             }
             // assignment
@@ -495,9 +656,14 @@ async function createReleaseGood(releaseGood, orderProducts, bizplace, context,
     let resultReleaseGood = await tx.getRepository(sales_base_1.ReleaseGood).save(newReleaseGood);
     let combinedOrderInventories = [];
     let combinedOrderProducts = [];
-    let savedOrderProducts = await Promise.all(orderProducts.map(async (orderProduct) => {
+    await Promise.all(orderProducts.map(async (orderProduct) => {
+        var _a;
         let orderInventories = orderProduct.orderInventories;
-        orderProduct = Object.assign(new sales_base_1.OrderProduct(), Object.assign(Object.assign({}, orderProduct), { name: (0, uuid_1.v4)(), domain: domain, bizplace: bizplace, releaseGood: resultReleaseGood, type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS, status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED }));
+        orderProduct = Object.assign(new sales_base_1.OrderProduct(), Object.assign(Object.assign({}, orderProduct), { name: (0, uuid_1.v4)(), domain: domain, bizplace: bizplace, releaseGood: resultReleaseGood, type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS, status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, 
+            // ensure batchId is persisted on order product even when assignment is enabled
+            batchId: (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.batchId) !== undefined && (orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.batchId) !== null
+                ? orderProduct.batchId
+                : ((_a = orderInventories === null || orderInventories === void 0 ? void 0 : orderInventories[0]) === null || _a === void 0 ? void 0 : _a.batchId) || '' }));
         let newOrderProduct = await tx.getRepository(sales_base_1.OrderProduct).save(orderProduct);
         combinedOrderProducts.push({
             product: { name: orderProduct.product.name, sku: orderProduct.product.sku },
@@ -505,6 +671,7 @@ async function createReleaseGood(releaseGood, orderProducts, bizplace, context,
             packingSize: orderProduct.packingSize,
             releaseQty: orderProduct.releaseQty,
             releaseUomValue: orderProduct.releaseUomValue,
+            warehouseCode: orderProduct.warehouseCode,
             refItemId: orderProduct.refItemId
         });
         if ((worksheetPickingAssignment === null || worksheetPickingAssignment === void 0 ? void 0 : worksheetPickingAssignment.value) !== 'true') {
@@ -517,7 +684,8 @@ async function createReleaseGood(releaseGood, orderProducts, bizplace, context,
                     packingType: orderInventory.packingType,
                     packingSize: orderInventory.packingSize,
                     releaseQty: orderInventory.releaseQty,
-                    releaseUomValue: orderInventory.releaseUomValue
+                    releaseUomValue: orderInventory.releaseUomValue,
+                    warehouseCode: orderInventory.warehouseCode
                 });
             }
         }
@@ -538,19 +706,21 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     inputOrderProducts = await inputOrderProducts.reduce(async (accPromise, itm, idx) => {
         const acc = await accPromise;
         let { sku, refCode } = itm.product;
-        let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount, uom, refItemId } = itm;
+        let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount, uom, refItemId, warehouseCode } = itm;
         if (!sku && !refCode) {
             throw new error_util_1.ApiError('E01', 'sku or refCode not found');
         }
         if (releaseQty <= 0) {
             throw new error_util_1.ApiError('E01', 'negative stock request');
         }
-        let existingIndex = acc.findIndex(itm => (itm === null || itm === void 0 ? void 0 : itm.sku) == (sku === null || sku === void 0 ? void 0 : sku.trim()) &&
-            (itm === null || itm === void 0 ? void 0 : itm.refCode) == (refCode === null || refCode === void 0 ? void 0 : refCode.trim()) &&
-            (itm === null || itm === void 0 ? void 0 : itm.packingType) == (packingType === null || packingType === void 0 ? void 0 : packingType.trim()) &&
-            (itm === null || itm === void 0 ? void 0 : itm.packingSize) == packingSize &&
-            (itm === null || itm === void 0 ? void 0 : itm.uom) == uom &&
-            (itm === null || itm === void 0 ? void 0 : itm.batchId) == ((batchId === null || batchId === void 0 ? void 0 : batchId.trim()) || ''));
+        const normalizedWarehouseCode = warehouseCode ? String(warehouseCode).trim() : '';
+        let existingIndex = acc.findIndex(it => (it === null || it === void 0 ? void 0 : it.sku) == (sku === null || sku === void 0 ? void 0 : sku.trim()) &&
+            (it === null || it === void 0 ? void 0 : it.refCode) == (refCode === null || refCode === void 0 ? void 0 : refCode.trim()) &&
+            (it === null || it === void 0 ? void 0 : it.packingType) == (packingType === null || packingType === void 0 ? void 0 : packingType.trim()) &&
+            (it === null || it === void 0 ? void 0 : it.packingSize) == packingSize &&
+            (it === null || it === void 0 ? void 0 : it.uom) == uom &&
+            (it === null || it === void 0 ? void 0 : it.batchId) == ((batchId === null || batchId === void 0 ? void 0 : batchId.trim()) || '') &&
+            (it === null || it === void 0 ? void 0 : it.warehouseCode) == normalizedWarehouseCode);
         if (existingIndex >= 0 && releaseQty > 0) {
             acc[existingIndex].releaseQty = acc[existingIndex].releaseQty + releaseQty;
         }
@@ -565,7 +735,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                 paidAmount: paidAmount,
                 uom: uom,
                 batchId: (batchId === null || batchId === void 0 ? void 0 : batchId.trim()) || '',
-                refItemId: refItemId !== null && refItemId !== void 0 ? refItemId : ''
+                refItemId: refItemId !== null && refItemId !== void 0 ? refItemId : '',
+                warehouseCode: normalizedWarehouseCode
             });
         }
         return acc;
@@ -573,7 +744,6 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     //find customer sku in system
     await Promise.all(inputOrderProducts.map(async (inputOrderItem) => {
         const sku = inputOrderItem.sku;
-        const uom = inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.uom;
         const refCode = inputOrderItem.refCode;
         const packingType = inputOrderItem.packingType;
         const packingSize = inputOrderItem.packingSize;
@@ -608,10 +778,13 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                 throw new error_util_1.ApiError('E01', `releaseQty must be an integer for product ${sku || refCode}`);
             }
             let newOrderProduct = Object.assign({}, inputOrderItem);
-            newOrderProduct = Object.assign(Object.assign({}, newOrderProduct), { product: productDetail.product, productDetail: productDetail, packingType: productDetail.packingType, packingSize: packingSize || productDetail.packingSize, uom: productDetail.uom, uomValue: productDetail.uomValue, refCode: inputOrderItem.refCode, releaseQty: Math.round(inputOrderItem.releaseQty * 1000) / 1000, releaseUomValue: inputOrderItem.releaseQty * (productDetail.uomValue || 1), packQty: 0, actualPackQty: 0, palletQty: 0, actualPalletQty: 0, type: 'RELEASE_OF_GOODS', status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, batchId: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.batchId) || '' });
+            newOrderProduct = Object.assign(Object.assign({}, newOrderProduct), { product: productDetail.product, productDetail: productDetail, packingType: productDetail.packingType, packingSize: packingSize || productDetail.packingSize, uom: productDetail.uom, uomValue: productDetail.uomValue, refCode: inputOrderItem.refCode, releaseQty: Math.round(inputOrderItem.releaseQty * 1000) / 1000, releaseUomValue: inputOrderItem.releaseQty * (productDetail.uomValue || 1), packQty: 0, actualPackQty: 0, palletQty: 0, actualPalletQty: 0, type: 'RELEASE_OF_GOODS', warehouseCode: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.warehouseCode) || null, status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, batchId: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.batchId) || '' });
             newOrderProduct.orderInventories = [
-                Object.assign(Object.assign({}, newOrderProduct), { packQty: 0, actualPackQty: 0, palletQty: 0, actualPalletQty: 0, type: 'RELEASE_OF_GOODS', status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET })
+                Object.assign(Object.assign({}, newOrderProduct), { packQty: 0, actualPackQty: 0, palletQty: 0, actualPalletQty: 0, type: 'RELEASE_OF_GOODS', warehouseCode: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.warehouseCode) || null, status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET })
             ];
+            newOrderProduct.warehouseCode = (newOrderProduct === null || newOrderProduct === void 0 ? void 0 : newOrderProduct.warehouseCode)
+                ? String(newOrderProduct.warehouseCode).trim()
+                : null;
             orderProducts.push(newOrderProduct);
         }
         if (!productDetail) {
@@ -652,6 +825,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                     actualPalletQty: 0,
                     orderInventories: [],
                     type: 'RELEASE_OF_GOODS',
+                    warehouseCode: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.warehouseCode) || null,
                     status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED,
                     batchId: ''
                 };
@@ -674,6 +848,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                             bundleProductSetting.bundleQty *
                             (productDetailBundle.uomValue <= 0 ? 1 : productDetailBundle.uomValue),
                         type: 'RELEASE_OF_GOODS',
+                        warehouseCode: (inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.warehouseCode) || null,
                         status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
                     };
                     orderProduct.orderInventories.push(newOrderInventory);
@@ -698,7 +873,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
         let oi = (op === null || op === void 0 ? void 0 : op.orderInventories) || [];
         oi.forEach(itm => {
             let { sku, refCode } = itm.product;
-            let { packingType, packingSize, batchId, releaseQty, product, productDetail, uom } = itm;
+            let { packingType, packingSize, batchId, releaseQty, product, productDetail, uom, warehouseCode } = itm;
             if (!sku && !refCode) {
                 throw new error_util_1.ApiError('E04', t('error.sku or refCode not found'));
             }
@@ -707,7 +882,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                 (itm === null || itm === void 0 ? void 0 : itm.packingType) == (packingType === null || packingType === void 0 ? void 0 : packingType.trim()) &&
                 (itm === null || itm === void 0 ? void 0 : itm.packingSize) == packingSize &&
                 (itm === null || itm === void 0 ? void 0 : itm.batchId) == (batchId === null || batchId === void 0 ? void 0 : batchId.trim()) &&
-                (itm === null || itm === void 0 ? void 0 : itm.uom) == (uom === null || uom === void 0 ? void 0 : uom.trim()));
+                (itm === null || itm === void 0 ? void 0 : itm.uom) == (uom === null || uom === void 0 ? void 0 : uom.trim()) &&
+                (itm === null || itm === void 0 ? void 0 : itm.warehouseCode) == (warehouseCode ? String(warehouseCode).trim() : warehouseCode));
             if (existingIndex >= 0 && releaseQty > 0) {
                 acc[existingIndex].releaseQty = acc[existingIndex].releaseQty + releaseQty;
                 acc[existingIndex].releaseUomValue =
@@ -727,6 +903,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                 if (refCode)
                     updateObj['refCode'] = refCode.trim();
                 updateObj['batchId'] = batchId ? batchId === null || batchId === void 0 ? void 0 : batchId.trim() : '-';
+                if (warehouseCode)
+                    updateObj['warehouseCode'] = String(warehouseCode).trim();
                 acc.push(updateObj);
             }
         });
@@ -774,7 +952,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     return { orderProducts, combinedItems };
 }
 async function assignToInventory(orderProducts, customerBizplace, context, tx, worksheetPickingAssignment) {
-    const { client, domain, user } = context.state;
+    var _a, _b;
+    const { domain, user } = context.state;
     const pickingProductSetting = await tx.getRepository(setting_base_1.Setting).findOne({
         where: { domain, name: 'rule-for-picking-product' }
     });
@@ -884,8 +1063,12 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
                 ];
                 let batchId = orderInventory[oiIdx].batchId;
                 if (batchId)
-                    params.push(batchId);
+                    params.push(String(batchId).trim());
                 params = [...params, ...queryStrings.values];
+                const warehouseNameFilter = ((_a = orderInventory[oiIdx]) === null || _a === void 0 ? void 0 : _a.warehouseCode) ? `AND w.name = $${params.length + 1}` : '';
+                if ((_b = orderInventory[oiIdx]) === null || _b === void 0 ? void 0 : _b.warehouseCode) {
+                    params.push(String(orderInventory[oiIdx].warehouseCode).trim());
+                }
                 let query = `
           update inventories tgt set locked_qty = coalesce(locked_qty,0) + src.reserve_qty, 
           locked_uom_value = coalesce(locked_uom_value,0) + src.reserve_uom_value,
@@ -920,11 +1103,13 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
                     FROM "inventories" "iv" 
                     LEFT JOIN "product_detail_stocks" "pds" ON "pds"."product_detail_id" = "iv"."product_detail_id"
                     INNER JOIN "locations" "loc" ON "loc"."id"="iv"."location_id" 
+                    INNER JOIN "warehouses" "w" ON "w"."id" = "loc"."warehouse_id"
                     INNER JOIN "products" "p" ON "p"."id"="iv"."product_id" 
                     INNER JOIN "warehouse_inventory_assignment_rankings" "wiar" ON "wiar"."location_type"="loc"."type"
                     WHERE case when coalesce("iv"."locked_qty",0) < 0 then 0 else ("iv"."qty" - coalesce("iv"."locked_qty",0)) end > 0 AND 
                      "iv"."domain_id" = $2 AND "iv"."bizplace_id" = $3 AND "iv"."packing_type" = $4 AND "iv"."packing_size" = $5 AND  "iv"."product_id" = $6 AND "iv"."status" = $7 AND "loc"."type" NOT IN ($8, $9, $10)
                      AND ${batchId ? `"iv"."batch_id" = $11` : `1=1`}
+                    ${warehouseNameFilter}
                     AND "iv"."obsolete" = false AND case when "iv"."expiration_date" is not null and "p"."min_outbound_shelf_life" is not null then CURRENT_DATE < "iv"."expiration_date" - "p"."min_outbound_shelf_life" else true end
                     ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
                     ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
@@ -948,7 +1133,7 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
                         productId: orderInventory[oiIdx].product.id || ''
                     },
                     result: updatedInventories[0] || '',
-                    location: 'add-release-order unstable assignInventory',
+                    location: 'add-release-order v1 assignInventory',
                     time: new Date()
                 });
                 let totalAssigned = updatedInventories[0].reduce((acc, inv) => {