DI90SUN059 properly set retest_date on click packlist

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

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

@@ -1787,8 +1787,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						 +"INV_PACK_RCP.NET_WEIGHT, "   
 						 +"INV_PACK_RCP.NO_ART, "   
 						 +"INV_PACK_RCP.DIMENSION, "   
-						 +"'Y' AS PROCESS_YN ,"  
-						 +" STOCK.MFG_DATE, STOCK.EXP_DATE " 
+						 +"'Y' AS PROCESS_YN  "  ///+" 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 "
@@ -1827,22 +1826,6 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					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);
-					
-					
-					if(mfgDate !=null)
-					{
-						sMfgDate = sdf.format(mfgDate).toString();
-						valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA["+ sMfgDate + "]]>").append("</mfg_date>\r\n");
-					}
-					
-					sExpDate = "";
-					if(expDate !=null)
-					{
-						sExpDate = sdf.format(expDate).toString();
-						valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>\r\n");
-					}
 					
 					valueXmlString.append("</Detail>\r\n");
 				}//while end
@@ -1877,7 +1860,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		String sExpDate="" , sMfgDate="" ,sRetestDate ="" ,siteCode = "";
 		String sql ="";
 		PreparedStatement pstmt = null;
-		Timestamp retestDate = null;
+		Timestamp retestDate = null ,mfgDate = null, expDate = null;
 		double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0; 
 		double detQty = 0, noArt = 0;
 		NodeList detailList = null;
@@ -2038,9 +2021,6 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				netWt		= genericUtility.getColumnValueFromNode("nett_weight",currDetail);
 				noArt1		= genericUtility.getColumnValueFromNode("no_art",currDetail);
 				
-				sMfgDate    = genericUtility.getColumnValueFromNode("mfg_date",currDetail);
-				sExpDate    = genericUtility.getColumnValueFromNode("exp_date",currDetail);
-				
 				if (grossWt != null)
 				{
 					grossWeight	= Double.parseDouble(grossWt);
@@ -2119,14 +2099,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				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 );
 				
-				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 "
+				sql =" select retest_date , mfg_date , exp_date from stock where  item_code = ? and "
 						+" site_code = ? and  loc_code  = ? and  "	
 						+"lot_no = ? and  lot_sl 	= ? ";
 					pstmt = conn.prepareStatement(sql);
@@ -2139,6 +2114,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				if(rs1.next())
 				{
 					retestDate = rs1.getTimestamp(1);
+					mfgDate = rs1.getTimestamp(2);
+					expDate = rs1.getTimestamp(3);
 				}
 				
 				rs1.close();
@@ -2158,6 +2135,30 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[" + sRetestDate + "]]>").append("</retest_date>\r\n");
 					setNodeValue( dom, "retest_date", sRetestDate );
 				}
+				if(mfgDate !=null)
+				{
+					sMfgDate = sdf.format(mfgDate).toString();
+					valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sMfgDate).append("]]>").append("</mfg_date>\r\n");
+				    setNodeValue( dom, "mfg_date", sMfgDate );
+				}
+				else
+				{
+					sMfgDate = "";
+					valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sMfgDate).append("]]>").append("</mfg_date>\r\n");
+				    setNodeValue( dom, "mfg_date", sMfgDate );
+				}
+				if(expDate !=null)
+				{
+					sExpDate = sdf.format(expDate).toString();
+					valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sExpDate).append("]]>").append("</exp_date>\r\n");
+				    setNodeValue( dom, "exp_date", sExpDate);
+				}
+				else
+				{
+					sExpDate = "";
+					valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sExpDate).append("]]>").append("</exp_date>\r\n");
+				    setNodeValue( dom, "exp_date", sExpDate);
+				}
 				// end change 07-09-10
 				
 				valueXmlString.append("</Detail>\r\n");