sun source merge mail by rohan b

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

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

@@ -674,6 +674,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 					String sundryCode = "";
 					String exciseRef = "";
 					siteCodeShip = null;
+					System.out.println("Dis/purchase"+refSerStd);
 					if (refSerStd != null && refSerStd.trim().equals("D-RCP"))
 					{
 						sundryCodeSelPstmt.setString(1, refId);
@@ -722,14 +723,14 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 						
 						
 					}//if (refSerStd != null && refSerStd.trim().equals("D-RCP"))
-					/*
+					//Changed by Rohan on 23-Apr-13 for appending site code from sql.start
 					else
 					{	
-						siteCodeShip = "";
-						retTabSepStrBuff.append(siteCodeShip).append("\t"); //site code ship
-						System.out.println("siteCodeShip"+siteCodeShip);
+						siteCodeShip = checkNull(sqlExprResultSet.getString("SUPP_CODE"));
+						exciseRef = checkNull(sqlExprResultSet.getString("EXC_REF"));
+						System.out.println("siteCodeShip:::::"+siteCodeShip+"P-RCP");
 					}
-					*/
+					//Changed by Rohan on 23-Apr-13 for appending site code from sql.end
 					//genericUtility.getValidDateString(sprocDate, genericUtility.getApplDateFormat(), genericUtility.getApplDateFormat());
 					siteCodeShip = (siteCodeShip != null && !"null".equalsIgnoreCase(siteCodeShip))?siteCodeShip:"";
 					retTabSepStrBuff.append(siteCodeShip).append("\t"); //site code ship
@@ -787,7 +788,7 @@ public class TaxSch extends ProcessEJB implements TaxSchLocal, TaxSchRemote
 					
 					retTabSepStrBuff.append(refDocStr.trim()).append("\t");//ref doc date
 					
-					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("ITEM_CODE"))).append("\t");//item code
+					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("ITEM_CODE")).trim()).append("\t");//item code
 					retTabSepStrBuff.append(checkNull(sqlExprResultSet.getString("REF_DOC_NO"))).append("\t");//ref_doc_no
 					retTabSepStrBuff.append(refSerStd).append("\t");							//ref_series