merge code given by manoj sir ... modified at supreme

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

webitm-mfg/ibase/webitm/ejb/mfg/WoIssPartialPrc.java

@@ -510,24 +510,7 @@ public class WoIssPartialPrc extends ProcessEJB implements WoIssPartialPrcLocal,
 
 
 
-				sql =" select nvl(sum(nvl(quantity,0) + nvl(potency_adj,0)),0) " 
-						+" from workorder_iss a, workorder_issdet b "
-						+" where  a.tran_id = b.tran_id "
-						+" and 	a.work_order= ? "
-						+" and b.exp_lev = ?  " 
-						+" and a.operation = ? ";
-				pstmt1 = conn.prepareStatement(sql);
-				pstmt1.setString(1,worder);
-				pstmt1.setString(2,expLev);
-				pstmt1.setInt(3,operation);
-				rs1 = pstmt1.executeQuery();
-				if(rs1.next())
-				{
-					issuedQty	=rs1.getDouble(1);
-				}
-				rs1.close();rs1=null;
-				pstmt1.close();pstmt1=null;
-				System.out.println("@@@@@@ issuedQty for the item--->["+issuedQty+"]");
+				
 
 				/*
 					propReqQty = (issueQtyBill/woQty)*batchQuantity;
@@ -645,6 +628,31 @@ public class WoIssPartialPrc extends ProcessEJB implements WoIssPartialPrcLocal,
 						rs1.close();rs1=null;
 						pstmt1.close();pstmt1=null;
 						
+						sql =" select nvl(sum(nvl(quantity,0) + nvl(potency_adj,0)),0) " 
+						+" from workorder_iss a, workorder_issdet b "
+						+" where  a.tran_id = b.tran_id "
+						+" and 	a.work_order= ? "
+						+" and b.exp_lev = ?  " 
+						+" and a.operation = ?  and a.site_code=? and b.item_code=? and b.lot_no=? and b.lot_sl=? and b.loc_code=?";
+				
+				pstmt1 = conn.prepareStatement(sql);
+				pstmt1.setString(1,worder);
+				pstmt1.setString(2,expLev);
+				pstmt1.setInt(3,operation);
+				pstmt1.setString(4,siteCode);
+				pstmt1.setString(5,itemCodeInv);
+				pstmt1.setString(6,lotNoInv);
+				pstmt1.setString(7,lotSlInv);
+				pstmt1.setString(8,locCode);
+				rs1 = pstmt1.executeQuery();
+				if(rs1.next())
+				{
+					issuedQty	=rs1.getDouble(1);
+				}
+				rs1.close();rs1=null;
+				pstmt1.close();pstmt1=null;
+				System.out.println("@@@@@@ issuedQty for the item--->["+issuedQty+"]");
+				
 						// for quantity check
 						System.out.println("@@@@@@090315 quantityInv["+quantityInv+"]woQty["+woQty+"]batchQuantity["+batchQuantity+"]issueQtyInv["+issueQtyInv+"]issuedQty["+issuedQty+"]");
 						propReqQty = (quantityInv/woQty)*batchQuantity;