X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=e1b0329edf34e1629ff8692b1a524c1c9ed8a12b;hb=da7df35c61205d0b1af47d286be591b8a3194b0c;hp=9f166d1ca72f0b13fe1976a58551c5b0cffdc81b;hpb=2383d33373d6ddec06906658a0ed6398077c1147;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 9f166d1c..e1b0329e 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -9,110 +9,60 @@ 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); - } - $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = '$stock_id'"; - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - $qoh = get_qoh_on_date($stock_id, null, $date_); - if ($qoh + $qty <= 0) - $material_cost = 0; - else - $material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost - WHERE stock_id='$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) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = '$stock_id'"; - $result = db_query($sql); - $myrow = db_fetch($result); - $overhead_cost = $myrow['overhead_cost']; - $qoh = get_qoh_on_date($stock_id, null, $date_); - if ($qoh + $qty <= 0) - $overhead_cost = 0; - else - $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty); - $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=$overhead_cost - WHERE stock_id='$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) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = '$stock_id'"; - $result = db_query($sql); - $myrow = db_fetch($result); - $labour_cost = $myrow['labour_cost']; - $qoh = get_qoh_on_date($stock_id, null, $date_); - if ($qoh + $qty <= 0) - $labour_cost = 0; - else - $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty); - $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=$labour_cost - WHERE stock_id='$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 = '$stock_id'"; - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - $qoh = get_qoh_on_date($stock_id, null, $date_); - if ($qoh + $qty <= 0) - $material_cost = 0; - else - $material_cost = ($qty * $costs) / ($qoh + $qty); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+$material_cost - WHERE stock_id='$stock_id'"; - db_query($sql,"The cost details for the inventory item could not be updated"); -} - +/* + 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) { - if (!($type == wo_types::advanced())) - return add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc); + global $Refs; 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); - add_material_cost($stock_id, $units_reqd, $date_); + $args->woid = 0; + hook_db_prewrite($args, ST_WORKORDER); + + 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).", $units_reqd, '$stock_id', - $type, '$date', '$required')"; + VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", " + .db_escape($units_reqd).", ".db_escape($stock_id).", + ".db_escape($type).", '$date', ".db_escape($required).")"; db_query($sql, "could not add work order"); $woid = db_insert_id(); - add_comments(systypes::work_order(), $woid, $required_by, $memo_); + add_comments(ST_WORKORDER, $woid, $required_by, $memo_); - references::save(systypes::work_order(), $woid, $wo_ref); - add_audit_trail(systypes::work_order(), $woid, $date_); + $Refs->save(ST_WORKORDER, $woid, $wo_ref); + add_audit_trail(ST_WORKORDER, $woid, $date_); + + $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(); @@ -125,42 +75,43 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, $date_, $required_by, $memo_) { begin_transaction(); - - add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_); - add_material_cost($stock_id, $units_reqd, $date_); + $args = func_get_args(); + $args = (object)array_combine(array('woid', 'loc_code', 'units_reqd', 'stock_id', + 'date_', 'required_by', 'memo_'), $args); + hook_db_prewrite($args, ST_WORKORDER); $date = date2sql($date_); $required = date2sql($required_by); $sql = "UPDATE ".TB_PREF."workorders SET loc_code=".db_escape($loc_code).", - units_reqd=$units_reqd, stock_id='$stock_id', - required_by='$required', + units_reqd=".db_escape($units_reqd).", stock_id=".db_escape($stock_id).", + required_by=".db_escape($required).", date_='$date' - WHERE id = $woid"; + WHERE id = ".db_escape($woid); db_query($sql, "could not update work order"); - update_comments(systypes::work_order(), $woid, null, $memo_); - add_audit_trail(systypes::work_order(), $woid, $date_, _("Updated.")); + update_comments(ST_WORKORDER, $woid, null, $memo_); + add_audit_trail(ST_WORKORDER, $woid, $date_, _("Updated.")); + hook_db_postwrite($args, ST_WORKORDER); commit_transaction(); } -function delete_work_order($woid) +function delete_work_order($woid, $stock_id, $qty, $date) { begin_transaction(); - - add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']); + hook_db_prevoid(ST_WORKORDER, $woid); // delete the work order requirements delete_wo_requirements($woid); // delete the actual work order - $sql = "DELETE FROM ".TB_PREF."workorders WHERE id=$woid"; + $sql = "DELETE FROM ".TB_PREF."workorders WHERE id=".db_escape($woid); db_query($sql,"The work order could not be deleted"); - delete_comments(systypes::work_order(), $woid); - add_audit_trail(systypes::work_order(), $woid, $_POST['date_'], _("Canceled.")); + delete_comments(ST_WORKORDER, $woid); + add_audit_trail(ST_WORKORDER, $woid, $date, _("Canceled.")); commit_transaction(); } @@ -169,18 +120,23 @@ function delete_work_order($woid) function get_work_order($woid, $allow_null=false) { - $sql = "SELECT ".TB_PREF."workorders.*, ".TB_PREF."stock_master.description As StockItemName, - ".TB_PREF."locations.location_name - FROM ".TB_PREF."workorders, ".TB_PREF."stock_master, ".TB_PREF."locations - WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id - AND ".TB_PREF."locations.loc_code=".TB_PREF."workorders.loc_code - AND ".TB_PREF."workorders.id=$woid - GROUP BY ".TB_PREF."workorders.id"; + $sql = "SELECT wo.*,st.description As StockItemName,l.location_name, + l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_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)." + GROUP BY wo.id"; $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); } @@ -189,7 +145,7 @@ function get_work_order($woid, $allow_null=false) function work_order_has_productions($woid) { - $sql = "SELECT COUNT(*) FROM ".TB_PREF."wo_manufacture WHERE workorder_id=$woid"; + $sql = "SELECT COUNT(*) FROM ".TB_PREF."wo_manufacture WHERE workorder_id=".db_escape($woid); $result = db_query($sql, "query work order for productions"); $myrow = db_fetch_row($result); @@ -201,7 +157,7 @@ function work_order_has_productions($woid) function work_order_has_issues($woid) { - $sql = "SELECT COUNT(*) FROM ".TB_PREF."wo_issues WHERE workorder_id=$woid"; + $sql = "SELECT COUNT(*) FROM ".TB_PREF."wo_issues WHERE workorder_id=".db_escape($woid); $result = db_query($sql, "query work order for issues"); $myrow = db_fetch_row($result); @@ -229,14 +185,14 @@ function release_work_order($woid, $releaseDate, $memo_) $date = date2sql($releaseDate); $sql = "UPDATE ".TB_PREF."workorders SET released_date='$date', - released=1 WHERE id = $woid"; + 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(systypes::work_order(), $woid, $releaseDate, $memo_); - add_audit_trail(systypes::work_order(), $woid, $releaseDate,_("Released.")); + add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_); + add_audit_trail(ST_WORKORDER, $woid, sql2date($myrow['date_']), _("Released.")); commit_transaction(); } @@ -245,7 +201,7 @@ function release_work_order($woid, $releaseDate, $memo_) function close_work_order($woid) { - $sql = "UPDATE ".TB_PREF."workorders SET closed=1 WHERE id = $woid"; + $sql = "UPDATE ".TB_PREF."workorders SET closed=1 WHERE id = ".db_escape($woid); db_query($sql, "could not close work order"); } @@ -253,53 +209,177 @@ function close_work_order($woid) function work_order_is_closed($woid) { - $sql = "SELECT closed FROM ".TB_PREF."workorders WHERE id = $woid"; + $sql = "SELECT closed FROM ".TB_PREF."workorders WHERE id = ".db_escape($woid); $result = db_query($sql, "could not query work order"); $row = db_fetch_row($result); return ($row[0] > 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, $force_close=0) { - $sql = "UPDATE ".TB_PREF."workorders SET units_issued = units_issued + $quantity, - closed = ((units_issued >= units_reqd) OR $force_close) - WHERE id = $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 } -//-------------------------------------------------------------------------------------- +function reopen_work_order($woid) +{ + // FIXME: update_material_cost +// update_material_cost($work_order['stock_id'], -$work_order['units_issued'], ... ); + + void_gl_trans(ST_WORKORDER, $woid); + + void_stock_move(ST_WORKORDER, $woid); + $sql = "UPDATE ".TB_PREF."workorders SET closed=0 WHERE id = " + .db_escape($woid); + + db_query($sql, "The work order couldn't be reopened"); +} + +//-------------------------------------------------------------------------------------- +/* + Void all work order related operations +*/ function void_work_order($woid) { + begin_transaction(); + hook_db_prevoid(ST_WORKORDER, $woid); + $work_order = get_work_order($woid); - if (!($work_order["type"] == wo_types::advanced())) + if ($work_order['closed']) + reopen_work_order($woid); + + if ($work_order['units_issued']) { - begin_transaction(); + $prods = get_work_order_productions($woid); + while ($prod = db_fetch($prods)) + void_work_order_produce($prod['id']); + } + + // void addtional material issues + $issues = get_work_order_issues($woid); + while($issue = db_fetch($issues)) + void_work_order_issue($issue['issue_no']); - $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_issued=0 WHERE id = $woid"; - db_query($sql, "The work order couldn't be voided"); + // void all related stock moves + void_stock_move(ST_WORKORDER, $woid); - // void all related stock moves - void_stock_move(systypes::work_order(), $woid); + // void any related costing records + void_wo_costing($woid); - // void any related gl trans - void_gl_trans(systypes::work_order(), $woid, true); + // clear the requirements units received + void_wo_requirements($woid); - // clear the requirements units received - void_wo_requirements($woid); + // close workorder + // FIXME: due to bug in 2.4 db scheme (conflicting wo_ref unique key) we have to fix wo_ref here: + $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0, wo_ref=CONCAT(wo_ref, ' ', '".uniqid()."') WHERE id = " + .db_escape($woid); + db_query($sql, "The work order couldn't be voided"); - commit_transaction(); + commit_transaction(); +} + +function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $order_no='', $order_ref = '', $overdue = false) +{ + $sql = "SELECT + workorder.id, + workorder.wo_ref, + workorder.type, + location.location_name, + item.description, + workorder.units_reqd, + workorder.units_issued, + workorder.date_, + workorder.required_by, + workorder.released_date, + workorder.closed, + workorder.released, + workorder.stock_id, + unit.decimals + FROM ".TB_PREF."workorders as workorder," + .TB_PREF."stock_master as item," + .TB_PREF."item_units as unit," + .TB_PREF."locations as location + WHERE workorder.stock_id=item.stock_id + AND workorder.loc_code=location.loc_code + AND item.units=unit.abbr"; + + if (check_value('OpenOnly') || $outstanding_only != 0) + { + $sql .= " AND workorder.closed=0"; } - else + + if ($location != ALL_TEXT) { - // void everything inside the work order : issues, productions, payments + $sql .= " AND workorder.loc_code=".db_escape($location); } + + if ($order_no != '') + { + $sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%'); + } + + if ($order_ref != '') + { + $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%'); + } + + 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($stock_id) +{ + $sql = "SELECT + bom.parent, + workcentre.name As WorkCentreName, + location.location_name, + bom.quantity, + parent.description + FROM ".TB_PREF."bom as bom, " + .TB_PREF."stock_master as parent, " + .TB_PREF."workcentres as workcentre, " + .TB_PREF."locations as location + WHERE bom.parent = parent.stock_id + AND bom.workcentre_added = workcentre.id + AND bom.loc_code = location.loc_code + AND bom.component=".db_escape($stock_id); + return $sql; +} //-------------------------------------------------------------------------------------- +function get_gl_wo_cost($woid, $cost_type) +{ + $cost = 0; + $result = get_gl_wo_cost_trans($woid, $cost_type); + while ($row = db_fetch($result)) + $cost += -$row['amount']; + return $cost; +} -?> \ No newline at end of file