Rearrange the validation for Item code.

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

webitm-mfg/ibase/webitm/ejb/mfg/ConsumptionOdrIssuWizIc.java

@@ -445,8 +445,10 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
 					if(childNodeName.equalsIgnoreCase("item_code"))
 					{
 						itemCode=genericUtility.getColumnValue("item_code", dom);
+						System.out.println("@V@ Item code at detail2:- ["+itemCode+"]");
 						if(itemCode ==null || itemCode.trim().length()<=0)
 						{
+							System.out.println("@V@ first if");
 							errList.add("NULLITEMCD");
 							errFields.add(childNodeName.toLowerCase());
 						}
@@ -471,11 +473,12 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
 							pstmt1=null;
 							rs1.close();
 							rs1=null;
-						}
-						siteCode=genericUtility.getColumnValue("site_code", dom1);
+							
+							itemCode=genericUtility.getColumnValue("item_code", dom);
 							locCode=genericUtility.getColumnValue("loc_code", dom);
 							lotNo=genericUtility.getColumnValue("lot_no", dom);
 							lotSl=genericUtility.getColumnValue("lot_sl", dom);
+							siteCode=genericUtility.getColumnValue("site_code", dom1);
 							
 							sql1="select count(*) as cnt from stock where item_code=? and loc_code=? and lot_no=? and lot_sl=? and site_code=?";
 							pstmt1=conn.prepareStatement(sql1);
@@ -501,6 +504,42 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
 							rs1.close();
 							rs1=null;						
 							
+							
+							sql1="select EXP_DATE from stock where ITEM_CODE=? and SITE_CODE=? and LOT_NO=? and LOT_SL=?";
+							pstmt1=conn.prepareStatement(sql1);
+							pstmt1.setString(1, itemCode);
+							pstmt1.setString(2, siteCode);
+							pstmt1.setString(3, lotNo);
+							pstmt1.setString(4, lotSl);
+							rs1=pstmt1.executeQuery();
+							if(rs1.next())
+							{
+								expiryDate=rs1.getTimestamp("EXP_DATE");
+							}
+							pstmt1.close();
+							pstmt1=null;
+							rs1.close();
+							rs1=null;
+							
+							java.util.Date currentDate = new java.util.Date();						
+							java.sql.Date date = new java.sql.Date(currentDate.getTime());
+							SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
+							String sysDateStr = sdf.format(currentDate.getTime());
+							System.out.println("@V@ Now the date is>>>>>>> " + sysDateStr);
+							sysDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(),
+									genericUtility.getDBDateFormat())+ " 00:00:00.0");
+							System.out.println("@V@ Expiry date from Db:-["+expiryDate+"]");
+							if(expiryDate!=null)
+							{
+							if(expiryDate.before(sysDate))
+							{
+								errList.add("ITMEXPIRY");
+								errFields.add(childNodeName.toLowerCase());
+							}
+							}
+						}
+						
+						
 					}
 //					if(childNodeName.equalsIgnoreCase("loc_code"))
 //					{
@@ -603,48 +642,7 @@ public class ConsumptionOdrIssuWizIc extends ValidatorEJB implements Consumption
 							errFields.add(childNodeName.toLowerCase());
 						}						
 					}
-					if(childNodeName.equalsIgnoreCase("item_code"))
-					{
-						itemCode=genericUtility.getColumnValue("item_code", dom);
-						locCode=genericUtility.getColumnValue("loc_code", dom);
-						lotNo=genericUtility.getColumnValue("lot_no", dom);
-						lotSl=genericUtility.getColumnValue("lot_sl", dom);
-						siteCode=genericUtility.getColumnValue("site_code", dom1);
 
-						sql1="select EXP_DATE from stock where ITEM_CODE=? and SITE_CODE=? and LOT_NO=? and LOT_SL=?";
-						pstmt1=conn.prepareStatement(sql1);
-						pstmt1.setString(1, itemCode);
-						pstmt1.setString(2, siteCode);
-						pstmt1.setString(3, lotNo);
-						pstmt1.setString(4, lotSl);
-						rs1=pstmt1.executeQuery();
-						if(rs1.next())
-						{
-							expiryDate=rs1.getTimestamp("EXP_DATE");
-						}
-						pstmt1.close();
-						pstmt1=null;
-						rs1.close();
-						rs1=null;
-						
-						java.util.Date currentDate = new java.util.Date();						
-						java.sql.Date date = new java.sql.Date(currentDate.getTime());
-						SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
-						String sysDateStr = sdf.format(currentDate.getTime());
-						System.out.println("@V@ Now the date is>>>>>>> " + sysDateStr);
-						sysDate = Timestamp.valueOf(genericUtility.getValidDateString(sysDateStr, genericUtility.getApplDateFormat(),
-								genericUtility.getDBDateFormat())+ " 00:00:00.0");
-						
-//						expiryDate=Timestamp.valueOf(genericUtility.getValidDateString(expDate, genericUtility.getApplDateFormat(),
-//								genericUtility.getDBDateFormat())+ " 00:00:00.0");
-						System.out.println("@V@ Expiry date from Db:-["+expiryDate+"]");
-						
-						if(expiryDate.before(sysDate))
-						{
-							errList.add("ITMEXPIRY");
-							errFields.add(childNodeName.toLowerCase());
-						}
-					}
 //					if(childNodeName.equalsIgnoreCase("item_ser"))
 //					{
 //						itemSetDt=genericUtility.getColumnValue("item_ser", dom);