UPDATED

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95045 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-mfg/ibase/webitm/ejb/mfg/adv/WoVolatileLossAct.java

@@ -106,7 +106,9 @@ public class WoVolatileLossAct extends ActionHandlerEJB implements WoVolatileLos
 			conn = connDriver.getConnectDB("DriverITM");
 			worder = genericUtility.getColumnValue("work_order",dom1) == null ? "" :genericUtility.getColumnValue("work_order",dom1);
 			itemCode = genericUtility.getColumnValue( "item_code", dom1 ) == null ?"":genericUtility.getColumnValue( "item_code", dom1 );
-			qtyFdStr = genericUtility.getColumnValue( "qty_feedback", dom1 ) == null ?"":genericUtility.getColumnValue( "qty_feedback", dom1 );
+//			qtyFdStr = genericUtility.getColumnValue( "qty_feedback", dom1 ) == null ?"":genericUtility.getColumnValue( "qty_feedback", dom1 );
+			qtyFdStr = genericUtility.getColumnValue( "net_weight", dom1 ) == null ?"":genericUtility.getColumnValue( "net_weight", dom1 );
+
 			if(qtyFdStr.trim().length() > 0)
 				qtyFd = Double.parseDouble(qtyFdStr);
 			siteCode = genericUtility.getColumnValue( "site_code", dom1 ) == null ?"":genericUtility.getColumnValue( "site_code", dom1 );
@@ -206,11 +208,12 @@ public class WoVolatileLossAct extends ActionHandlerEJB implements WoVolatileLos
 			rs.close();rs = null;
 		//	volatileQty = ((billQty * qtyFd)/batchQty)*(procLossPerc/100);
 			
-			volatileQty = ((requiredItemQty * qtyFd)/batchQty)*(procLossPerc/100);
+		//	volatileQty = ((requiredItemQty * qtyFd)/batchQty)*(procLossPerc/100);  
+			volatileQty = qtyFd * procLossPerc;  // CHANGE ON 09/MAY/14
 			System.out.println(">>>>>Before volatileQty:"+volatileQty);
 			if(volatileQty > 0 && VolatileItem.trim().length() > 0)
 			{
-				volatileQty = ((requiredItemQty * qtyFd)/batchQty)*(procLossPerc/100);
+//				volatileQty = ((requiredItemQty * qtyFd)/batchQty)*(procLossPerc/100);
 				
 				valueXmlString.append("<Detail>\r\n");
 				valueXmlString.append("<quantity>").append("<![CDATA[").append(df.format(volatileQty)).append("]]>").append("</quantity>\r\n");
@@ -286,7 +289,8 @@ public class WoVolatileLossAct extends ActionHandlerEJB implements WoVolatileLos
 			System.out.println(">>>>billQty:"+billQty);
 			System.out.println(">>>>scrapPerc:"+scrapPerc);
 			
-			scrapQty = ((batchQty * qtyFd)/billQty)*(scrapPerc/100);
+//			scrapQty = ((batchQty * qtyFd)/billQty)*(scrapPerc/100);
+			scrapQty = qtyFd * scrapPerc;  // CHANGE ON 09/MAY/14
 			System.out.println(">>>>>scrapQty:"+scrapQty);
 			if(scrapQty > 0 && scrapItem.trim().length() > 0)
 			{