revert previous version and add site code delivery

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

webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnFormSplit.java

@@ -48,7 +48,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 	 */
 	String userId = "", termId = "";
 	GenericUtility genericUtility = GenericUtility.getInstance();
-
+	public String siteCode = "";
 	public String actionHandler(String tranId, String xtraParams, String forcedFlag) throws RemoteException, ITMException
 	{
 		Connection conn = null;
@@ -59,7 +59,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 		String sql = "";
 		String sql1 = "";
 		String status = "";
-		String siteCode = "", empCode = null;
+		String empCode = null;
 		String verifyFlag= "";
 		String errString = "" ;
 		
@@ -175,7 +175,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 			{
 	
 				conn.commit();
-				
+				System.out.println("---COMMITTED==");
 				if(pstmt != null)
 				{
 					pstmt.close();
@@ -230,7 +230,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 		String crterm  = "";
 		String shiptozip = "";
 		String custCd = "";
-		String custCodeBill="",custCodeDlv="";
+		String custCodeBill="",custCodeDlv="",siteCodeDlv = "";
 
 		double lineNoInv = 0, quantity = 0, netAmountDet = 0, rate = 0, effNetAmountDet = 0,claimQuantity = 0,physicalQuantity=0;
 		double convQtyStdUom = 0, convRtUomStdUom = 0, quantityStdUom = 0, rateStdUom = 0;
@@ -243,7 +243,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 		String xmlString = null,retString  = null, salesPers = null;
 		java.text.SimpleDateFormat sdf = null;
 		int lineNo = 0, crCount = 0;
-		String retRef="";
+		String retRef="",reasCodeH = "";
 		try
 		{
 			DistCommon distCommom = new DistCommon();
@@ -324,7 +324,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				+ " anal_code, remarks, full_ret, curr_code, exch_rate, "
 				+ " cust_ref, net_amt, tran_code, lr_no, lr_date, lorry_no, "
 				+ " frt_amt, trans_mode, bank_charges, curr_code__bc, price_list, "
-				+ " eff_net_amt, tax_amt, price_list__clg,ret_ref  "
+				+ " eff_net_amt, tax_amt, price_list__clg,ret_ref,reas_code,site_code__dlv  "
 				+ " FROM sreturn_form "
 				+ " WHERE sreturn_form.tran_id = ? ";
 
@@ -364,6 +364,9 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				System.out.println("Effective Net Amount"+effNetAmount);
 				priceListClg= checkNull(rs.getString("price_list__clg"));
 				retRef=checkNull(rs.getString("ret_ref"));
+				reasCodeH=checkNull(rs.getString("reas_code"));
+				siteCodeDlv =checkNull(rs.getString("site_code__dlv"));
+				
 			}
 			pstmt.close();
 			pstmt = null;
@@ -835,7 +838,12 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 				//01112012 manoj sharma  ret_ref field to be set
 				xmlBuff.append("<ret_ref><![CDATA[" + retRef + "]]></ret_ref>");
 				//end 01112012 manoj sharma  ret_ref field to be set
+				//08/07/2013 ritesh tiwari form_no field to be set
+				xmlBuff.append("<form_no><![CDATA["+ tranId +"]]></form_no>");
+				xmlBuff.append("<reas_code><![CDATA[" + reasCodeH + "]]></reas_code>");
+				//end 08/07/2013 ritesh tiwari form_no field to be set
 				xmlBuff.append("<wf_status><![CDATA[S]]></wf_status>");//added by Sanjaya on 08/JUL/13
+				xmlBuff.append("<site_code__dlv><![CDATA["+siteCodeDlv+"]]></site_code__dlv>"); //added by kunal on 30/JUL/13
 				xmlBuff.append("</Detail1>");
 				lineNo = 0;
 				for (int itemCtr = 0; itemCtr < tempList.size(); itemCtr++)
@@ -1193,6 +1201,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 
 				if (retString.indexOf("Success") > -1)
 				{
+					//conn.commit();
 					int  d =retString.indexOf("<TranID>");
 					int f =	 retString.indexOf("</TranID>");
 					String tempTranId = retString.substring(d+8,f);
@@ -1209,6 +1218,7 @@ public class SalesReturnFormSplit extends ActionHandlerEJB implements SalesRetur
 		{
 			try
 			{
+				System.out.println("--ROLLED----");
 				conn.rollback();
 			}
 			catch (Exception e1)