@things-factory/operato-hub 4.3.385 → 4.3.387

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

@@ -120,7 +120,7 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
             // check existing order
             await checkExistingOrder(releaseGood, customerBizplace, bodyReq === null || bodyReq === void 0 ? void 0 : bodyReq.checkDuplicationValidation, context, tx);
             // massage data
-            massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context);
+            massagedData = await massageOrderItems(releaseGood, bodyReq.orderInventories, context); //double check this function
             // validation
             await Promise.all(massagedData.combinedItems.map(async (item) => {
                 let itemList = await tx.query(`
@@ -157,6 +157,7 @@ api_1.restfulApiRouter.post(`/${apiVersion}/warehouse/add-release-order`, middle
                 }
                 console.log();
             }));
+            // use product id 
             // assignment
             // console.time('assign')
             let assignedOrderProducts = await assignToInventory(massagedData.orderProducts, customerBizplace, context, tx, worksheetPickingAssignment);
@@ -503,7 +504,7 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
     //combine any repeated skus
     inputOrderProducts = inputOrderProducts.reduce((acc, itm, idx) => {
         let { sku, refCode } = itm.product;
-        let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount } = itm;
+        let { packingType, packingSize, batchId, releaseQty, sellingPrice, paidAmount, uom } = itm;
         if (!sku && !refCode) {
             throw new error_util_1.ApiError('E01', 'sku or refCode not found');
         }
@@ -515,7 +516,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
         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.packingSize) == packingSize &&
+            (itm === null || itm === void 0 ? void 0 : itm.uom) == uom);
         if (existingIndex >= 0 && releaseQty > 0) {
             acc[existingIndex].releaseQty = acc[existingIndex].releaseQty + releaseQty;
         }
@@ -527,7 +529,8 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                 packingSize: packingSize,
                 releaseQty: releaseQty,
                 sellingPrice: sellingPrice,
-                paidAmount: paidAmount
+                paidAmount: paidAmount,
+                uom: uom
             });
         }
         return acc;
@@ -535,6 +538,7 @@ 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;
@@ -588,25 +592,25 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
             }
             const foundProductBundle = await qb.getOne();
             if (foundProductBundle) {
-                let orderProduct;
-                // to be further enhanced
-                // let orderProduct = {
-                //   productBundle: foundProductBundle,
-                //   refCode,
-                //   packingType: foundProductBundle.packingType,
-                //   packingSize: packingSize || 1,
-                //   uom: inputOrderItem?.uom,
-                //   releaseQty: inputOrderItem.releaseQty,
-                //   releaseUomValue: inputOrderItem.releaseQty,
-                //   packQty: 0,
-                //   actualPackQty: 0,
-                //   palletQty: 0,
-                //   actualPalletQty: 0,
-                //   orderInventories: [],
-                //   type: 'RELEASE_OF_GOODS',
-                //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
-                //   batchId: '-'
-                // }
+                //let orderProduct: OrderProduct
+                //to be further enhanced
+                let orderProduct = {
+                    productBundle: foundProductBundle,
+                    refCode,
+                    packingType: foundProductBundle.packingType,
+                    packingSize: packingSize || 1,
+                    uom: inputOrderItem === null || inputOrderItem === void 0 ? void 0 : inputOrderItem.uom,
+                    releaseQty: inputOrderItem.releaseQty,
+                    releaseUomValue: inputOrderItem.releaseQty,
+                    packQty: 0,
+                    actualPackQty: 0,
+                    palletQty: 0,
+                    actualPalletQty: 0,
+                    orderInventories: [],
+                    type: 'RELEASE_OF_GOODS',
+                    status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED,
+                    batchId: '-'
+                };
                 const bundleProductSettings = foundProductBundle.productBundleSettings;
                 bundleProductSettings.map(bundleProductSetting => {
                     const productDetailBundle = bundleProductSetting.productDetail;
@@ -628,11 +632,19 @@ async function massageOrderItems(releaseGood, inputOrderProducts, context) {
                         type: 'RELEASE_OF_GOODS',
                         status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET
                     };
-                    orderProduct = Object.assign(new sales_base_1.OrderProduct(), newOrderInventory);
-                    orderProduct = Object.assign(Object.assign({}, orderProduct), { refCode, packingType: foundProductBundle.packingType, packingSize: packingSize || 1, orderInventories: [], status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, batchId: '-' });
+                    // orderProduct = Object.assign(new OrderProduct(), newOrderInventory)
+                    // orderProduct = {
+                    //   ...orderProduct,
+                    //   refCode,
+                    //   packingType: foundProductBundle.packingType,
+                    //   packingSize: packingSize || 1,
+                    //   orderInventories: [],
+                    //   status: ORDER_PRODUCT_STATUS.ASSIGNED,
+                    //   batchId: '-'
+                    // }
                     orderProduct.orderInventories.push(newOrderInventory);
-                    orderProducts.push(orderProduct);
                 });
+                orderProducts.push(orderProduct);
             }
             else {
                 if (sku && refCode) {
@@ -696,191 +708,195 @@ async function assignToInventory(orderProducts, customerBizplace, context, tx, w
     for (let opIdx = 0; opIdx < orderProducts.length; opIdx++) {
         let orderProduct = orderProducts[opIdx];
         let assignedOrderInventories = [];
-        const orderInventory = orderProduct.orderInventories[0];
+        const orderInventory = orderProduct.orderInventories;
+        let productBundle = orderProduct === null || orderProduct === void 0 ? void 0 : orderProduct.productBundle;
         let sortings = [];
-        if ((worksheetPickingAssignment === null || worksheetPickingAssignment === void 0 ? void 0 : worksheetPickingAssignment.value) !== 'true') {
-            switch (orderInventory.product.pickingStrategy) {
-                case 'LIFO':
-                    sortings.push({ name: 'iv.created_at', desc: true });
-                    if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
-                        for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-                            sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+        for (let oiIdx = 0; oiIdx < orderInventory.length; oiIdx++) {
+            if ((worksheetPickingAssignment === null || worksheetPickingAssignment === void 0 ? void 0 : worksheetPickingAssignment.value) !== 'true') {
+                switch (orderInventory[oiIdx].product.pickingStrategy) {
+                    case 'LIFO':
+                        sortings.push({ name: 'iv.created_at', desc: true });
+                        if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
+                            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                            }
                         }
-                    }
-                    else {
-                        sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
-                    }
-                    break;
-                case 'FEFO':
-                    sortings.push({ name: 'iv.expiration_date', desc: false }, { name: 'iv.created_at', desc: false });
-                    if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
-                        for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-                            sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                        else {
+                            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
                         }
-                    }
-                    else {
-                        sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
-                    }
-                    break;
-                case 'FMFO':
-                    sortings.push({ name: 'iv.manufacture_date', desc: false }, { name: 'iv.created_at', desc: false });
-                    if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
-                        for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-                            sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                        break;
+                    case 'FEFO':
+                        sortings.push({ name: 'iv.expiration_date', desc: false }, { name: 'iv.created_at', desc: false });
+                        if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
+                            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                            }
                         }
-                    }
-                    else {
-                        sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
-                    }
-                    break;
-                case 'LOCATION':
-                    if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
-                        for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-                            sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                        else {
+                            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
                         }
-                    }
-                    else {
-                        sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
-                    }
-                    break;
-                //Every other case includes 'FIFO' will be applicable for this case
-                default:
-                    sortings.push({ name: 'iv.created_at', desc: false });
-                    if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
-                        for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
-                            sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                        break;
+                    case 'FMFO':
+                        sortings.push({ name: 'iv.manufacture_date', desc: false }, { name: 'iv.created_at', desc: false });
+                        if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
+                            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                            }
+                        }
+                        else {
+                            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
+                        }
+                        break;
+                    case 'LOCATION':
+                        if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
+                            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                            }
+                        }
+                        else {
+                            sortings.push({ name: 'loc.name', desc: false }, { name: 'iv.created_at', desc: false });
                         }
-                    }
-                    else {
-                        sortings.push({ name: 'loc.name', desc: false });
-                        sortings.push({ name: 'iv.pallet_id', desc: false });
-                    }
-                    break;
-            }
-            let queryFilters = [];
-            let queryStrings = queryFilters.reduce((acc, itm, idx, arr) => {
-                acc.values.push(itm.filters);
-                switch (itm === null || itm === void 0 ? void 0 : itm.operator) {
-                    case 'notin':
-                    case 'in':
-                        acc.query.push(`${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filtes
-                            .map((itm, idx) => {
-                            return `$${acc.values.length + 1}`;
-                        })
-                            .join(',')})`);
                         break;
+                    //Every other case includes 'FIFO' will be applicable for this case
                     default:
-                        acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
+                        sortings.push({ name: 'iv.created_at', desc: false });
+                        if (pickingProductSetting === null || pickingProductSetting === void 0 ? void 0 : pickingProductSetting.value) {
+                            for (const [key, value] of Object.entries(JSON.parse(pickingProductSetting.value))) {
+                                sortings.push({ name: `loc.${key}`, desc: value == 'DESC' ? true : false });
+                            }
+                        }
+                        else {
+                            sortings.push({ name: 'loc.name', desc: false });
+                            sortings.push({ name: 'iv.pallet_id', desc: false });
+                        }
                         break;
                 }
-                acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
-            }, {
-                query: [],
-                values: []
-            });
-            let sortQuery = sortings
-                .map(itm => {
-                return `${itm.name} ${itm.desc ? 'DESC' : 'ASC'}`;
-            })
-                .join(`,`);
-            let updatedInventories = await tx.getRepository(warehouse_base_1.Inventory).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,
-        updated_at = NOW(),
-        updater_id = $1
-        from (
-          select "id", "pallet_id","carton_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year",
-          "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (	
-            select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at", 
-            "release_qty", "release_uom_value", lock_amount, 
-            case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
-            from (
-              select *,
-              (
-                case when (qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0)) < 0 then 0
-                else qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0) end
-              ) as available_qty,
-              sum(qty - locked_qty - release_qty - unassigned_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
+                let queryFilters = [];
+                let queryStrings = queryFilters.reduce((acc, itm, idx, arr) => {
+                    acc.values.push(itm.filters);
+                    switch (itm === null || itm === void 0 ? void 0 : itm.operator) {
+                        case 'notin':
+                        case 'in':
+                            acc.query.push(`${itm.query} ${itm.operator == 'notin' ? 'NOT IN' : 'IN'} (${itm.filtes
+                                .map((itm, idx) => {
+                                return `$${acc.values.length + 1}`;
+                            })
+                                .join(',')})`);
+                            break;
+                        default:
+                            acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
+                            break;
+                    }
+                    acc.query.push(`${itm.query} ${(itm === null || itm === void 0 ? void 0 : itm.operator) ? itm.operator : '='} $${acc.values.length + 1}`);
+                }, {
+                    query: [],
+                    values: []
+                });
+                let sortQuery = sortings
+                    .map(itm => {
+                    return `${itm.name} ${itm.desc ? 'DESC' : 'ASC'}`;
+                })
+                    .join(`,`);
+                let updatedInventories = await tx.getRepository(warehouse_base_1.Inventory).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,
+          updated_at = NOW(),
+          updater_id = $1
+          from (
+            select "id", "pallet_id","carton_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year",
+            "reserve_qty", (("uom_value"/"qty") * "reserve_qty") as "reserve_uom_value" from (	
+              select "sort_seq", "id", "pallet_id", "batch_id", "batch_id_ref", "unit", "uom", "packing_type", "packing_size", "manufacture_year", "carton_id", "uom_value", "locked_uom_value", "qty", "locked_qty", "created_at", 
+              "release_qty", "release_uom_value", lock_amount, 
+              case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end as "reserve_qty"
               from (
-                SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
-                null as unit, '${orderInventory.uom}' as uom, '${orderInventory.packingType}' as packing_type, '${orderInventory.packingSize}' as packing_size,
-                null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, 0 as unassigned_uom_value, 0 as unassigned_qty, null as created_at,
-                '${orderInventory.releaseQty}' as release_qty, '${orderInventory.releaseUomValue}' as release_uom_value
-                UNION
+                select *,
                 (
-                  SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}) as sort_seq, 
-                  iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
-                  iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
-                  iv.manufacture_year, iv.carton_id, iv.uom_value, 
-                  coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, greatest(coalesce(iv.locked_qty,0),0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, greatest(coalesce(pds.unassigned_qty,0),0) as unassigned_qty, 
-                  iv.created_at, 0 as release_qty, 0 as release_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 "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 "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 : ''}
-                )
-              ) dt1
-            ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
-          ) dt3 where sort_seq > 0
-        ) src where src.id = tgt.id
-        returning 
-          tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit", 
-          tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year", 
-          tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`, [
-                user.id,
-                domain.id,
-                customerBizplace.id,
-                orderInventory.packingType,
-                orderInventory.packingSize,
-                orderInventory.product.id,
-                warehouse_base_1.INVENTORY_STATUS.STORED,
-                warehouse_base_1.LOCATION_TYPE.QUARANTINE,
-                warehouse_base_1.LOCATION_TYPE.RESERVE,
-                warehouse_base_1.LOCATION_TYPE.STORAGE,
-                ...queryStrings.values
-            ]);
-            console.log({
-                params: {
-                    user: user.id || '',
-                    domain: domain.id || '',
-                    bizplace: customerBizplace.id || '',
-                    packingType: orderInventory.packingType || '',
-                    packingSize: orderInventory.packingSize || '',
-                    productId: orderInventory.product.id || ''
-                },
-                result: updatedInventories[0] || '',
-                location: 'add-release-order unstable assignInventory',
-                time: new Date()
-            });
-            let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
-                return acc + inv.reserve_qty;
-            }, 0);
-            if (orderProduct.releaseQty != totalAssigned) {
-                throw new error_util_1.ApiError('E01', 'INSUFFICIENT_STOCK');
+                  case when (qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0)) < 0 then 0
+                  else qty - greatest(locked_qty, 0) - greatest(unassigned_qty, 0) end
+                ) as available_qty,
+                sum(qty - locked_qty - release_qty - unassigned_qty) over (order by sort_seq asc rows between unbounded preceding and current row) as lock_amount
+                from (
+                  SELECT 0 as sort_seq, null as id, null as pallet_id, null as batch_id, null as batch_id_ref, 
+                  null as unit, '${orderInventory[oiIdx].uom}' as uom, '${orderInventory[oiIdx].packingType}' as packing_type, '${orderInventory[oiIdx].packingSize}' as packing_size,
+                  null as manufacture_year, null as carton_id, 0 as uom_value, 0 as locked_uom_value, 0 as qty, 0 as locked_qty, 0 as unassigned_uom_value, 0 as unassigned_qty, null as created_at,
+                  '${orderInventory[oiIdx].releaseQty}' as release_qty, '${orderInventory[oiIdx].releaseUomValue}' as release_uom_value
+                  UNION
+                  (
+                    SELECT ROW_NUMBER() OVER(PARTITION BY iv.domain_id ORDER BY wiar.rank ${sortQuery ? ', ' + sortQuery : ''}) as sort_seq, 
+                    iv.id, iv.pallet_id, iv.batch_id, iv.batch_id_ref, 
+                    iv.unit, iv.uom, iv.packing_type, iv.packing_size, 
+                    iv.manufacture_year, iv.carton_id, iv.uom_value, 
+                    coalesce(iv.locked_uom_value,0) as locked_uom_value, iv.qty, greatest(coalesce(iv.locked_qty,0),0) as locked_qty, coalesce(pds.unassigned_uom_value,0) as unassigned_uom_value, greatest(coalesce(pds.unassigned_qty,0),0) as unassigned_qty, 
+                    iv.created_at, 0 as release_qty, 0 as release_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 "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 "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 : ''}
+                  )
+                ) dt1
+              ) dt2 where case when "lock_amount" < 0 then "available_qty" else "available_qty" - "lock_amount" end > 0		
+            ) dt3 where sort_seq > 0
+          ) src where src.id = tgt.id
+          returning 
+            tgt."id", tgt."qty", tgt."pallet_id", tgt."carton_id", tgt."batch_id", tgt."batch_id_ref", tgt."unit", 
+            tgt."uom", tgt."packing_type", tgt."packing_size", tgt."manufacture_year", 
+            tgt."locked_qty", tgt."uom_value", tgt."locked_uom_value", src."reserve_qty", src."reserve_uom_value";`, [
+                    user.id,
+                    domain.id,
+                    customerBizplace.id,
+                    orderInventory[oiIdx].packingType,
+                    orderInventory[oiIdx].packingSize,
+                    orderInventory[oiIdx].product.id,
+                    warehouse_base_1.INVENTORY_STATUS.STORED,
+                    warehouse_base_1.LOCATION_TYPE.QUARANTINE,
+                    warehouse_base_1.LOCATION_TYPE.RESERVE,
+                    warehouse_base_1.LOCATION_TYPE.STORAGE,
+                    ...queryStrings.values
+                ]);
+                console.log({
+                    params: {
+                        user: user.id || '',
+                        domain: domain.id || '',
+                        bizplace: customerBizplace.id || '',
+                        packingType: orderInventory[oiIdx].packingType || '',
+                        packingSize: orderInventory[oiIdx].packingSize || '',
+                        productId: orderInventory[oiIdx].product.id || ''
+                    },
+                    result: updatedInventories[0] || '',
+                    location: 'add-release-order unstable assignInventory',
+                    time: new Date()
+                });
+                let totalAssigned = updatedInventories[0].reduce((acc, inv) => {
+                    return acc + inv.reserve_qty;
+                }, 0);
+                let opReleaseQty = productBundle ? orderInventory[oiIdx].releaseQty : orderProduct.releaseQty;
+                if (opReleaseQty != totalAssigned) {
+                    throw new error_util_1.ApiError('E01', 'INSUFFICIENT_STOCK');
+                }
+                updatedInventories[0].forEach(inv => {
+                    let oi = Object.assign(Object.assign({}, orderInventory[oiIdx]), { inventory: { id: inv.id }, uom: inv.uom, packingType: inv.packing_type, batchId: inv.batch_id, releaseQty: inv.reserve_qty, releaseUomValue: inv.reserve_uom_value, pickedQty: 0, packedQty: 0, type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS, status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, domain: { id: domain.id }, bizplace: { id: customerBizplace.id } });
+                    assignedOrderInventories.push(oi);
+                });
+                orderProducts[opIdx].orderInventories = assignedOrderInventories;
+            }
+            else {
+                await tx
+                    .getRepository(warehouse_base_1.ProductDetailStock)
+                    .createQueryBuilder()
+                    .update(warehouse_base_1.ProductDetailStock)
+                    .set({
+                    unassignedQty: () => `"unassigned_qty" + ${orderInventory[oiIdx].releaseQty}`,
+                    unassignedUomValue: () => `"unassigned_uom_value" + ${orderInventory[oiIdx].releaseUomValue}`
+                })
+                    .where({ productDetail: orderInventory[oiIdx].productDetail.id })
+                    .execute();
             }
-            updatedInventories[0].forEach(inv => {
-                let oi = Object.assign(Object.assign({}, orderInventory), { inventory: { id: inv.id }, uom: inv.uom, packingType: inv.packing_type, batchId: inv.batch_id, releaseQty: inv.reserve_qty, releaseUomValue: inv.reserve_uom_value, pickedQty: 0, packedQty: 0, type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS, status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_WORKSHEET, domain: { id: domain.id }, bizplace: { id: customerBizplace.id } });
-                assignedOrderInventories.push(oi);
-            });
-            orderProducts[opIdx].orderInventories = assignedOrderInventories;
-        }
-        else {
-            await tx
-                .getRepository(warehouse_base_1.ProductDetailStock)
-                .createQueryBuilder()
-                .update(warehouse_base_1.ProductDetailStock)
-                .set({
-                unassignedQty: () => `"unassigned_qty" + ${orderInventory.releaseQty}`,
-                unassignedUomValue: () => `"unassigned_uom_value" + ${orderInventory.releaseUomValue}`
-            })
-                .where({ productDetail: orderInventory.productDetail.id })
-                .execute();
         }
     }
     return orderProducts;