sun source merge mail by rohan b.

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

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

@@ -72,6 +72,10 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
 		
 		java.util.Date processDate = null;
 		java.util.Date dateCheck = null;
+		java.sql.Date tranDate = null;
+		java.sql.Date refDate = null;
+		java.sql.Date refDocDate = null;
+		java.sql.Date chgDate = null;
 		
 		int count = 0;
 		
@@ -199,11 +203,27 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
 				do
 				{
 					retTabSepStrBuff.append(checkNull(rs.getString("TRAN_ID"))).append("\t");
-					retTabSepStrBuff.append(rs.getDate("TRAN_DATE")).append("\t");
+					tranDate = rs.getDate("TRAN_DATE");
+					if(tranDate != null)
+					{
+						retTabSepStrBuff.append(tranDate).append("\t");
+					}
+					else
+					{
+						retTabSepStrBuff.append("").append("\t");
+					}
 					retTabSepStrBuff.append(checkNull(rs.getString("BAL_GROUP"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("REF_SER"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("REF_ID"))).append("\t");
-					retTabSepStrBuff.append(rs.getDate("REF_DATE")).append("\t");
+					refDate = rs.getDate("REF_DATE");
+					if(refDate != null)
+					{
+						retTabSepStrBuff.append(refDate).append("\t");
+					}
+					else
+					{
+						retTabSepStrBuff.append("").append("\t");
+					}
 					retTabSepStrBuff.append(checkNull(rs.getString("CONFIRMED"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("DRCR_FLAG"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("PARTY_REF"))).append("\t");
@@ -213,12 +233,29 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
 					retTabSepStrBuff.append(checkNull(rs.getString("SUPP_CODE"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("TAX_CODE"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("REF_DOC_NO"))).append("\t");
-					retTabSepStrBuff.append(rs.getDate("REF_DOC_DATE")).append("\t");
+					refDocDate = rs.getDate("REF_DOC_DATE");
+					if(refDocDate != null)
+					{
+						retTabSepStrBuff.append(refDocDate).append("\t");
+					}
+					else
+					{
+						retTabSepStrBuff.append("").append("\t");
+					}	
 					retTabSepStrBuff.append(checkNull(rs.getString("SR_NO"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("BAL_GROUP__ADJ"))).append("\t");
 					retTabSepStrBuff.append(rs.getDouble("ADJ_AMT")).append("\t");
 					retTabSepStrBuff.append(rs.getDouble("CR_AMT")).append("\t");
-					retTabSepStrBuff.append(rs.getDate("CHG_DATE")).append("\t");
+				
+					chgDate = rs.getDate("CHG_DATE");
+					if(chgDate != null)
+					{
+						retTabSepStrBuff.append(chgDate).append("\t");
+					}
+					else
+					{
+						retTabSepStrBuff.append("").append("\t");
+					}
 					retTabSepStrBuff.append(checkNull(rs.getString("CHG_USER"))).append("\t");
 					retTabSepStrBuff.append(checkNull(rs.getString("CHG_TERM"))).append("\t");
 							
@@ -431,7 +468,11 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
 			prcDate = genericUtility.getColumnValue("process_date",headerDom);
 			chgUser = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
 			chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
-			siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
+			//Changed by Rohan on 13-04-13 for take site code from header dom
+			//siteCode = checkNull(genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" ));
+			siteCode = checkNull(genericUtility.getColumnValue("site_code",headerDom));
+			
+			System.out.println("Site Code:From header dom::::"+siteCode);
 			
 			String applDateFmt = genericUtility.getApplDateFormat();
 			DateFormat dtFormat = new SimpleDateFormat(applDateFmt);
@@ -473,6 +514,7 @@ public class CenvatCrCapitalPrc extends ProcessEJB implements CenvatCrCapitalPrc
 			{
 				
 				refId = getTranId("t_transfer_refId",siteCode,conn);
+				System.out.println("Ref id genertaed for this trnasaction"+refId);
 			}
 			
 			for (int selectedRow = 0; selectedRow < parentNodeListLength; selectedRow++)