DI90SUN059 properly set retest_date on click packlist

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

webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -1788,7 +1788,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						 +"INV_PACK_RCP.NO_ART, "   
 						 +"INV_PACK_RCP.DIMENSION, "   
 						 +"'Y' AS PROCESS_YN ,"  
-						 +" STOCK.MFG_DATE, STOCK.EXP_DATE ,STOCK.RETEST_DATE "
+						 +" STOCK.MFG_DATE, STOCK.EXP_DATE " 
 					+"FROM INV_PACK, INV_PACK_RCP, STOCK "  
 					+"WHERE INV_PACK.TRAN_ID = INV_PACK_RCP.TRAN_ID "
 					+"AND INV_PACK_RCP.ITEM_CODE = STOCK.ITEM_CODE "
@@ -1799,7 +1799,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					+"AND INV_PACK.ORDER_NO IN(" +orderNo+") "
 					+"AND INV_PACK.CONFIRMED  = 'Y' "
 					+"AND STOCK.QUANTITY >= INV_PACK_RCP.QUANTITY "   
-					+"ORDER BY INV_PACK_RCP.LINE_NO ASC";
+					+"ORDER BY INV_PACK_RCP.LINE_NO ASC ";
 
 				System.out.println("sql :"+sql);
 				
@@ -1826,9 +1826,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					valueXmlString.append("<no_art>").append("<![CDATA[").append(rs.getInt(16)).append("]]>").append("</no_art>\r\n");
 					valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(17)).append("]]>").append("</dimension>\r\n");
 					valueXmlString.append("<process_yn>").append("<![CDATA[").append(rs.getString(18)).append("]]>").append("</process_yn>\r\n");
+					
 					mfgDate = rs.getTimestamp(19);
 					expDate = rs.getTimestamp(20);
-					retestDate = rs.getTimestamp(21);
+					
+					
 					if(mfgDate !=null)
 					{
 						sMfgDate = sdf.format(mfgDate).toString();
@@ -1841,13 +1843,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						sExpDate = sdf.format(expDate).toString();
 						valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>\r\n");
 					}
-					sRetestDate = "";
-					if(retestDate !=null)
-					{
-						sRetestDate = sdf.format(retestDate).toString();
-						valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[" + sRetestDate + "]]>").append("</retest_date>\r\n");
-					}
-							
+					
 					valueXmlString.append("</Detail>\r\n");
 				}//while end
 				valueXmlString.append("</Root>\r\n");			
@@ -1878,7 +1874,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		String taxClass = "", taxChap = "", taxEnv = "", unit = "",unitStd = "";  
 		String lineNoOrd ="", itemCode = "", locCode = "", lotNo = "", lotSL = "", packInstr  = "", dimension = "";   
 		String grossWt = "", tareWt = "", netWt = "", noArt1 = "";
-		String sExpDate="" , sMfgDate="" ,sRetestDate ="";
+		String sExpDate="" , sMfgDate="" ,sRetestDate ="" ,siteCode = "";
+		String sql ="";
+		PreparedStatement pstmt = null;
+		Timestamp retestDate = null;
 		double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0; 
 		double detQty = 0, noArt = 0;
 		NodeList detailList = null;
@@ -1889,6 +1888,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		Connection conn = null;
 		Statement stmt = null;
 		ResultSet rs = null;
+		ResultSet rs1 = null;
+		Statement stmt1 = null;
 		ConnDriver connDriver = new ConnDriver();
 		StringBuffer valueXmlString = new StringBuffer("<?xml version=\"1.0\"?>\r\n<Root>\r\n");
 		GenericUtility genericUtility = GenericUtility.getInstance();
@@ -1897,9 +1898,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		{
 			conn = connDriver.getConnectDB("DriverITM");
 			stmt = conn.createStatement();
-			
+			SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 			despId = genericUtility.getColumnValue("desp_id",dom1);
-
+			siteCode = genericUtility.getColumnValue("site_code",dom1);
 			detailList = selDataDom.getElementsByTagName("Detail");
 			detailListLength = detailList.getLength(); 
 			for (int ctr = 0;ctr < detailListLength; ctr++)
@@ -2036,9 +2037,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				tareWt		= genericUtility.getColumnValueFromNode("tare_weight",currDetail);
 				netWt		= genericUtility.getColumnValueFromNode("nett_weight",currDetail);
 				noArt1		= genericUtility.getColumnValueFromNode("no_art",currDetail);
-				sExpDate    = genericUtility.getColumnValueFromNode("exp_date",currDetail);
+				
 				sMfgDate    = genericUtility.getColumnValueFromNode("mfg_date",currDetail);
-				sRetestDate    = genericUtility.getColumnValueFromNode("retest_date",currDetail);
+				sExpDate    = genericUtility.getColumnValueFromNode("exp_date",currDetail);
+				
 				if (grossWt != null)
 				{
 					grossWeight	= Double.parseDouble(grossWt);
@@ -2116,21 +2118,47 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				setNodeValue( dom, "tax_chap", (taxChap == null) ? "":taxChap );
 				valueXmlString.append("<tax_env isSrvCallOnChg='0'>").append("<![CDATA[").append((taxEnv == null) ? "":taxEnv).append("]]>").append("</tax_env>\r\n");
 				setNodeValue( dom, "tax_env", (taxEnv == null) ? "":taxEnv );
-				if (sExpDate != null)
+				
+				valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append( (sMfgDate == null) ? "" : sMfgDate).append("]]>").append("</mfg_date>\r\n");
+				setNodeValue( dom, "mfg_date", (sMfgDate == null) ? "" : sMfgDate );
+				
+				valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append( (sExpDate == null ) ? "" : sExpDate).append("]]>").append("</exp_date>\r\n");
+				setNodeValue( dom, "exp_date", (sExpDate == null) ? "" : sExpDate);
+				// Change 07-09-10 
+				
+				sql =" select retest_date from stock where  item_code = ? and "
+						+" site_code = ? and  loc_code  = ? and  "	
+						+"lot_no = ? and  lot_sl 	= ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString(1,itemCode);
+					pstmt.setString(2,siteCode);
+					pstmt.setString(3,locCode);
+					pstmt.setString(4,lotNo);
+					pstmt.setString(5,lotSL);
+				rs1 = pstmt.executeQuery();
+				if(rs1.next())
 				{
-					valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sExpDate).append("]]>").append("</exp_date>\r\n");
-					setNodeValue( dom, "exp_date", sExpDate );
+					retestDate = rs1.getTimestamp(1);
 				}
-				if (sMfgDate != null)
+				
+				rs1.close();
+				rs1 =null;
+				pstmt.close();
+				pstmt = null;
+				
+				if(retestDate !=null)
 				{
-					valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sMfgDate).append("]]>").append("</mfg_date>\r\n");
-					setNodeValue( dom, "mfg_date", (sMfgDate == null) ? "" : sMfgDate );
+					sRetestDate = sdf.format(retestDate).toString();
+					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[" + sRetestDate + "]]>").append("</retest_date>\r\n");
+					setNodeValue( dom, "retest_date", sRetestDate );
 				}
-				if (sRetestDate != null)
+				else
 				{
-					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sRetestDate).append("]]>").append("</retest_date>\r\n");
-					setNodeValue( dom, "retest_date", (sRetestDate == null) ? "" : sRetestDate );
+					sRetestDate = "";
+					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[" + sRetestDate + "]]>").append("</retest_date>\r\n");
+					setNodeValue( dom, "retest_date", sRetestDate );
 				}
+				// end change 07-09-10
 				
 				valueXmlString.append("</Detail>\r\n");
 			}