Skip to content

B
business-java
Commit 60551972 authored by apal's avatar apal
Browse files
Options

client request id :D17FPIT001 

bug fix

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@173572 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 975ce056
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 20 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java
View file @ 60551972
......@@ -2125,26 +2125,6 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
System.out.println("retString from["+retString+"]");
}
//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) && (merrcode == null || merrcode.trim().length() == 0))
{
System.out.println("merrcode[+"+merrcode+"]");
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
System.out.println("xtraParams:["+xtraParams+"]");
E12GenerateEDIEJB e12GenerateEDIEJB = new E12GenerateEDIEJB();
retString = e12GenerateEDIEJB.nfCreateEdiMultiLogic(ediDataDom,"w_salesreturn_retn", xtraParams);
System.out.println("retString from E12GenerateEDIEJB before = ["+ retString + "]");
if (retString != null && "SUCCESS".equalsIgnoreCase(retString))
{
System.out.println("retString from E12GenerateEDIEJB = ["+ retString + "]");
}
}
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -end
sql = "Select count(*) From sreturndet Where tran_id = ? and ret_rep_flag = 'P'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,msalereturn );
......@@ -2327,6 +2307,29 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
}
}
String ediOption = "";
System.out.println("<-----------Edi Code calling ------>");
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -Start
if(!("Y".equalsIgnoreCase(ls_channel_partner)) && "1".equals(ediOption) || (merrcode == null || merrcode.trim().length() == 0))
{
System.out.println("merrcode[+"+merrcode+"]");
CreateRCPXML createRCPXML = new CreateRCPXML("w_salesreturn_retn", "tran_id");
dataStr = createRCPXML.getTranXML(msalereturn, conn);
System.out.println("dataStr =[ " + dataStr + "]");
Document ediDataDom = genericUtility.parseString(dataStr);
System.out.println("xtraParams:["+xtraParams+"]");
E12GenerateEDIEJB e12GenerateEDIEJB = new E12GenerateEDIEJB();
retString = e12GenerateEDIEJB.nfCreateEdiMultiLogic(ediDataDom,"w_salesreturn_retn", xtraParams);
System.out.println("retString from E12GenerateEDIEJB before = ["+ retString + "]");
if (retString != null && "SUCCESS".equalsIgnoreCase(retString))
{
System.out.println("retString from E12GenerateEDIEJB = ["+ retString + "]");
}
}
//Added by Arun p 31-10-17 for generate edi outbond data when edi medium=4 and edi medium=1 -end
System.out.println("<-----------Edi Code ending ------>");
}
catch(Exception e)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment