X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=3ed8126da9e2e80b703aa6546655de289dad7e48;hb=17b390efcf904072b02ec866b2a427490471a260;hp=e39d334c8ba38177d7aae9a4cb7b84e46661a7af;hpb=49fa30e88e27b311edaca3ae3789d62e4629eb39;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index e39d334c..3ed8126d 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -9,106 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//-------------------------------------------------------------------------------------- - -function add_material_cost($stock_id, $qty, $date_) -{ - $m_cost = 0; - $result = get_bom($stock_id); - while ($bom_item = db_fetch($result)) - { - $standard_cost = get_standard_cost($bom_item['component']); - $m_cost += ($bom_item['quantity'] * $standard_cost); - } - //$dec = user_price_dec(); - //price_decimal_format($m_cost, $dec); - $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - //$qoh = get_qoh_on_date($stock_id, null, $date_); - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($qoh + $qty != 0) - $material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty); - //$material_cost = round2($material_cost, $dec); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost - WHERE stock_id=".db_escape($stock_id); - db_query($sql,"The cost details for the inventory item could not be updated"); -} - -function add_overhead_cost($stock_id, $qty, $date_, $costs) -{ - //$dec = user_price_dec(); - //price_decimal_format($costs, $dec); - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $overhead_cost = $myrow['overhead_cost']; - //$qoh = get_qoh_on_date($stock_id, null, $date_); - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($qoh + $qty != 0) - $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty); - //$overhead_cost = round2($overhead_cost, $dec); - $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)." - WHERE stock_id=".db_escape($stock_id); - db_query($sql,"The cost details for the inventory item could not be updated"); -} - -function add_labour_cost($stock_id, $qty, $date_, $costs) -{ - //$dec = user_price_dec(); - //price_decimal_format($costs, $dec); - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $labour_cost = $myrow['labour_cost']; - //$qoh = get_qoh_on_date($stock_id, null, $date_); - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($qoh + $qty != 0) - $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty); - //$labour_cost = round2($labour_cost, $dec); - $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)." - WHERE stock_id=".db_escape($stock_id); - db_query($sql,"The cost details for the inventory item could not be updated"); -} - -function add_issue_cost($stock_id, $qty, $date_, $costs) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - //$dec = user_price_dec(); - //price_decimal_format($material_cost, $dec); - //$qoh = get_qoh_on_date($stock_id, null, $date_); - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($qoh + $qty != 0) - $material_cost = ($qty * $costs) / ($qoh + $qty); - //$material_cost = round2($material_cost, $dec); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+" - .db_escape($material_cost) - ." WHERE stock_id=".db_escape($stock_id); - db_query($sql,"The cost details for the inventory item could not be updated"); -} - function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { @@ -153,7 +53,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, //-------------------------------------------------------------------------------------- function update_work_order($woid, $loc_code, $units_reqd, $stock_id, - $date_, $required_by, $memo_) + $date_, $required_by, $memo_, $old_stock_id, $old_qty) { begin_transaction(); $args = func_get_args(); @@ -161,7 +61,7 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, 'date_', 'required_by', 'memo_'), $args); hook_db_prewrite($args, ST_WORKORDER); - add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_); + add_material_cost($old_stock_id, -$old_qty, $date_); add_material_cost($stock_id, $units_reqd, $date_); $date = date2sql($date_); @@ -182,12 +82,12 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, commit_transaction(); } -function delete_work_order($woid) +function delete_work_order($woid, $stock_id, $qty, $date) { begin_transaction(); hook_db_prevoid(ST_WORKORDER, $woid); - add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']); + add_material_cost($stock_id, -$qty, $date); // delete the work order requirements delete_wo_requirements($woid); @@ -197,7 +97,7 @@ function delete_work_order($woid) db_query($sql,"The work order could not be deleted"); delete_comments(ST_WORKORDER, $woid); - add_audit_trail(ST_WORKORDER, $woid, $_POST['date_'], _("Canceled.")); + add_audit_trail(ST_WORKORDER, $woid, $date, _("Canceled.")); commit_transaction(); } @@ -273,7 +173,7 @@ function release_work_order($woid, $releaseDate, $memo_) create_wo_requirements($woid, $stock_id); add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_); - add_audit_trail(ST_WORKORDER, $woid, $releaseDate,_("Released.")); + add_audit_trail(ST_WORKORDER, $woid, sql2date($myrow['date_']), _("Released.")); commit_transaction(); } @@ -334,8 +234,7 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); - // void any related gl trans - void_gl_trans(ST_WORKORDER, $woid, true); + void_wo_costing($woid); // clear the requirements units received void_wo_requirements($woid); @@ -353,7 +252,7 @@ function void_work_order($woid) // clear the production record $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id']; db_query($sql, "Cannot void a wo production"); - + void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; } $result = get_additional_issues($woid); // check the issued quantities @@ -390,8 +289,7 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); - // void any related gl trans - void_gl_trans(ST_WORKORDER, $woid, true); + void_wo_costing($wo); // clear the requirements units received void_wo_requirements($woid); @@ -399,7 +297,7 @@ function void_work_order($woid) commit_transaction(); } -function get_sql_for_work_orders($outstanding_only, $all_items) +function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $oredr_no='', $order_ref = '', $overdue = false) { $sql = "SELECT workorder.id, @@ -429,22 +327,27 @@ function get_sql_for_work_orders($outstanding_only, $all_items) $sql .= " AND workorder.closed=0"; } - if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items) + if ($location != ALL_TEXT) { - $sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']); + $sql .= " AND workorder.loc_code=".db_escape($location); } - if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") + if ($order_no != '') { - $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%'); + $sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%'); } - if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items) + if ($order_ref != '') { - $sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']); + $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%'); } - if (check_value('OverdueOnly')) + if ($stock_id != ALL_TEXT) + { + $sql .= " AND workorder.stock_id=".db_escape($stock_id); + } + + if ($overdue) { $Today = date2sql(Today()); @@ -453,7 +356,7 @@ function get_sql_for_work_orders($outstanding_only, $all_items) return $sql; } -function get_sql_for_where_used() +function get_sql_for_where_used($stock_id) { $sql = "SELECT bom.parent, @@ -468,8 +371,8 @@ function get_sql_for_where_used() WHERE bom.parent = parent.stock_id AND bom.workcentre_added = workcentre.id AND bom.loc_code = location.loc_code - AND bom.component=".db_escape($_POST['stock_id']); - return $sql; + AND bom.component=".db_escape($stock_id); + return $sql; } //-------------------------------------------------------------------------------------- function get_gl_wo_cost($woid, $cost_type) @@ -481,4 +384,3 @@ function get_gl_wo_cost($woid, $cost_type) return $cost; } -?> \ No newline at end of file