ITEM CODE validation error code changed

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

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

@@ -327,63 +327,73 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 							itemCode = this.genericUtility.getColumnValue("item_code", dom);
 							siteCode = this.genericUtility.getColumnValue("site_code", dom1);
 							itemSer = this.genericUtility.getColumnValue("item_ser", dom1);
-							cnt=0;
-							sql = "select count(*) from item where item_code= ?";
-							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, itemCode);
-							rs = pstmt.executeQuery();
-							if (rs.next())
-							{
-								cnt = rs.getInt(1);
-							}
-							rs.close();
-							rs = null;
-							pstmt.close();
-							pstmt = null;
-							
-							if (cnt == 0)
+							if(itemCode ==null || itemCode.trim().length() ==0)
 							{
-								errCode = "VTITEM1";
+								errCode = "STKVALITCO";
 								errList.add(errCode);
 								errFields.add(childNodeName.toLowerCase());
 							}
-							sql = "select count(*) from siteitem where item_code= ? and item_ser= ? and site_code = ?";
-							pstmt = conn.prepareStatement(sql);
-							pstmt.setString(1, itemCode);
-							pstmt.setString(2, itemSer);
-							pstmt.setString(3, siteCode);
-							rs = pstmt.executeQuery();
-							if (rs.next())
-							{
-								siteItmCnt = rs.getInt(1);
-							}
-							rs.close();
-							rs = null;
-							pstmt.close();
-							pstmt = null;
-							
-							if (siteItmCnt == 0)
+							else
 							{
-								sql = "select count(*) from item where item_code= ? and 	 item_ser = ? ";
+								cnt=0;
+								sql = "select count(*) from item where item_code= ?";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, itemCode);
-								pstmt.setString(2, itemSer);
 								rs = pstmt.executeQuery();
 								if (rs.next())
 								{
-									itmCnt = rs.getInt(1);
+									cnt = rs.getInt(1);
 								}
 								rs.close();
 								rs = null;
 								pstmt.close();
 								pstmt = null;
 								
-								if (itmCnt == 0)
+								if (cnt == 0)
 								{
 									errCode = "VTITEM1";
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
 								}
+								sql = "select count(*) from siteitem where item_code= ? and item_ser= ? and site_code = ?";
+								pstmt = conn.prepareStatement(sql);
+								pstmt.setString(1, itemCode);
+								pstmt.setString(2, itemSer);
+								pstmt.setString(3, siteCode);
+								rs = pstmt.executeQuery();
+								if (rs.next())
+								{
+									siteItmCnt = rs.getInt(1);
+								}
+								rs.close();
+								rs = null;
+								pstmt.close();
+								pstmt = null;
+								
+								if (siteItmCnt == 0)
+								{
+									sql = "select count(*) from item where item_code= ? and 	 item_ser = ? ";
+									pstmt = conn.prepareStatement(sql);
+									pstmt.setString(1, itemCode);
+									pstmt.setString(2, itemSer);
+									rs = pstmt.executeQuery();
+									if (rs.next())
+									{
+										itmCnt = rs.getInt(1);
+									}
+									rs.close();
+									rs = null;
+									pstmt.close();
+									pstmt = null;
+									
+									if (itmCnt == 0)
+									{
+										errCode = "INVSITEITM";
+										//errCode = "VTITEM1";
+										errList.add(errCode);
+										errFields.add(childNodeName.toLowerCase());
+									}
+								}
 							}
 							
 						}else if(childNodeName.equalsIgnoreCase("sundry_code"))
@@ -1246,7 +1256,7 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 		String unitAlt = "",convQtyStduom = "",potencyPerc = "",siteCodeMfg ="",packCode= "";
 		String itemSer = "",tranType = "", CctrArray = "", acctCodeAr = "",cctrCodeAr = "";
 		double rate=0.0,noArt=0.0,grossRate=0.0;
-		Timestamp mfgDate = null,expDate = null;
+		Timestamp mfgDate = null,expDate = null,retestDate=null;
 		SimpleDateFormat sdf;
 		try
 		{
@@ -1255,7 +1265,7 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 			{
 
 				sql = "SELECT	ACCT_CODE__INV,CCTR_CODE__INV,RATE,GROSS_RATE, GRADE,DIMENSION,	NO_ART,	UNIT__ALT	," 
-						+ " CONV__QTY_STDUOM,	POTENCY_PERC,MFG_DATE,EXP_DATE,SITE_CODE__MFG,	PACK_CODE	FROM"  
+						+ " CONV__QTY_STDUOM,	POTENCY_PERC,MFG_DATE,EXP_DATE,SITE_CODE__MFG,	PACK_CODE,RETEST_DATE	FROM"  
 						+ " STOCK  WHERE 	ITEM_CODE = ? AND SITE_CODE = ? AND		LOC_CODE  = ? AND " 
 						+ " LOT_NO	 = ? ";
 				pstmt = conn.prepareStatement(sql);
@@ -1280,6 +1290,7 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 					expDate = rs.getTimestamp("EXP_DATE");
 					siteCodeMfg = rs.getString("SITE_CODE__MFG");
 					packCode = rs.getString("PACK_CODE");
+					retestDate = rs.getTimestamp("RETEST_DATE");
 				}
 				rs.close();
 				rs = null;
@@ -1289,7 +1300,7 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 			else
 			{
 				sql = "SELECT	ACCT_CODE__INV,CCTR_CODE__INV,RATE,GROSS_RATE, GRADE,DIMENSION,	NO_ART,	UNIT__ALT	," 
-						+ " CONV__QTY_STDUOM,	POTENCY_PERC,MFG_DATE,EXP_DATE,SITE_CODE__MFG,	PACK_CODE	FROM"  
+						+ " CONV__QTY_STDUOM,	POTENCY_PERC,MFG_DATE,EXP_DATE,SITE_CODE__MFG,	PACK_CODE,RETEST_DATE	FROM"  
 						+ " STOCK  WHERE 	ITEM_CODE = ? AND SITE_CODE = ? AND		LOC_CODE  = ? AND " 
 						+ " LOT_NO	 = ?  AND		LOT_SL = ? ";
 				pstmt = conn.prepareStatement(sql);
@@ -1315,7 +1326,7 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 					expDate = rs.getTimestamp("EXP_DATE");
 					siteCodeMfg = rs.getString("SITE_CODE__MFG");
 					packCode = rs.getString("PACK_CODE");
-					
+					retestDate = rs.getTimestamp("RETEST_DATE");
 				}
 				rs.close();
 				rs = null;
@@ -1383,6 +1394,13 @@ public class AdjIssueIC extends ValidatorEJB implements AdjIssueICLocal, AdjIssu
 			valueXmlString.append("<cctr_code__dr><![CDATA[").append(cctrCodeAr).append("]]></cctr_code__dr>\r\n");
 			valueXmlString.append("<grade><![CDATA[").append(grade).append("]]></grade>\r\n");
 			valueXmlString.append("<gross_rate><![CDATA[").append(grossRate).append("]]></gross_rate>\r\n");
+			if(retestDate != null)
+			{
+				valueXmlString.append("<retest_date>").append("<![CDATA["+sdf.format(retestDate).toString()+"]]>").append("</retest_date>");
+			}else
+			{
+				valueXmlString.append("<retest_date><![CDATA[").append("").append("]]></retest_date>\r\n");
+			}
 			
 		}
 		catch(Exception ex)