bug fix

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

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

@@ -19,6 +19,7 @@ import java.rmi.RemoteException;
 import java.util.*;
 import java.text.*;
 import java.sql.*;
+import java.util.Date;
 
 import javax.ejb.*;
 
@@ -2125,7 +2126,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 				}
 				
 				//Added  by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Start
-				else if(!("Y".equalsIgnoreCase(ls_channel_partner)) && "1".equals(ediOption))
+				else if(!("Y".equalsIgnoreCase(ls_channel_partner)) && "1".equals(ediOption) && (merrcode == null || merrcode.trim().length() == 0))
 				{
 					CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
 					dataStr = createRCPXML.getTranXML(msalereturn, conn);