X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb%2Fmanufacturing_db.inc;h=bfd4070468eb004d0b5ef9ec29e82411c70cc051;hb=8a7017fb79e97afda2cd20e9ab763f57fde97df2;hp=1153010d725e78cb92f1b7592c999c6c6f7ba435;hpb=7f6811016bf33c520c105f1030055fb8bed7f551;p=fa-stable.git

diff --git a/includes/db/manufacturing_db.inc b/includes/db/manufacturing_db.inc
index 1153010d..bfd40704 100644
--- a/includes/db/manufacturing_db.inc
+++ b/includes/db/manufacturing_db.inc
@@ -12,13 +12,16 @@
 //----------------------------------------------------------------------------------------
 function get_demand_qty($stock_id, $location)
 {
-	$sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent) AS QtyDemand
-				FROM ".TB_PREF."sales_order_details,
+	$sql = "SELECT SUM(".TB_PREF."sales_order_details.quantity - "
+		.TB_PREF."sales_order_details.qty_sent) AS QtyDemand
+			FROM ".TB_PREF."sales_order_details,
 					".TB_PREF."sales_orders
-				WHERE ".TB_PREF."sales_order_details.order_no=".TB_PREF."sales_orders.order_no AND ";
+				WHERE ".TB_PREF."sales_order_details.order_no="
+				.TB_PREF."sales_orders.order_no AND ".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." AND 
+				".TB_PREF."sales_orders.trans_type=".TB_PREF."sales_order_details.trans_type AND ";
 	if ($location != "")
-		$sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
-	$sql .= TB_PREF."sales_order_details.stk_code = '$stock_id'";
+		$sql .= TB_PREF."sales_orders.from_stk_loc =".db_escape($location)." AND ";
+	$sql .= TB_PREF."sales_order_details.stk_code = ".db_escape($stock_id);
 
     $result = db_query($sql,"No transactions were returned");
 	$row = db_fetch($result);
@@ -36,9 +39,9 @@ function load_stock_levels($location)
 	$date = date2sql(Today());
 
 	$sql = "SELECT stock_id, SUM(qty) FROM ".TB_PREF."stock_moves WHERE tran_date <= '$date'";
-	if ($location != '') $sql .= " AND loc_code = '$location'";
+	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];
 	}
@@ -58,13 +61,14 @@ 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];
+	$bom = @$bom_list[$stock_id];
 	if ($bom == NULL) {
-		$sql = "SELECT parent, component, quantity FROM ".TB_PREF."bom WHERE parent = '$stock_id'";
-		if ($location != "") $sql .= " AND loc_code = '$location'";
+		$sql = "SELECT parent, component, quantity FROM "
+			.TB_PREF."bom WHERE parent = ".db_escape($stock_id);
+		if ($location != "") $sql .= " AND loc_code = ".db_escape($location);
 		$result = db_query($sql, "Could not search bom");
 		$bom = array();
 		// Even if we get no results, remember that fact 
@@ -98,12 +102,14 @@ function get_demand_asm_qty($stock_id, $location)
 				   FROM ".TB_PREF."sales_order_details,
 						".TB_PREF."sales_orders,
 						".TB_PREF."stock_master
-				   WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND ";
+				   WHERE ".TB_PREF."sales_orders.order_no = ".TB_PREF."sales_order_details.order_no AND 
+				   	".TB_PREF."sales_orders.trans_type=".ST_SALESORDER." AND 
+					".TB_PREF."sales_orders.trans_type=".TB_PREF."sales_order_details.trans_type AND ";
 	if ($location != "")
-		$sql .= TB_PREF."sales_orders.from_stk_loc ='$location' AND ";
+		$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)) {
@@ -114,12 +120,14 @@ function get_demand_asm_qty($stock_id, $location)
 
 function get_on_porder_qty($stock_id, $location)
 {
-	$sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - ".TB_PREF."purch_order_details.quantity_received) AS qoo
-		FROM ".TB_PREF."purch_order_details INNER JOIN ".TB_PREF."purch_orders ON ".TB_PREF."purch_order_details.order_no=".TB_PREF."purch_orders.order_no
-		WHERE ".TB_PREF."purch_order_details.item_code='$stock_id' ";
+	$sql = "SELECT SUM(".TB_PREF."purch_order_details.quantity_ordered - "
+		.TB_PREF."purch_order_details.quantity_received) AS qoo
+		FROM ".TB_PREF."purch_order_details INNER JOIN "
+			.TB_PREF."purch_orders ON ".TB_PREF."purch_order_details.order_no=".TB_PREF."purch_orders.order_no
+		WHERE ".TB_PREF."purch_order_details.item_code=".db_escape($stock_id)." ";
 	if ($location != "")
-		$sql .= "AND ".TB_PREF."purch_orders.into_stock_location='$location' ";
-	$sql .= "AND ".TB_PREF."purch_order_details.item_code='$stock_id'";
+		$sql .= "AND ".TB_PREF."purch_orders.into_stock_location=".db_escape($location)." ";
+	$sql .= "AND ".TB_PREF."purch_order_details.item_code=".db_escape($stock_id);
 	$qoo_result = db_query($sql,"could not receive quantity on order for item");
 
 	if (db_num_rows($qoo_result) == 1)
@@ -140,9 +148,9 @@ function get_on_worder_qty($stock_id, $location)
 		(".TB_PREF."wo_requirements.units_req-".TB_PREF."wo_requirements.units_issued)) 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.stock_id='$stock_id' ";
