changes in AdjReceiptIC.java

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

webitm-dis/ibase/webitm/ejb/dis/AdjReceiptIC.java

@@ -1324,14 +1324,28 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 					valueXmlString.append("<pack_code ><![CDATA[").append(packCode).append("]]></pack_code>\r\n");
 					
 					
-					valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
+					
+					//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
+					String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					valueXmlString.append(valAcct);
+					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
 					
 					if(unitPur!=null)
 					{
 						valueXmlString.append("<unit__alt ><![CDATA[").append(unitPur).append("]]></unit__alt>\r\n");
 					}
 					
-					protectRate(dom,valueXmlString,conn);//done
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
+					
+					//protectRate(dom,valueXmlString,conn);//done
+					
+					ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
+					rate =  tempList.get(0);
+					valueXmlString.append(tempList.get(1));
+					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
 					
 					setNodeValue( dom, "quantity", qty );
 					reStr=itemChanged(dom,dom1, dom2, objContext,"quantity",editFlag,xtraParams); //done
@@ -1441,8 +1455,14 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 					pstmt1=null;
 					valueXmlString.append("<location_descr ><![CDATA[").append(locDescr).append("]]></location_descr>\r\n");
 					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
 					
-					valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
+					//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);//done
+					
+					String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					valueXmlString.append(valAcct);
+					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
 					
 					sqlStockDe="SELECT BATCH_NO , SUPP_CODE__MFG , RETEST_DATE FROM STOCK  WHERE ITEM_CODE = ?	 AND SITE_CODE	= ?	AND LOC_CODE =	? AND  LOT_NO =	?	and lot_sl=	? ";
 					pstmt1=conn.prepareStatement(sqlStockDe);
@@ -1779,10 +1799,20 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 					priceListDom=checkNull(genericUtility.getColumnValue("price_list",dom));
 					qty=checkNull(genericUtility.getColumnValue("quantity",dom));
 					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
+					
+					//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					
+					String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					valueXmlString.append(valAcct);
 					
-					valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
-					protectRate(dom,valueXmlString,conn);
+					//protectRate(dom,valueXmlString,conn);
 					
+					ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
+					rate =  tempList.get(0);
+					valueXmlString.append(tempList.get(1));
+					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
 					
 					setNodeValue( dom, "quantity", qty );
 					reStr=itemChanged(dom,dom1, dom2, objContext,"quantity",editFlag,xtraParams); //done
@@ -1848,9 +1878,20 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 					locCode=checkNull(genericUtility.getColumnValue("loc_code",dom));
 					rate=checkNull(genericUtility.getColumnValue("rate",dom));
 					
-					valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][Start].
+					
+					//valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					
+					String valAcct = valAcct(itemCodeDom,siteCodeDom,locCode,lotNo,lotSl,valueXmlString,dom2,conn);
+					valueXmlString.append(valAcct);
+					
+					//rate=protectRate(dom2,valueXmlString,conn);
 					
-					rate=protectRate(dom2,valueXmlString,conn);
+					ArrayList<String> tempList= protectRate(dom2,valueXmlString,conn);
+					rate =  tempList.get(0);
+					valueXmlString.append(tempList.get(1));
+					
+					//Modified by Rupesh on[24/10/2017][As Instructed by Piyush Sir][End].
 					
 					setNodeValue( dom, "rate",rate );
 					reStr=itemChanged(dom,dom1, dom2, objContext,"rate",editFlag,xtraParams);
@@ -2163,8 +2204,9 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 		return valueXmlString.toString();
 	}
 
-	
-	private String protectRate(Document dom,StringBuffer valueXmlString,Connection conn) throws RemoteException, ITMException
+	//Modified by Rupesh on [24/10/2017][as instructed by Piyush sir]
+	//private String protectRate(Document dom,StringBuffer valueXmlString,Connection conn) throws RemoteException, ITMException
+	private ArrayList<String> protectRate(Document dom,StringBuffer valueXmlString,Connection conn) throws RemoteException, ITMException
 	{
 		PreparedStatement pstmt1 = null;
 		PreparedStatement pstmt2 = null;
@@ -2174,6 +2216,7 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 		String pType="";
 		double mQty=0,mRate=0;
 		DistCommon distCommon = new DistCommon();
+		ArrayList<String> retList = new ArrayList<String>();//added by Rupesh on[24/10/2017]
 		
 		try
 		{
@@ -2250,7 +2293,12 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 					valueXmlString.append("<rate protect=\"0\"><![CDATA[").append(mRate).append("]]></rate>\r\n");
 				}
 			}
-			return rate;
+			//Modified by Rupesh on [24/10/2017][instructed by Piyush Sir]Start.
+			//return rate;
+			retList.add(rate);
+			retList.add(valueXmlString.toString());
+			return retList;
+			//Modified by Rupesh on [24/10/2017][instructed by Piyush Sir]End.
 		}
 		catch(Exception e)
 		{
@@ -2285,8 +2333,9 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 		}
 	}
 	
-	
-	private void valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer valueXmlString ,Document dom,Connection conn) throws ITMException
+	//Modified by Rupesh on [24/10/2017][As Instructed by Piyush Sir].
+	//private Void valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer valueXmlString ,Document dom,Connection conn) throws ITMException
+	private String valAcct(String itemCode, String siteCode, String locCode, String lotNo, String lotSl,StringBuffer valueXmlString ,Document dom,Connection conn) throws ITMException
 	{
 		//Connection conn = null;
 		PreparedStatement pstmt1 = null,pstmt2 = null;
@@ -2738,7 +2787,7 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 			errString = e.getMessage();
 			throw new ITMException(e);
 		} 
-		
+		return valueXmlString.toString();//Added by Rupesh on [24/10/2017][As Instructed by Piyush Sir].
 	}