@things-factory/operato-hub 4.3.698 → 4.3.700

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

@@ -44,6 +44,22 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
                 where: { id: customerBizplaceId },
                 relations: ['domain']
             });
+            // optional override: release shelf life from ContactPoint
+            const contactPointId = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.contactPointId;
+            let releaseShelfLifeOverride = null;
+            let deliverToContactPoint = null;
+            if (contactPointId) {
+                const contactPoint = await tx
+                    .getRepository(biz_base_1.ContactPoint)
+                    .findOne({ where: { id: contactPointId } });
+                if (!contactPoint) {
+                    throw new error_util_1.ApiError('E04', 'contactPoint not found');
+                }
+                if ((contactPoint === null || contactPoint === void 0 ? void 0 : contactPoint.releaseShelfLife) != null && contactPoint.releaseShelfLife !== 0) {
+                    releaseShelfLifeOverride = contactPoint.releaseShelfLife;
+                }
+                deliverToContactPoint = contactPoint;
+            }
             const worksheetPickingAssignment = await tx.getRepository(setting_base_1.Setting).findOne({
                 where: { domain, category: 'id-rule', name: 'enable-worksheet-picking-activation-assignment' }
             });
@@ -62,7 +78,12 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
                     salesType: ((_e = bodyReq.xilnexSetting) === null || _e === void 0 ? void 0 : _e.salesType) || ''
                 });
             }