+		WHERE ".TB_PREF."wo_requirements.stock_id=".db_escape($stock_id)." ";
 	if ($location != "")
-		$sql .= "AND ".TB_PREF."wo_requirements.loc_code='$location' ";
+		$sql .= "AND ".TB_PREF."wo_requirements.loc_code=".db_escape($location)." ";
 	$sql .= "AND ".TB_PREF."workorders.released=1";
 	$qoo_result = db_query($sql,"could not receive quantity on order for item");
 	if (db_num_rows($qoo_result) == 1)
@@ -153,13 +161,13 @@ 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 
-			WHERE ".TB_PREF."workorders.stock_id='$stock_id' ";
+			WHERE ".TB_PREF."workorders.stock_id=".db_escape($stock_id)." ";
 		if ($location != "")	
-			$sql .= "AND ".TB_PREF."workorders.loc_code='$location' ";
+			$sql .= "AND ".TB_PREF."workorders.loc_code=".db_escape($location)." ";
 		$sql .= "AND ".TB_PREF."workorders.released=1";
 		$qoo_result = db_query($sql,"could not receive quantity on order for item");
 		if (db_num_rows($qoo_result) == 1)
@@ -173,7 +181,8 @@ function get_on_worder_qty($stock_id, $location)
 
 function get_mb_flag($stock_id)
 {
-	$sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = '" . $stock_id . "'";
+	$sql = "SELECT mb_flag FROM ".TB_PREF."stock_master WHERE stock_id = "
+		.db_escape($stock_id);
 	$result = db_query($sql, "retreive mb_flag from item");
 	
 	if (db_num_rows($result) == 0)
@@ -185,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, 
@@ -192,7 +230,7 @@ function get_bom($item)
     	".TB_PREF."stock_master.material_cost+ ".TB_PREF."stock_master.labour_cost+".TB_PREF."stock_master.overhead_cost AS standard_cost, units, 
     	".TB_PREF."bom.quantity * (".TB_PREF."stock_master.material_cost+ ".TB_PREF."stock_master.labour_cost+ ".TB_PREF."stock_master.overhead_cost) AS ComponentCost 
     	FROM (".TB_PREF."workcentres, ".TB_PREF."locations, ".TB_PREF."bom) INNER JOIN ".TB_PREF."stock_master ON ".TB_PREF."bom.component = ".TB_PREF."stock_master.stock_id 
-    	WHERE ".TB_PREF."bom.parent = '" . $item . "'
+    	WHERE ".TB_PREF."bom.parent = ".db_escape($item)."
 		AND ".TB_PREF."workcentres.id=".TB_PREF."bom.workcentre_added
 		AND ".TB_PREF."bom.loc_code = ".TB_PREF."locations.loc_code ORDER BY ".TB_PREF."bom.id";
 	
@@ -201,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);
@@ -210,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
+
 ?>