[Web-erp-svn] SF.net SVN: web-erp:[6624] trunk

[<ex...@us...>]

Revision: 6624
          http://sourceforge.net/p/web-erp/reponame/6624
Author:   exsonqu
Date:     2014-03-21 03:49:21 +0000 (Fri, 21 Mar 2014)
Log Message:
-----------
21/03/14 Exson: Fixed that bugs in WorkOrderIssue.php that the issued non BOM materials not shown. And fixed bugs in WorkOrderStatus.php failed to retrieve item description. 

Modified Paths:
--------------
    trunk/WorkOrderIssue.php
    trunk/WorkOrderStatus.php

Modified: trunk/WorkOrderIssue.php
===================================================================
--- trunk/WorkOrderIssue.php	2014-03-20 07:51:39 UTC (rev 6623)
+++ trunk/WorkOrderIssue.php	2014-03-21 03:49:21 UTC (rev 6624)
@@ -622,7 +622,14 @@
 											stockmaster.decimalplaces,
 											autoissue",
 									$db);
+	$IssuedAlreadyResult = DB_query("SELECT stockid, SUM(-qty) as total FROM stockmoves
+										WHERE stockmoves.type=28
+										AND reference='" . $_POST['WO'] . "' GROUP BY stockid",$db);
+	while($myrow = DB_fetch_array($IssuedAlreadyResult)){
+		$IssuedMaterials[$myrow['stockid']]['description'] = $myrow['description'];
+		$IssuedMaterials[$myrow['stockid']]['total'] = $myrow['total'];
 
+	}
 	while ($RequirementsRow = DB_fetch_array($RequirmentsResult)){
 		if ($RequirementsRow['autoissue']==0){
 			echo '<tr>
@@ -633,18 +640,41 @@
 					<td class="notavailable">' . _('Auto Issue') . '</td>
 					<td class="notavailable">' .$RequirementsRow['stockid'] . ' - ' . $RequirementsRow['description']  . '</td>';
 		}
-		$IssuedAlreadyResult = DB_query("SELECT SUM(-qty) FROM stockmoves
-											WHERE stockmoves.type=28
-											AND stockid='" . $RequirementsRow['stockid'] . "'
-											AND reference='" . $_POST['WO'] . "'",
-										$db);
-		$IssuedAlreadyRow = DB_fetch_row($IssuedAlreadyResult);
+		if (isset($IssuedMaterials[$RequirementsRow['stockid']])){
+			$IssuedAlreadyRow = $IssuedMaterials[$RequirementsRow['total']];
+			unset($IssuedMaterials[$RequirementsRow['stockid']]);
+		} else {
+			$IssuedAlreadyRow = 0;
+		}
 
 		echo '<td class="number">' . locale_number_format($RequirementsRow['quantityrequired'],$RequirementsRow['decimalplaces']) . '</td>
 			<td class="number">' . locale_number_format($IssuedAlreadyRow[0],$RequirementsRow['decimalplaces']) . '</td>
 		</tr>';
 	}
+	/* now to deal with those addtional issues of items not in BOM */
+	if (count($IssuedMaterials)>0){
+		$IssuedStocks = implode("','",array_keys($IssuedMaterials));
+		$sql = "SELECT  stockid,
+				descrption,
+				decimalplaces
+			FROM stockmaster
+			WHERE stockid in ('" . $IssuedStocks . "')";
+		$ErrMsg = _('Failed to retrieve the item data');
+		$result = DB_query($sql,$db,$ErrMsg);
+		while($myrow = DB_fetch_array($result)){
+			echo '<tr>
+					<td><input type="submit" name="IssueItem" value="' . $myrow['stockid'] . '" /></td>
+					<td>' . $myrow['stockid'] . ' - ' . $myrow['description'] . '</td>
+					<td class="number">0</td>
+					<td class="number">' . locale_number_format($IssuedMaterials[$myrow['stockid']]['total'],$myrow['decimalplaces']) . '</td>
+				</tr>';
+			
+		}
 
+}
+
+
+
 	echo '</table>
 		<br />';
 
@@ -848,4 +878,4 @@
       </form>';
 
 include('includes/footer.inc');
-?>
+?>
\ No newline at end of file

Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php	2014-03-20 07:51:39 UTC (rev 6623)
+++ trunk/WorkOrderStatus.php	2014-03-21 03:49:21 UTC (rev 6624)
@@ -140,11 +140,10 @@
 	}
 	/* Now do any additional issues of items not in the BOM */
 	if(count($IssuedAlreadyRow)>0){
-		$AdditionalStockIDs = array_keys($IssuedAlreadyRow);
-		$AdditionalStocks = implode(',',$AdditionalStockIDs);
+		$AdditionalStocks = implode("','",array_keys($IssuedAlreadyRow));
 		$RequirementsSQL = "SELECT stockid,
-					stockmaster.description,
-					stockmaster.decimalplaces
+						description,
+							decimalplaces
 				FROM stockmaster WHERE stockid IN ('".$AdditionalStocks."')";
 		$RequirementsResult = DB_query($RequirementsSQL,$db);
 			$AdditionalStocks = array();
@@ -165,4 +164,4 @@
 	echo '</table>';
 	include('includes/footer.inc');
 
-?>
+?>
\ No newline at end of file