-            let newPhone1 = ((_f = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _f === void 0 ? void 0 : _f.phone1) ? bodyReq.deliverTo.phone1.replace(/\D/g, '') : null;
+            // derive phone values: prefer contact point when provided, else use body
+            let newPhone1 = (deliverToContactPoint === null || deliverToContactPoint === void 0 ? void 0 : deliverToContactPoint.phone)
+                ? String(deliverToContactPoint.phone).replace(/\D/g, '')
+                : ((_f = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _f === void 0 ? void 0 : _f.phone1)
+                    ? bodyReq.deliverTo.phone1.replace(/\D/g, '')
+                    : null;
             let newPhone2 = ((_g = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _g === void 0 ? void 0 : _g.phone2) ? bodyReq.deliverTo.phone2.replace(/\D/g, '') : null;
             releaseGood = {
                 domain,
@@ -82,23 +103,36 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
                 type: bodyReq.type,
                 marketplaceOrderStatus: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.marketplaceOrderStatus,
                 remark: (bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.remark) || null,
-                billingAddress: ((_h = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.billTo) === null || _h === void 0 ? void 0 : _h.billingAddress) || null,
-                deliveryAddress1: ((_j = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _j === void 0 ? void 0 : _j.deliveryAddress1) || null,
-                deliveryAddress2: ((_k = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _k === void 0 ? void 0 : _k.deliveryAddress2) || null,
+                // when contactPoint exists, override target fields from contactPoint, else use request body
+                billingAddress: deliverToContactPoint
+                    ? deliverToContactPoint.billingAddress || null
+                    : ((_h = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.billTo) === null || _h === void 0 ? void 0 : _h.billingAddress) || null,
+                deliveryAddress1: deliverToContactPoint
+                    ? deliverToContactPoint.address || null
+                    : ((_j = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _j === void 0 ? void 0 : _j.deliveryAddress1) || null,
+                deliveryAddress2: deliverToContactPoint
+                    ? deliverToContactPoint.address2 || null
+                    : ((_k = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _k === void 0 ? void 0 : _k.deliveryAddress2) || null,
                 deliveryAddress3: ((_l = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _l === void 0 ? void 0 : _l.deliveryAddress3) || null,
                 deliveryAddress4: ((_m = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _m === void 0 ? void 0 : _m.deliveryAddress4) || null,
                 deliveryAddress5: ((_o = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _o === void 0 ? void 0 : _o.deliveryAddress5) || null,
-                attentionTo: ((_p = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _p === void 0 ? void 0 : _p.attentionTo) || null,
-                attentionCompany: ((_q = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _q === void 0 ? void 0 : _q.attentionCompany) || null,
-                city: ((_r = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _r === void 0 ? void 0 : _r.city) || null,
+                attentionTo: deliverToContactPoint
+                    ? deliverToContactPoint.name || null
+                    : ((_p = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _p === void 0 ? void 0 : _p.attentionTo) || null,
+                attentionCompany: deliverToContactPoint
+                    ? deliverToContactPoint.companyName || null
+                    : ((_q = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _q === void 0 ? void 0 : _q.attentionCompany) || null,
+                city: deliverToContactPoint ? deliverToContactPoint.city || null : ((_r = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _r === void 0 ? void 0 : _r.city) || null,
                 ward: (_s = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _s === void 0 ? void 0 : _s.ward,
-                district: (_t = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _t === void 0 ? void 0 : _t.district,
-                state: ((_u = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _u === void 0 ? void 0 : _u.state) || null,
-                postalCode: ((_v = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _v === void 0 ? void 0 : _v.postalCode) || null,
-                country: ((_w = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _w === void 0 ? void 0 : _w.country) || null,
+                district: deliverToContactPoint ? null : (_t = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _t === void 0 ? void 0 : _t.district,
+                state: deliverToContactPoint ? deliverToContactPoint.state || null : ((_u = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _u === void 0 ? void 0 : _u.state) || null,
+                postalCode: deliverToContactPoint
+                    ? deliverToContactPoint.postCode || null
+                    : ((_v = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _v === void 0 ? void 0 : _v.postalCode) || null,
+                country: deliverToContactPoint ? null : ((_w = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _w === void 0 ? void 0 : _w.country) || null,
                 phone1: newPhone1,
                 phone2: newPhone2,
-                email: ((_x = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _x === void 0 ? void 0 : _x.email) || null,
+                email: deliverToContactPoint ? deliverToContactPoint.email || null : ((_x = bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.deliverTo) === null || _x === void 0 ? void 0 : _x.email) || null,
                 transporter: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.transporter,
                 trackingNo: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.trackingNo,
                 airwayBill: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.airwayBill,
@@ -118,6 +152,7 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
                 shippingFee: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.shippingFee,
                 lmdOption: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.lmdOption,
                 priorityDelivery: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.priorityDelivery,
+                deliverTo: deliverToContactPoint || null,
                 shippingOrder: (bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.shippingOrder)
                     ? {
                         shipName: bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.shippingOrder.shipName,
@@ -169,204 +204,149 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
             // massage data
             massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context); //double check this function
             const invWithoutBatchId = batchIdStates.withoutBatchId;
+            // Helper function to build inventory availability query
+            const buildInventoryAvailabilityQuery = (item, domain, customerBizplace, options) => {
+                const { batchId, warehouseName, releaseShelfLifeOverride, requireWarehouseJoin, includeLockInventoryCheck } = options;
+                const hasWarehouse = warehouseName != null;
+                const hasBatch = batchId != null;
+                // Determine warehouse join strategy
+                const warehouseJoin = requireWarehouseJoin || hasWarehouse ? 'inner join warehouses w on w.id = loc.warehouse_id' : '';
+                // Build warehouse filter
+                let warehouseFilter = '';
+                if (requireWarehouseJoin) {
+                    // For batch queries: always join warehouses, filter optionally
+                    warehouseFilter = 'and ($8::text is null or w.name = $8::text)';
+                }
+                else if (hasWarehouse) {
+                    // For non-batch queries: only filter if warehouse is specified
+                    warehouseFilter = 'and w.name = $7';
+                }
+                // Build batch filter
+                const batchFilter = hasBatch ? 'and iv.batch_id = $7' : '';
+                // Calculate parameter indices
+                const shelfLifeParamIndex = hasBatch ? '$9' : hasWarehouse ? '$8' : '$7';
+                // Build lock inventory check
+                const lockInventoryCheck = includeLockInventoryCheck
+                    ? `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
+              )`
+                    : '';
+                const 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
+            ${warehouseJoin}
+            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 
+                       then CURRENT_DATE < iv.expiration_date - (
+                         case
+                           when ${shelfLifeParamIndex}::integer is not null and ${shelfLifeParamIndex}::integer > 0
+                             then ${shelfLifeParamIndex}::integer
+                           when p.min_outbound_shelf_life is not null
+                             then p.min_outbound_shelf_life
+                           else 0
+                         end
+                       )
+                     else true 
+                   end)
+              ${batchFilter}
+              ${warehouseFilter}
+              ${lockInventoryCheck}
+          `;
+                // Build parameters array
+                const params = [
+                    domain.id,
+                    customerBizplace.id,
+                    item.product.id,
+                    item.packingType,
+                    item.packingSize,
+                    item.uom
+                ];
+                if (hasBatch) {
+                    params.push(batchId);
+                }
+                if (requireWarehouseJoin || hasWarehouse) {
+                    params.push(warehouseName);
+                }
+                params.push(releaseShelfLifeOverride);
+                return { query, params };
+            };
+            // Helper function to validate inventory availability
+            const validateInventoryAvailability = async (item, query, params, tx) => {
+                var _a, _b;
+                const rows = await tx.query(query, params);
+                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');
+                }
+            };
             //inv without batchId will check stock in wboi
             if (invWithoutBatchId) {
                 // validation
                 await Promise.all(massagedData.combinedItems.map(async (item) => {
-                    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();
-                    }
+                    const warehouseName = item.warehouseCode ? String(item.warehouseCode).trim() : null;
+                    const { query, params } = buildInventoryAvailabilityQuery(item, domain, customerBizplace, {
+                        warehouseName,
+                        releaseShelfLifeOverride,
+                        requireWarehouseJoin: false,
+                        includeLockInventoryCheck: true
+                    });
+                    await validateInventoryAvailability(item, query, params, tx);
                 }));
             }
             // 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,
+                    const { query, params } = buildInventoryAvailabilityQuery(item, domain, customerBizplace, {
                         batchId,
-                        warehouseName
-                    ]);
-                    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');
-                    }
+                        warehouseName,
+                        releaseShelfLifeOverride,
+                        requireWarehouseJoin: true,
+                        includeLockInventoryCheck: false
+                    });
+                    await validateInventoryAvailability(item, query, params, tx);
                 }));
             }
             // assignment
             // console.time('assign')
-            let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx, worksheetPickingAssignment);
+            let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx, worksheetPickingAssignment, releaseShelfLifeOverride);
             // console.timeEnd('assign')
             // create order
             // console.time('save')
@@ -589,6 +569,7 @@ async function createReleaseGood(releaseGood, orderProducts, bizplace, context,
             : sales_base_1.OrderNoGenerator.releaseGood(),
         domain: domain,
         bizplace: bizplace,
+        deliverTo: (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.deliverTo) || null,
         collectionOrderNo: releaseGood.collectionOrderNo,
         courierOption: courierOption,
         codOption: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.codOption,
@@ -951,7 +932,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     mapJsonData(releaseGood, orderProducts);
     return { orderProducts, combinedItems };
 }
-async function assignToInventory(orderProducts, customerBizplace, context, tx, worksheetPickingAssignment) {
+async function assignToInventory(orderProducts, customerBizplace, context, tx, worksheetPickingAssignment, releaseShelfLifeOverride) {
     var _a, _b;
     const { domain, user } = context.state;
     const pickingProductSetting = await tx.getRepository(setting_base_1.Setting).findOne({
@@ -1069,6 +1050,9 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
                 if ((_b = orderInventory[oiIdx]) === null || _b === void 0 ? void 0 : _b.warehouseCode) {
                     params.push(String(orderInventory[oiIdx].warehouseCode).trim());
                 }
+                // add release shelf life override parameter
+                const releaseShelfLifeParamIndex = params.length + 1;
+                params.push(releaseShelfLifeOverride);
                 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,
@@ -1110,7 +1094,12 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
                      "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
+                    AND "iv"."obsolete" = false AND case 
+                      when "iv"."expiration_date" is not null 
+                           and coalesce($${releaseShelfLifeParamIndex}::integer, "p"."min_outbound_shelf_life") is not null 
+                        then CURRENT_DATE < "iv"."expiration_date" - coalesce($${releaseShelfLifeParamIndex}::integer, "p"."min_outbound_shelf_life") 
+                      else true 
+                    end
                     ${queryStrings.query.length > 0 ? `AND ${queryStrings.join(' AND ')}` : ''}
                     ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}
                   )