Improved calculation of standard cost in advanced manufacturing even if qoh = 0.

[fa-stable.git] / includes / db / manufacturing_db.inc

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index 396fe3b138d287adca7e9a520a1cd095f52c2d78..bfd4070468eb004d0b5ef9ec29e82411c70cc051 100644 (file)
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -41,7 +41,7 @@ function load_stock_levels($location)
        $sql = "SELECT stock_id, SUM(qty) FROM ".TB_PREF."stock_moves WHERE tran_date <= '$date'";
        if ($location != '') $sql .= " AND loc_code = ".db_escape($location);
        $sql .= " GROUP BY stock_id";
-       $result = db_query($sql, "QOH calulcation failed");
+       $result = db_query($sql, "QOH calculation failed");
        while ($row = db_fetch($result)) {
                $qoh_stock[$row[0]] = $row[1];
        }
@@ -61,8 +61,8 @@ function stock_demand_manufacture($stock_id, $qty, $demand_id, $location, $level
                $qoh_stock = array();
                load_stock_levels($location);
        }
-       $stock_qty = $qoh_stock[$stock_id];
-       if ($stock_qty == NULL) $stock_qty = 0;
+       if (empty($qoh_stock[$stock_id])) $stock_qty = 0;
+       else $stock_qty = $qoh_stock[$stock_id];
        if ($qty <= $stock_qty) return $demand;
        $bom = @$bom_list[$stock_id];
        if ($bom == NULL) {
@@ -109,7 +109,7 @@ function get_demand_asm_qty($stock_id, $location)
                $sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
        $sql .= TB_PREF."sales_order_details.quantity-".TB_PREF."sales_order_details.qty_sent > 0 AND
                                   ".TB_PREF."stock_master.stock_id=".TB_PREF."sales_order_details.stk_code AND
-                                  (".TB_PREF."stock_master.mb_flag='M' OR ".TB_PREF."stock_master.mb_flag='A')
+                                  ".TB_PREF."stock_master.mb_flag='M'
                                   GROUP BY ".TB_PREF."sales_order_details.stk_code";
     $result = db_query($sql, "No transactions were returned");
        while ($row = db_fetch_row($result)) {
@@ -161,7 +161,7 @@ function get_on_worder_qty($stock_id, $location)
        else
                $qoo = 0.0;
        $flag = get_mb_flag($stock_id);
-       if ($flag == 'A' || $flag == 'M')
+       if ($flag == 'M')
        {
                $sql = "SELECT SUM((".TB_PREF."workorders.units_reqd-".TB_PREF."workorders.units_issued)) AS qoo
                        FROM ".TB_PREF."workorders 
@@ -194,6 +194,35 @@ function get_mb_flag($stock_id)
 
 //--------------------------------------------------------------------------------------
 
+function add_bom($selected_parent, $component, $workcentre_added, $loc_code, $quantity)
+{
+       $sql = "INSERT INTO ".TB_PREF."bom (parent, component, workcentre_added, loc_code, quantity)
+               VALUES (".db_escape($selected_parent).", ".db_escape($component) . ","
+               .db_escape($workcentre_added) . ", ".db_escape($loc_code) . ", "
+               . $quantity . ")";
+
+       db_query($sql,"check failed");
+}
+//--------------------------------------------------------------------------------------
+
+function update_bom($selected_parent, $selected_component, $workcentre_added, $loc_code, $quantity)
+{
+       $sql = "UPDATE ".TB_PREF."bom SET workcentre_added=".db_escape($workcentre_added)
+        . ",loc_code=".db_escape($loc_code) . ",
+               quantity= " . $quantity . "
+               WHERE parent=".db_escape($selected_parent) . "
+               AND id=".db_escape($selected_component);
+       check_db_error("Could not update this bom component", $sql);
+
+       db_query($sql,"could not update bom");
+}
+       
+function delete_bom($selected_id)
+{
+       $sql = "DELETE FROM ".TB_PREF."bom WHERE id=".db_escape($selected_id);
+       db_query($sql,"Could not delete this bom components");
+}
+
 function get_bom($item)
 {
        $sql = "SELECT ".TB_PREF."bom.*, ".TB_PREF."locations.location_name, ".TB_PREF."workcentres.name AS WorkCentreDescription, 
@@ -210,6 +239,18 @@ function get_bom($item)
 
 //--------------------------------------------------------------------------------------
 
+function get_component_from_bom($selected_id)
+{
+       $sql = "SELECT ".TB_PREF."bom.*,".TB_PREF."stock_master.description FROM "
+               .TB_PREF."bom,".TB_PREF."stock_master
+               WHERE id=".db_escape($selected_id)."
+               AND ".TB_PREF."stock_master.stock_id=".TB_PREF."bom.component";
+
+       $result = db_query($sql, "could not get bom");
+       return db_fetch($result);
+}
+//--------------------------------------------------------------------------------------
+
 function has_bom($item)
 {
     $result = get_bom($item);
@@ -219,4 +260,46 @@ function has_bom($item)
 
 //--------------------------------------------------------------------------------------
 
+function is_component_already_on_bom($component, $workcentre_added, $loc_code, $selected_parent)
+{
+       $sql = "SELECT component FROM ".TB_PREF."bom
+               WHERE parent=".db_escape($selected_parent)."
+               AND component=".db_escape($component) . "
+               AND workcentre_added=".db_escape($workcentre_added) . "
+               AND loc_code=".db_escape($loc_code);
+       $result = db_query($sql,"check failed");
+
+       return (db_num_rows($result) > 0);
+}
+
+//--------------------------------------------------------------------------------------
+
+function check_for_recursive_bom($ultimate_parent, $component_to_check)
+{
+
+       /* returns true ie 1 if the bom contains the parent part as a component
+       ie the bom is recursive otherwise false ie 0 */
+
+       $sql = "SELECT component FROM ".TB_PREF."bom WHERE parent=".db_escape($component_to_check);
+       $result = db_query($sql,"could not check recursive bom");
+
+       if ($result != 0)
+       {
+               while ($myrow = db_fetch_row($result))
+               {
+                       if ($myrow[0] == $ultimate_parent)
+                       {
+                               return 1;
+                       }
+
+                       if (check_for_recursive_bom($ultimate_parent, $myrow[0]))
+                       {
+                               return 1;
+                       }
+               } //(while loop)
+       } //end if $result is true
+
+       return 0;
+} //end of function check_for_recursive_bom
+
 ?>