Stock button display seq changed

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

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

@@ -431,16 +431,16 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					valueXmlString.append("<Detail>\r\n");
 					valueXmlString.append("<item_code>").append("<![CDATA[").append(stkItemCode.trim()).append("]]>").append("</item_code>\r\n");
 					valueXmlString.append("<loc_code>").append("<![CDATA[").append(stkLocCode.trim()).append("]]>").append("</loc_code>\r\n");
+					valueXmlString.append("<lot_no>").append("<![CDATA[").append(stklotNo.trim()).append("]]>").append("</lot_no>\r\n");
+					valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stklotSl.trim()).append("]]>").append("</lot_sl>\r\n");
 					valueXmlString.append("<mfg_date>").append("<![CDATA[").append(stkMfgDate1).append("]]>").append("</mfg_date>\r\n");
 					valueXmlString.append("<exp_date>").append("<![CDATA[").append(stkExpDate1).append("]]>").append("</exp_date>\r\n");
 					//valueXmlString.append("<quantity>").append("<![CDATA[").append(balanceQty.trim()).append("]]>").append("</quantity>\r\n"); //Gulzar 13/03/07
 					valueXmlString.append("<quantity>").append("<![CDATA[").append(stkquantity.trim()).append("]]>").append("</quantity>\r\n"); //Gulzar 13/03/07
-					valueXmlString.append("<alloc_qty>").append("<![CDATA[").append(stkAllocQty).append("]]>").append("</alloc_qty>\r\n");
 					valueXmlString.append("<balance_qty>").append("<![CDATA[").append(balanceQty).append("]]>").append("</balance_qty>\r\n"); // Un-Commented By Gulzar 13/03/07
+					valueXmlString.append("<alloc_qty>").append("<![CDATA[").append(stkAllocQty).append("]]>").append("</alloc_qty>\r\n");
 					valueXmlString.append("<no_art>").append("<![CDATA[").append(stkNoArt).append("]]>").append("</no_art>\r\n");
 					valueXmlString.append("<rate>").append("<![CDATA[").append(stkRate).append("]]>").append("</rate>\r\n");
-					valueXmlString.append("<lot_no>").append("<![CDATA[").append(stklotNo.trim()).append("]]>").append("</lot_no>\r\n");
-					valueXmlString.append("<lot_sl>").append("<![CDATA[").append(stklotSl.trim()).append("]]>").append("</lot_sl>\r\n");
 					valueXmlString.append("</Detail>\r\n");
 				}
 			}//end While loop
@@ -619,6 +619,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 
 		java.sql.Date expDate = null;
 		java.sql.Date mfgDate = null;
+		String sexpDate = null;
+		String smfgDate = null;
 
 		ArrayList qtyFact = new ArrayList();
 
@@ -1063,6 +1065,19 @@ 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"); 
 					valueXmlString.append("<lot_sl isSrvCallOnChg='0'>").append(lotSl).append("</lot_sl>");
 					valueXmlString.append("<lot_no isSrvCallOnChg='1'>").append(lotNo).append("</lot_no>");
+					// 27/06/09 manoharan set the mfg_date and exp_date from stock
+					SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());	
+					if (expDate != null)
+					{
+					  sexpDate = sdf.format(expDate).toString();
+					  valueXmlString.append("<exp_date isSrvCallOnChg='0'>").append(sexpDate).append("</exp_date>");
+					}
+					if (mfgDate != null)
+					{
+					  smfgDate = sdf.format(mfgDate).toString();
+					  valueXmlString.append("<mfg_date isSrvCallOnChg='0'>").append(smfgDate).append("</mfg_date>");
+					}
+					// end 27/06/09 manoharan set the mfg_date and exp_date from stock
 					valueXmlString.append("</Detail>");
 					/*
 					valueXmlString.append("<line_no__sord isSrvCallOnChg='1'>").append(lineNoSord).append("</line_no__sord>");