W15ESUN013 Changed for getting sorder number from batchload

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

webitm-wms/ibase/webitm/ejb/wms/SapSorderEJB.java

@@ -50,7 +50,7 @@ import ibase.webitm.ejb.dis.InvAllocTraceBean;
 import ibase.webitm.utility.ITMException;
 import ibase.webitm.utility.TransIDGenerator;
 import ibase.webitm.utility.wms.CommonWmsUtil;
-import ibase.webitm.utility.wms.SorderInsertSchedule;
+//import ibase.webitm.utility.wms.SorderInsertSchedule;
 
 @Stateless
 public class SapSorderEJB extends ActionHandlerEJB implements SapSorderEJBLocal,SapSorderEJBRemote
@@ -403,7 +403,10 @@ public class SapSorderEJB extends ActionHandlerEJB implements SapSorderEJBLocal,
 			else
 			{
 				conn.commit();
-				status = GetResponseXml(xmlString, status, conn);
+				//Changed by wasim on 28-09-2015 to get sorder number from batch id [START]
+				status = GetResponseXml(batchNo, status, conn);
+				//status = GetResponseXml(xmlString, status, conn);
+				//Changed by wasim on 28-09-2015 to get sorder number from batch id [END]
 			}
 			if(rs != null)
 			{
@@ -2765,7 +2768,7 @@ public class SapSorderEJB extends ActionHandlerEJB implements SapSorderEJBLocal,
 	    }
 	    
 	    
-	    public String GetResponseXml(String xml,String status,Connection conn) throws Exception
+	    public String GetResponseXml(String batchNo,String status,Connection conn) throws Exception
 	    {
 	    	StringBuffer sb = new StringBuffer();
 	    	Document dom = null,dom2 = null;
@@ -2774,21 +2777,22 @@ public class SapSorderEJB extends ActionHandlerEJB implements SapSorderEJBLocal,
 	    	ResultSet rs = null;
 	    	try
 	    	{
-	    		dom = genericUtility.parseString(xml.toString());
-	    		String depOrdNum = genericUtility.getColumnValue("depositoryOrderNumber", dom);
+	    		//dom = genericUtility.parseString(xml.toString());
+	    		//String depOrdNum = genericUtility.getColumnValue("depositoryOrderNumber", dom);
 	    		
 	    		/*dom2 = genericUtility.parseString(status.toString());
 	    		String msg = genericUtility.getColumnValue("message", dom2);
 	    		String descr = genericUtility.getColumnValue("description", dom2);
 	    		String trace = genericUtility.getColumnValue("trace", dom2);*/
 	    		
-	    		sql = "SELECT SALE_ORDER FROM SORDER WHERE UDF__STR2 = ?";
+	    		//sql = "SELECT SALE_ORDER FROM SORDER WHERE UDF__STR2 = ?";
+	    		sql = "SELECT TRAN_ID__REF FROM BATCHLOAD WHERE BATCH_ID = ?";//Changed by wasim to get sorder from bathcload on 28-09-2015
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1, depOrdNum);
+				pstmt.setString(1, batchNo);
 				rs = pstmt.executeQuery();
 				if ( rs.next() )
 				{
-					saleOrder = checkNullAndTrim(rs.getString("SALE_ORDER"));
+					saleOrder = checkNullAndTrim(rs.getString("TRAN_ID__REF"));
 				}
 				rs.close();rs = null;
 				pstmt.close();pstmt = null;
@@ -2867,7 +2871,7 @@ public class SapSorderEJB extends ActionHandlerEJB implements SapSorderEJBLocal,
 					}
 					else
 					{
-						sb.append("<msg_descr>").append(rs.getString("ERROR_MSG")).append("</msg_descr>\r\n");sb.append("<msg_descr>").append("EDI Loading failed").append("</msg_descr>\r\n");
+						sb.append("<msg_descr>").append("EDI Loading failed").append("</msg_descr>\r\n");
 					}
 					
 					sb.append("</error>");