DI90SUN059 properly set retest_date on click packlist

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

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

@@ -1640,11 +1640,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 		double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0; 
 		double detQty = 0;
 		long   noArt = 0;
-		Timestamp expDate = null ,mfgDate=null;
+		Timestamp expDate = null ,mfgDate = null ,retestDate = null;
 		ArrayList qty = new ArrayList();
 		ArrayList orderNoArrList = new ArrayList();
 		ResultSet rs = null;
-		String detailCnt = "0",sExpDate= "",sMfgDate = "";
+		String detailCnt = "0",sExpDate= "",sMfgDate = "" ,sRetestDate = "";
 		ResultSet rs1 = null;
 		Connection conn = null;
 		Statement stmt = null;
@@ -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.MFG_DATE, STOCK.EXP_DATE ,STOCK.RETEST_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 "
@@ -1828,6 +1828,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					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();
@@ -1840,6 +1841,12 @@ 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
@@ -1871,7 +1878,7 @@ 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="" ;
+		String sExpDate="" , sMfgDate="" ,sRetestDate ="";
 		double quantity = 0, grossWeight = 0, tareWeight = 0, netWeight = 0, conv = 0, qtyStd = 0; 
 		double detQty = 0, noArt = 0;
 		NodeList detailList = null;
@@ -1916,6 +1923,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						saleOrd = rs.getString("SALE_ORDER");
 					}
 					invOrderNo = saleOrd;
+					sorder = "Y";
 				}
 				else if (orderType != null && orderType.equalsIgnoreCase("P"))
 				{
@@ -1941,7 +1949,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					}						
 				}
 				lineNoOrd = genericUtility.getColumnValueFromNode("line_no__ord",currDetail);
-				if(sorder == "Y")
+				//if(sorder == "Y")
+				if("Y".equalsIgnoreCase(sorder))
 				{
 					sqlStr = "SELECT SALE_ORDER, LINE_NO__SORD FROM DISTORDER_DET WHERE DIST_ORDER = '"+origInvOrderNo+"' AND LINE_NO = '"+lineNoOrd+"'";
 					rs = stmt.executeQuery(sqlStr);
@@ -1979,8 +1988,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				}
 				valueXmlString.append("<Detail>\r\n");
 				valueXmlString.append("<desp_id isSrvCallOnChg='0'>").append("<![CDATA[").append((despId == null) ? "":despId).append("]]>").append("</desp_id>\r\n"); //44
-				valueXmlString.append("<sord_no isSrvCallOnChg='0'>").append("<![CDATA[").append(invOrderNo).append("]]>").append("</sord_no>\r\n");
 				setNodeValue( dom, "desp_id", (despId == null) ? "":despId );
+				valueXmlString.append("<sord_no isSrvCallOnChg='0'>").append("<![CDATA[").append(invOrderNo).append("]]>").append("</sord_no>\r\n");
+				
 				setNodeValue( dom, "sord_no", invOrderNo );
 				
 				valueXmlString.append("<line_no__sord isSrvCallOnChg='0'>").append("<![CDATA[").append(lineNoOrd).append("]]>").append("</line_no__sord>\r\n");
@@ -1990,8 +2000,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				
 				valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(expLev).append("]]>").append("</exp_lev>\r\n");
 				setNodeValue( dom, "exp_lev", expLev );
-				expLev = getChangeSord(dom,  dom1, "exp_lev", xtraParams ,conn);//chg4
-				valueXmlString.append(expLev);
+				//expLev = getChangeSord(dom,  dom1, "exp_lev", xtraParams ,conn);//chg4
+				//valueXmlString.append(expLev);
 				valueXmlString.append("<unit isSrvCallOnChg='0'>").append("<![CDATA[").append(unit).append("]]>").append("</unit>\r\n");
 				setNodeValue( dom, "unit", (unit == null) ? "":unit );
 				valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(unitStd).append("]]>").append("</unit__std>\r\n");
@@ -1999,6 +2009,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				//valueXmlString.append("<unit__std isSrvCallOnChg='0'>").append("<![CDATA[").append(unitStd).append("]]>").append("</unit__std>\r\n");
 				//setNodeValue( dom, "desp_id", (despId == null) ? "":despId );
 				itemCode = genericUtility.getColumnValueFromNode("item_code",currDetail);
+				//valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
+				//setNodeValue( dom, "item_code", (itemCode == null) ? "":itemCode );
 				quantity = Double.parseDouble(genericUtility.getColumnValueFromNode("quantity",currDetail));
 				qtyStd = quantity;
 				conv = 0;
@@ -2026,6 +2038,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				noArt1		= genericUtility.getColumnValueFromNode("no_art",currDetail);
 				sExpDate    = genericUtility.getColumnValueFromNode("exp_date",currDetail);
 				sMfgDate    = genericUtility.getColumnValueFromNode("mfg_date",currDetail);
+				sRetestDate    = genericUtility.getColumnValueFromNode("retest_date",currDetail);
 				if (grossWt != null)
 				{
 					grossWeight	= Double.parseDouble(grossWt);
@@ -2113,6 +2126,12 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sMfgDate).append("]]>").append("</mfg_date>\r\n");
 					setNodeValue( dom, "mfg_date", (sMfgDate == null) ? "" : sMfgDate );
 				}
+				if (sRetestDate != null)
+				{
+					valueXmlString.append("<retest_date isSrvCallOnChg='0'>").append("<![CDATA[").append(sRetestDate).append("]]>").append("</retest_date>\r\n");
+					setNodeValue( dom, "retest_date", (sRetestDate == null) ? "" : sRetestDate );
+				}
+				
 				valueXmlString.append("</Detail>\r\n");
 			}
 			valueXmlString.append("</Root>\r\n");
@@ -6112,15 +6131,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					
 					sql = "Select item_code__ord, quantity, item_code, qty_alloc from sorditem "
 					+" where sale_order = ? and line_no = ? and "
-					+" site_code = ? and exp_lev = ? ";
+					+" exp_lev = ? ";
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,mVal);
 					pstmt.setString(2,mcode);
-					pstmt.setString(3,mdescr2);
-					pstmt.setString(4,mVal1);
+					//pstmt.setString(3,mdescr2); /// site_code = ? and
+					pstmt.setString(3,mVal1);
 										
 					rs = pstmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{	
 						itemCode = rs.getString("item_code__ord");
 						mNum = rs.getDouble("quantity");
@@ -6137,7 +6156,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					pstmt.setString(1,mdescr1);
 											
 					rs = pstmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{	
 						mitemdesc = rs.getString("descr");
 					}
@@ -6155,7 +6174,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					pstmt.setString(3,mVal1);
 											
 					rs =pstmt.executeQuery();
-					while(rs.next())
+					if(rs.next())
 					{	
 						mNum = rs.getDouble(1);
 						System.out.println("mNum on 5900  "+mNum);