modify for acct and cctr code validation

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

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

@@ -792,7 +792,7 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 						acctCodeDr  = genericUtility.getColumnValue("acct_code__dr", dom);
 						siteCode  = genericUtility.getColumnValue("site_code", dom);
 						System.out.println("@@@@@ acctCodeDr ["+acctCodeDr+"]");
-						if( acctCodeDr != null && acctCodeDr.length() > 0 )
+						if( acctCodeDr != null && acctCodeDr.trim().length() > 0 )
 						{
 							errCode  =  fincommon.isAcctCode(siteCode, acctCodeDr, modName, conn);
 							//errCode  =  this.isAcctCode(siteCode, acctCodeDr, modName);
@@ -816,8 +816,9 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 						acctCodeCr  = genericUtility.getColumnValue("acct_code__cr", dom);
 						siteCode  = genericUtility.getColumnValue("site_code", dom);
 						System.out.println("@@@@@ acctCodeCr ["+acctCodeCr+"]");
-						if( acctCodeCr != null && acctCodeCr.length() > 0 )
+						if( acctCodeCr != null && acctCodeCr.trim().length() > 0 )
 						{
+							System.out.println("@@@@@ acctCodeCr ["+acctCodeCr.trim()+"]");
 							//errCode  =  this.isAcctCode(siteCode, acctCodeCr, modName);
 							errCode  =  fincommon.isAcctCode(siteCode, acctCodeCr, modName, conn);
 							if (errCode != null && errCode.trim().length() > 0 )
@@ -826,19 +827,21 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
+					/*	
 						else
 						{
 							errCode = "VMACCTCRNU";	
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
+					*/
 					}
 
 					if(   childNodeName.equalsIgnoreCase("cctr_code__dr") )
 					{
 						cctrCodeDr  = genericUtility.getColumnValue("cctr_code__dr", dom);
 						System.out.println("@@@@@ cctrCodeDr ["+cctrCodeDr+"]");
-						if( cctrCodeDr != null && cctrCodeDr.length() > 0 )
+						if( cctrCodeDr != null && cctrCodeDr.trim().length() > 0 )
 						{  
 							acctCodeDr  = genericUtility.getColumnValue("acct_code__dr", dom);
 							//errCode  =  this.isCctrCode(acctCodeDr, cctrCodeDr, modName);
@@ -851,19 +854,21 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							}
 							
 						}
+					/*	
 						else
 						{
 							errCode = "VMCCTRDRNU";	
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
+					*/	
 					}
 
 					if(   childNodeName.equalsIgnoreCase("cctr_code__cr") )
 					{
 						cctrCodeCr  = genericUtility.getColumnValue("cctr_code__cr", dom);
 						System.out.println("@@@@@ cctrCodeCr ["+cctrCodeCr+"]");
-						if( cctrCodeCr != null && cctrCodeCr.length() > 0 )
+						if( cctrCodeCr != null && cctrCodeCr.trim().length() > 0 )
 						{
 							acctCodeCr  = genericUtility.getColumnValue("acct_code__cr", dom);
 							//errCode  =  this.isCctrCode(acctCodeCr, cctrCodeCr, modName);
@@ -875,12 +880,14 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 								errFields.add(childNodeName.toLowerCase());
 							}
 						}
+					/*	
 						else
 						{
 							errCode = "VMCCTRCRNU";	
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
 						}
+					*/
 				}
 
 
@@ -2844,10 +2851,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal, POrde
 							packCode = checkNull( rs.getString("pack_code")); 
 							noArt = rs.getDouble("no_art"); 
 							packInstr = checkNull( rs.getString("pack_instr")); 
-							acct_dr= checkNull( rs.getString("acct_code__dr"));
-							cctr_dr= checkNull( rs.getString("cctr_code__dr"));
-							acct_cr= checkNull( rs.getString("acct_code__cr")); 
-							cctr_cr= checkNull( rs.getString("cctr_code__cr")); 
+							acct_dr= ( rs.getString("acct_code__dr"));
+							cctr_dr= ( rs.getString("cctr_code__dr"));
+							acct_cr= ( rs.getString("acct_code__cr")); 
+							cctr_cr= ( rs.getString("cctr_code__cr")); 
 							discountType= checkNull( rs.getString("discount_type"));  
 							status= checkNull( rs.getString("status")); 
 							supp_code_mnfr= checkNull( rs.getString("supp_code__mnfr"));