Changes made to take care req_date,dlv_Date,tax_Date as null

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

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

@@ -3102,7 +3102,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 	    String remark="";
 	    String analcode="",cctrcode1="",acctcode1="",deptcode="",sitecode="";
         String BudgetStr="",CONSStr="",totStr="";
-		
+        String refDateStr =""; String dlvDateStr ="";String reqDateStr ="";String taxDateStr ="";String ordDateStr ="";
 		try
 		{
 			Calendar currentDate = Calendar.getInstance();
@@ -3315,8 +3315,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					//frtAmtFixed = frtAmtFixed==0?0:frtAmtFixed;
 					
 					
-					
-					String ordDateStr = sdf.format(ordDate.getTime());
+					if(ordDateStr != null)
+					{
+					ordDateStr = sdf.format(ordDate.getTime());
+					}
 					System.out.println("@@@@@ordDateStr"+ordDateStr);
 					valueXmlString.append("<ord_date>").append("<![CDATA["+ordDateStr+"]]>").append("</ord_date>");
 					valueXmlString.append("<pord_type>").append("<![CDATA["+pordType+"]]>").append("</pord_type>");
@@ -3381,7 +3383,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					valueXmlString.append("<tax_env>").append("<![CDATA["+taxEnv+"]]>").append("</tax_env>");
 					valueXmlString.append("<tax_env__o>").append("<![CDATA["+taxEnv+"]]>").append("</tax_env__o>");
 					valueXmlString.append("<remarks>").append("<![CDATA["+remarks+"]]>").append("</remarks>");
-					String taxDateStr = sdf.format(taxDate.getTime());
+					if(taxDateStr != null)
+					{
+					taxDateStr = sdf.format(taxDate.getTime());
+					}
 					valueXmlString.append("<tax_date__o>").append("<![CDATA["+taxDateStr+"]]>").append("</tax_date__o>");
 					valueXmlString.append("<proj_code>").append("<![CDATA["+projCode+"]]>").append("</proj_code>");
 					valueXmlString.append("<proj_code__o>").append("<![CDATA["+projCode+"]]>").append("</proj_code__o>");
@@ -3411,7 +3416,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					valueXmlString.append("<curr_code__ins__o>").append("<![CDATA["+currCodeIns+"]]>").append("</curr_code__ins__o>");
 					valueXmlString.append("<emp_code__aprv>").append("<![CDATA["+empCodeAprv+"]]>").append("</emp_code__aprv>");
 					valueXmlString.append("<emp_code__aprv__o>").append("<![CDATA["+empCodeAprv+"]]>").append("</emp_code__aprv__o>");
-					String refDateStr = sdf.format(refDate.getTime());
+					if(refDate != null)
+					{
+						refDateStr = sdf.format(refDate.getTime());
+					}
+					
 					valueXmlString.append("<ref_date>").append("<![CDATA["+refDateStr+"]]>").append("</ref_date>");
 					valueXmlString.append("<ref_date__o>").append("<![CDATA["+refDateStr+"]]>").append("</ref_date__o>");
 
@@ -3740,9 +3749,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 					siteCodeDlv = checkNull(genericUtility.getColumnValue("site_code__dlv", dom1));
 					valueXmlString.append("<site_code >").append("<![CDATA["+siteCodeDlv+"]]>").append("</site_code>");
 					amddt = checkNull(genericUtility.getColumnValue("amd_date", dom1));
+					if(amddt != null)
+					{
 					valueXmlString.append("<req_date >").append("<![CDATA["+amddt+"]]>").append("</req_date>");
 					valueXmlString.append("<dlv_date >").append("<![CDATA["+amddt+"]]>").append("</dlv_date>");
-
+					}
 					suppCode = checkNull(genericUtility.getColumnValue("supp_code", dom1));
 					sql = " select channel_partner from site_supplier where  site_code__ch = ? and supp_code = ? ";
 					pstmt =  conn.prepareStatement(sql);
@@ -3978,8 +3989,16 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 						valueXmlString.append("<tax_amt >").append("<![CDATA["+taxAmt+"]]>").append("</tax_amt>");
 						valueXmlString.append("<tot_amt >").append("<![CDATA["+totAmt+"]]>").append("</tot_amt>");
 						valueXmlString.append("<loc_code >").append("<![CDATA["+locCode+"]]>").append("</loc_code>");
-						String reqDateStr = sdf.format(reqDate.getTime());
-						String dlvDateStr = sdf.format(dlvDate.getTime());
+						if(reqDateStr != null)
+						{
+						 reqDateStr = sdf.format(reqDate.getTime());
+						}
+						if(dlvDateStr != null)
+						{
+						dlvDateStr = sdf.format(dlvDate.getTime());
+						}
+						
+						
 						valueXmlString.append("<req_date >").append("<![CDATA["+reqDateStr+"]]>").append("</req_date>");
 						valueXmlString.append("<req_date__o>").append("<![CDATA["+reqDateStr+"]]>").append("</req_date__o>");
 						valueXmlString.append("<dlv_date >").append("<![CDATA["+dlvDateStr+"]]>").append("</dlv_date>");
@@ -4225,7 +4244,11 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							valueXmlString.append("<item_descr >").append("<![CDATA["+itemDescr+"]]>").append("</item_descr>");
 							valueXmlString.append("<loc_code >").append("<![CDATA["+locCode+"]]>").append("</loc_code>");
 							valueXmlString.append("<rate__stduom >").append("<![CDATA["+rate+"]]>").append("</rate__stduom>");
-							String reqDateStr = sdf.format(reqDate.getTime());
+							if(reqDateStr != null)
+							{
+							 reqDateStr = sdf.format(reqDate.getTime());
+							}
+							
 							valueXmlString.append("<req_date >").append("<![CDATA["+reqDateStr+"]]>").append("</req_date>");
 							valueXmlString.append("<dlv_date >").append("<![CDATA["+reqDateStr+"]]>").append("</dlv_date>");
 							valueXmlString.append("<pack_code >").append("<![CDATA["+packCode+"]]>").append("</pack_code>");