Effective date and tran date can not be blank validation added

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

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

@@ -115,7 +115,7 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 		String sqlLoc = "",sqlFaciLoc="",sqlActive="",sqlFaciSit="",finParam="N",tranDate1="",deptCode="",trackShelfLife="";
 		String itemSer="",priceList="";
 		String stkOpt="",itemSerMst="",othSeries="",noArtStr="";
-		String	transfer="";
+		String	transfer="",tranDateStr="",effDate="";
 		int cnt = 0;
 		int cntv = 0,cntLoc=0;
 		int cntItmSer = 0,noArt=0;
@@ -151,47 +151,66 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 
 					if (childNodeName.equalsIgnoreCase("tran_date"))
 					{
-						tranDate = sdf.parse(genericUtility.getColumnValue("tran_date",dom));
-						siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
-						System.out.println("tranDate  fire== " + tranDate);
-						System.out.println("siteCode  fire== " + siteCode);
-						if(siteCode == null || siteCode.trim().length()==0)
+						tranDateStr=genericUtility.getColumnValue("tran_date",dom);
+						if(tranDateStr==null || tranDateStr.trim().length()==0)
 						{
-							errCode = "NULLSITE";
+							errCode = "VTTRDT01";
 							errList.add(errCode);
 							errFields.add(childNodeName.toLowerCase());
-						}else
+						}
+						else
 						{
-							cnt=0;
-							sql = "select count(*) from site where site_code = ?";
-							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, siteCode);
-							rs = pstmt.executeQuery();
-							if (rs.next())
-							{
-								cnt = rs.getInt(1);
-							}
-							rs.close();
-							rs = null;
-							pstmt.close();
-							pstmt = null;
-							
-							if (cnt == 0)
+							tranDate = sdf.parse(genericUtility.getColumnValue("tran_date",dom));
+							siteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
+							System.out.println("tranDate  fire== " + tranDate);
+							System.out.println("siteCode  fire== " + siteCode);
+							if(siteCode == null || siteCode.trim().length()==0)
 							{
-								errCode = "VMSITE1";
+								errCode = "NULLSITE";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}else
 							{
-								errCode = nfCheckPeriod("SAL",tranDate,siteCode);
-								if(errCode != null && errCode.trim().length() > 0)
+								cnt=0;
+								sql = "select count(*) from site where site_code = ?";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, siteCode);
+								rs = pstmt.executeQuery();
+								if (rs.next())
+								{
+									cnt = rs.getInt(1);
+								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+								
+								if (cnt == 0)
 								{
+									errCode = "VMSITE1";
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
+								}else
+								{
+									errCode = nfCheckPeriod("SAL",tranDate,siteCode);
+									if(errCode != null && errCode.trim().length() > 0)
+									{
+										errList.add(errCode);
+										errFields.add(childNodeName.toLowerCase());
+									}
 								}
+							  }
 							}
+            		}else if (childNodeName.equalsIgnoreCase("eff_date"))
+					{
+            			effDate = genericUtility.getColumnValue("eff_date",dom);
+            			if(effDate==null || effDate.trim().length()==0)
+						{
+							errCode = "EFFDTBLK";
+							errList.add(errCode);
+							errFields.add(childNodeName.toLowerCase());
 						}
-            		}
+					}
 
 					else if (childNodeName.equalsIgnoreCase("site_code"))
 					{
@@ -903,20 +922,21 @@ public class AdjReceiptIC extends ValidatorEJB implements AdjReceiptICRemote,Adj
 			cnt = 0;
 			if (errList != null && errListSize > 0) 
 			{
-				for (cnt = 0; cnt < errListSize; cnt++)
+				for(cnt = 0; cnt < errListSize; cnt ++)
 				{
-					errCode = errList.get((int) cnt);
+					errCode = errList.get(cnt);
+					errFldName = errFields.get(cnt);
 					System.out.println("errCode .........." + errCode);
 					errString = getErrorString(errFldName, errCode, userId);
-					errorType = errorType(conn, errCode);
-					if (errString.length() > 0) 
+					errorType = errorType(conn , errCode);
+					if(errString.length() > 0)
 					{
 						String bifurErrString = errString.substring(errString.indexOf("<Errors>") + 8, errString.indexOf("<trace>"));
-						bifurErrString = bifurErrString	+ errString.substring(errString.indexOf("</trace>") + 8, errString.indexOf("</Errors>"));
+						bifurErrString = bifurErrString + errString.substring(errString.indexOf("</trace>") + 8, errString.indexOf("</Errors>"));
 						errStringXml.append(bifurErrString);
 						errString = "";
 					}
-					if (errorType.equalsIgnoreCase("E")) 
+					if(errorType.equalsIgnoreCase("E"))
 					{
 						break;
 					}