updated for retest date mfg date and exp date

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

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

@@ -751,8 +751,8 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 		StringBuffer detail2xml = new StringBuffer();
 		String tranDate = null;
 
-		PreparedStatement pstmt2 =null;
-		ResultSet rs2 = null,rs3 = null;
+		PreparedStatement pstmt2 ,pstmt3=null;
+		ResultSet rs2 = null,rs3 = null,rsp=null;
 
 
 		String unitAlt = null;
@@ -2302,14 +2302,46 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 										valueXmlString.append("<pack_instr protect=\"0\">").append("<![CDATA[" + rs1.getString(21) == null ? "":rs1.getString(21) + "]]>").append("</pack_instr>");
 										setNodeValue( dom, "pack_instr", getAbsString(""+rs1.getString(21) == null ? "":rs1.getString(21)));
 										
-										//valueXmlString.append("<retest_date>").append("<![CDATA[").append((rs1.getDate(19) == null) ? "":sdf.format(rs1.getDate(19))).append("]]>").append("</retest_date>\r\n");
-										String resetDate = rs1.getDate(19) == null ? "":sdf.format(rs1.getDate(19));
-										if(resetDate != null)
+								//		select RETEST_DATE,MFG_DATE,EXP_DATE from stock where lot_sl = '12S'
+										lotSl = genericUtility.getColumnValue("lot_sl",dom);
+										sql = "select RETEST_DATE,MFG_DATE,EXP_DATE from stock where lot_sl = ?";
+										pstmt3=conn.prepareStatement(sql);
+										pstmt3.setString(1,lotSl);
+										rsp = pstmt3.executeQuery();
+										if(rsp.next())
 										{
-											valueXmlString.append("<retest_date protect=\"0\">").append("<![CDATA[" + resetDate + "]]>").append("</retest_date>");
-											setNodeValue( dom, "retest_date", getAbsString(""+resetDate));
+
+											String resetDate = rsp.getDate(1) == null ? "":sdf.format(rsp.getDate(1));
+											
+											if(resetDate != null)
+											{
+												valueXmlString.append("<retest_date protect=\"0\">").append("<![CDATA[" + resetDate + "]]>").append("</retest_date>");
+												setNodeValue( dom, "retest_date", getAbsString(""+resetDate));
+
+											}
+											String mfgDate = rsp.getDate(2) == null ? "":sdf.format(rsp.getDate(2));
+											
+											if(mfgDate != null)
+											{
+												valueXmlString.append("<mfg_date protect=\"0\">").append("<![CDATA[" + mfgDate + "]]>").append("</mfg_date>");
+												setNodeValue( dom, "mfg_date", getAbsString(""+mfgDate));
+
+											}
+
+											String expDate = rsp.getDate(3) == null ? "":sdf.format(rsp.getDate(3));
 											
+											if(expDate != null)
+											{
+												valueXmlString.append("<exp_date protect=\"0\">").append("<![CDATA[" + expDate + "]]>").append("</exp_date>");
+												setNodeValue( dom, "exp_date", getAbsString(""+expDate));
+
+											}
+
 										}
+										pstmt3.close();
+										rsp.close();
+										pstmt3 = null;
+										rsp = null;
 										
 										
 										//valueXmlString.append("<dimension>").append("<![CDATA[").append((rs1.getString(18) == null) ? "":rs1.getString(18)).append("]]>").append("</dimension>\r\n");
@@ -2339,13 +2371,13 @@ public class DistIssWiz extends ValidatorEJB implements DistIssWizLocal, DistIss
 										
 									    
 									    //valueXmlString.append("<mfg_date>").append("<![CDATA[").append((rs1.getDate(8) == null) ? "":sdf.format(rs1.getDate(8))).append("]]>").append("</mfg_date>\r\n");
-									    valueXmlString.append("<mfg_date protect=\"0\">").append("<![CDATA[" + rs1.getDate(8) == null ? "":sdf.format(rs1.getDate(8)) + "]]>").append("</mfg_date>");
+									   /* valueXmlString.append("<mfg_date protect=\"0\">").append("<![CDATA[" + rs1.getDate(8) == null ? "":sdf.format(rs1.getDate(8)) + "]]>").append("</mfg_date>");
 										setNodeValue( dom, "mfg_date", getAbsString(""+rs1.getDate(8) == null ? "":sdf.format(rs1.getDate(8))));
 										
 									    //valueXmlString.append("<exp_date>").append("<![CDATA[").append((rs1.getDate(4) == null) ? "":sdf.format(rs1.getDate(4))).append("]]>").append("</exp_date>\r\n");
 									    valueXmlString.append("<exp_date protect=\"0\">").append("<![CDATA[" + rs1.getDate(4) == null ? "":sdf.format(rs1.getDate(4)) + "]]>").append("</exp_date>");
 										setNodeValue( dom, "exp_date", getAbsString(""+rs1.getDate(4) == null ? "":sdf.format(rs1.getDate(4))));
-										
+										*/
 									    
 									   // valueXmlString.append("<potency_perc>").append("<![CDATA[").append( ( (rs1.getString(9) == null) ? "": rs1.getString(9) ) ).append("]]>").append("</potency_perc>\r\n");
 									    valueXmlString.append("<potency_perc protect=\"0\">").append("<![CDATA[" + rs1.getString(9) == null ? "": rs1.getString(9) + "]]>").append("</potency_perc>");