From 8c83c09db95c22618519f7f0cc7a977c7cbb4068 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 18 May 2009 23:20:32 +0000 Subject: [PATCH] Added non closed work order requirements on On Order in Inventory Items Status Added mb_flag 'M' in demand checks --- CHANGELOG.txt | 7 ++++++ inventory/inquiry/stock_status.php | 33 +++++++++++++++++++++++++++- reporting/rep302.php | 2 +- reporting/rep303.php | 2 +- sales/includes/db/sales_order_db.inc | 2 +- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1d100acf..1ac3b29d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,13 @@ $ -> Affected files 18-May-2009 Joe Hunt ! Reinserted the link to GL in Work Order Inquiry. $ /manufacturing/search_work_orders.php +# Added non closed work order requirements on On Order in Inventory Items Status +$ /inventory/inquiry/stock_status.php +! Added mb_flag 'M' in demand checks +$ /sales/includes/db/sales_order_db.inc + /reporting/rep302.php + /reporting/rep303.php + 17-May-2009 Joe Hunt ! Changed service items to use cogs account instead of inventory account. diff --git a/inventory/inquiry/stock_status.php b/inventory/inquiry/stock_status.php index 9c8aff5b..c683fa95 100644 --- a/inventory/inquiry/stock_status.php +++ b/inventory/inquiry/stock_status.php @@ -98,6 +98,26 @@ while ($myrow = db_fetch($loc_details)) $demand_qty =0; } + $sql = "SELECT SUM((".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent)*".TB_PREF."bom.quantity) + AS DemAsm + FROM ".TB_PREF."sales_order_details, + ".TB_PREF."sales_orders, + ".TB_PREF."bom, + ".TB_PREF."stock_master + WHERE ".TB_PREF."sales_order_details.stk_code=".TB_PREF."bom.parent + AND ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no + AND ".TB_PREF."sales_orders.from_stk_loc ='" . $myrow["loc_code"] . "' + AND ".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 + AND ".TB_PREF."bom.component='" . $_POST['stock_id'] . "' + AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent + AND (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')"; + + $result = db_query($sql,"No transactions were returned"); + if (db_num_rows($result)==1) + { + $demand_row = db_fetch_row($result); + $demand_qty += $demand_row[0]; + } $qoh = get_qoh_on_date($_POST['stock_id'], $myrow["loc_code"]); @@ -118,7 +138,18 @@ while ($myrow = db_fetch($loc_details)) { $qoo = 0; } - + $sql = "SELECT Sum(".TB_PREF."workorders.units_reqd * ".TB_PREF."wo_requirements.units_req) AS qoo + FROM ".TB_PREF."wo_requirements INNER JOIN ".TB_PREF."workorders + ON ".TB_PREF."wo_requirements.workorder_id=".TB_PREF."workorders.id + WHERE ".TB_PREF."wo_requirements.loc_code='" . $myrow["loc_code"] . "' + AND ".TB_PREF."wo_requirements.stock_id='" . $_POST['stock_id'] . "' + AND ".TB_PREF."workorders.closed=0"; + $qoo_result = db_query($sql,"could not receive quantity on order for item"); + if (db_num_rows($qoo_result) == 1) + { + $qoo_row = db_fetch_row($qoo_result); + $qoo += $qoo_row[0]; + } label_cell($myrow["location_name"]); qty_cell($qoh, false, $dec); qty_cell($myrow["reorder_level"], false, $dec); diff --git a/reporting/rep302.php b/reporting/rep302.php index fc600e96..f2297d89 100644 --- a/reporting/rep302.php +++ b/reporting/rep302.php @@ -87,7 +87,7 @@ function getCustAsmQty($stockid, $location) $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND ".TB_PREF."bom.component='$stockid' AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND - ".TB_PREF."stock_master.mb_flag='A'"; + (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')"; $TransResult = db_query($sql,"No transactions were returned"); if (db_num_rows($TransResult) == 1) diff --git a/reporting/rep303.php b/reporting/rep303.php index f50361e5..ffeb9b81 100644 --- a/reporting/rep303.php +++ b/reporting/rep303.php @@ -86,7 +86,7 @@ function getDemandAsmQty($stockid, $location) $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND ".TB_PREF."bom.component='$stockid' AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND - ".TB_PREF."stock_master.mb_flag='A'"; + (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')"; $TransResult = db_query($sql,"No transactions were returned"); if (db_num_rows($TransResult)==1) diff --git a/sales/includes/db/sales_order_db.inc b/sales/includes/db/sales_order_db.inc index 7d650280..bbaf9706 100644 --- a/sales/includes/db/sales_order_db.inc +++ b/sales/includes/db/sales_order_db.inc @@ -38,7 +38,7 @@ function get_demand_asm_qty($stockid, $location) ".TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND ".TB_PREF."bom.component='$stockid' AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.parent AND - ".TB_PREF."stock_master.mb_flag='A'"; + (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')"; $TransResult = db_query($sql,"No transactions were returned"); if (db_num_rows($TransResult)==1) -- 2.30.2