X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=94bc517089625b5fdff01c7a53263b84ce8793e3;hb=ac2fa9c17e43534e519b3d93aced2d58d6e52736;hp=24bf6e944724a28bb5e9fb8a23bc26c554c69d3e;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 24bf6e94..94bc5170 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -9,26 +9,27 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ +/* + Common entry procedure for all work order types +*/ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { global $Refs; - if (!($type == WO_ADVANCED)) - return add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc); - begin_transaction(); $args = func_get_args(); $args = (object)array_combine(array('wo_ref', 'loc_code', 'units_reqd', 'stock_id', 'type', 'date_', 'required_by', 'memo_', 'costs', 'cr_acc', 'labour', 'cr_lab_acc'), $args); + $args->woid = 0; hook_db_prewrite($args, ST_WORKORDER); - add_material_cost($stock_id, $units_reqd, $date_); + if ($type != WO_ADVANCED) + $required_by = $date_; $date = date2sql($date_); $required = date2sql($required_by); - $sql = "INSERT INTO ".TB_PREF."workorders (wo_ref, loc_code, units_reqd, stock_id, type, date_, required_by) VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", " @@ -45,6 +46,24 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $args->woid = $woid; hook_db_postwrite($args, ST_WORKORDER); + + if ($type != WO_ADVANCED) + { + $stockitem = get_item($stock_id); + release_work_order($woid, $date_, ''); + if ($costs != 0) + add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]); + + if ($labour != 0) + add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]); + + if ($type == WO_UNASSEMBLY) + $units_reqd = -$units_reqd; + + $ref = $Refs->get_next(ST_MANURECEIVE, null, $date_); + work_order_produce($woid, $ref, $units_reqd, $date_, '', true); + } + commit_transaction(); return $woid; @@ -61,9 +80,6 @@ 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($stock_id, $units_reqd, $date_); - $date = date2sql($date_); $required = date2sql($required_by); @@ -82,13 +98,11 @@ 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_']); - // delete the work order requirements delete_wo_requirements($woid); @@ -97,7 +111,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(); } @@ -107,8 +121,10 @@ function delete_work_order($woid) function get_work_order($woid, $allow_null=false) { $sql = "SELECT wo.*,st.description As StockItemName,l.location_name, - l.delivery_address,l.email, l.contact - FROM ".TB_PREF."workorders wo, ".TB_PREF."stock_master st, ".TB_PREF."locations l + l.delivery_address,l.email, l.contact, st.inventory_account, st.assembly_account + FROM ".TB_PREF."workorders wo, " + .TB_PREF."stock_master st, " + .TB_PREF."locations l WHERE st.stock_id=wo.stock_id AND l.loc_code=wo.loc_code AND wo.id=".db_escape($woid)." @@ -117,7 +133,10 @@ function get_work_order($woid, $allow_null=false) $result = db_query($sql, "The work order issues could not be retrieved"); if (!$allow_null && db_num_rows($result) == 0) + { display_db_error("Could not find work order $woid", $sql); + return false; + } return db_fetch($result); } @@ -169,7 +188,7 @@ function release_work_order($woid, $releaseDate, $memo_) released=1 WHERE id = ".db_escape($woid); db_query($sql, "could not release work order"); - // create Work Order Requirements based on the bom + // create wo_requirements records according to current BOM create_wo_requirements($woid, $stock_id); add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_); @@ -197,14 +216,24 @@ function work_order_is_closed($woid) } //-------------------------------------------------------------------------------------- - -function work_order_update_finished_quantity($woid, $quantity, $force_close=0) +/* + Update finished items quantity in work order, and close order either if all the order is produced, + or on user demand. Returns calculated unit cost on close, or null otherwise. +*/ +function work_order_update_finished_quantity($woid, $quantity, $date, $force_close=0) { - $sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + ".db_escape($quantity).", - closed = ((units_issued >= units_reqd) OR ".db_escape($force_close).") - WHERE id = ".db_escape($woid); + + $sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + ".db_escape($quantity)." + WHERE id = ".db_escape($woid). " AND !closed"; db_query($sql, "The work order issued quantity couldn't be updated"); + + $sql = "UPDATE ".TB_PREF."workorders SET closed = ((units_issued >= units_reqd) OR ".db_escape($force_close).") + WHERE id = ".db_escape($woid); + + db_query($sql, "The work order couldn't be closed"); + + return db_num_affected_rows(); // returns 1 if WO has been closed } //-------------------------------------------------------------------------------------- @@ -217,16 +246,13 @@ function void_work_order($woid) $work_order = get_work_order($woid); if (!($work_order["type"] == WO_ADVANCED)) { + // restore average product costs $date = sql2date($work_order['date_']); $qty = $work_order['units_reqd']; - add_material_cost($work_order['stock_id'], -$qty, $date); // remove avg. cost for qty - $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost - if ($cost != 0) - add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); - $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost - if ($cost != 0) - add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); + // FIXME: update_material_cost + + // close workorder $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid); db_query($sql, "The work order couldn't be voided"); @@ -234,6 +260,7 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); + // void any related costing records void_wo_costing($woid); // clear the requirements units received @@ -243,14 +270,16 @@ function void_work_order($woid) { // void everything inside the work order : issues, productions, payments $date = sql2date($work_order['date_']); - add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty + + // FIXME: update_material_cost + $result = get_work_order_productions($woid); // check the produced quantity $qty = 0; while ($row = db_fetch($result)) { $qty += $row['quantity']; // clear the production record - $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id']; + $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; @@ -260,8 +289,8 @@ function void_work_order($woid) $issue_no = 0; while ($row = db_fetch($result)) { - $std_cost = get_standard_cost($row['stock_id']); - $icost = $std_cost * $row['qty_issued']; + $unit_cost = get_unit_cost($row['stock_id']); + $icost = $unit_cost * $row['qty_issued']; $cost += $icost; if ($issue_no == 0) $issue_no = $row['issue_no']; @@ -272,16 +301,10 @@ function void_work_order($woid) } if ($issue_no != 0) void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves + if ($cost != 0) add_issue_cost($work_order['stock_id'], -$qty, $date, $cost); - $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost - if ($cost != 0) - add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); - $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost - if ($cost != 0) - add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); - $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid); db_query($sql, "The work order couldn't be voided"); @@ -289,15 +312,17 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); - void_wo_costing($wo); + // void any related bank/gl trans + void_wo_costing($woid); // clear the requirements units received void_wo_requirements($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, $order_no='', $order_ref = '', $overdue = false) { $sql = "SELECT workorder.id, @@ -327,31 +352,37 @@ 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()); $sql .= " AND workorder.required_by < '$Today' "; } + $sql .= " ORDER BY workorder.id DESC"; return $sql; } -function get_sql_for_where_used() +function get_sql_for_where_used($stock_id) { $sql = "SELECT bom.parent, @@ -366,8 +397,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) @@ -376,7 +407,6 @@ function get_gl_wo_cost($woid, $cost_type) $result = get_gl_wo_cost_trans($woid, $cost_type); while ($row = db_fetch($result)) $cost += -$row['amount']; - return $cost; + return $cost; } -?> \ No newline at end of file