Commit 4c1e1fc1 authored by kshinde's avatar kshinde

Invoice Cancel confirm bug fix.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@196725 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d8b595b4
......@@ -26,6 +26,7 @@ import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.dis.adv.SalesReturnConfirm;
import ibase.webitm.ejb.fin.adv.UndoRecievableAdjConfLocal;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.wms.CommonWmsUtil;
......@@ -47,10 +48,11 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
String retString = "",sql = "";
boolean isError = false;
Connection conn = null;
PreparedStatement pstmt = null,pstmtInsert = null;
ResultSet rs = null;
PreparedStatement pstmt = null,pstmtInsert = null,pstmt1=null;
ResultSet rs = null,rs1=null;
int cnt = 0;
String confirmed = "",userInfo = "",orderDate = "";
String itemSer="",custCode="",lotNo="",rate="",lotSl="",locCode="",despID="",despLineNo="";
double refBalAmount = 0,totAmt = 0, adjAmt = 0;
try
......@@ -151,6 +153,17 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
orderDate = getCurrdateAppFormat();
retString = undoRecAdjustment(invoiceID, xtraParams,forcedFlag, conn);
sql = "Select item_ser,cust_code from invoice where invoice_id = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceID);
rs = pstmt.executeQuery();
if(rs.next())
{
itemSer=rs.getString("item_ser");
custCode=rs.getString("cust_code");
}
pstmt.close();pstmt=null;
rs.close();rs=null;
StringBuffer xmlString = new StringBuffer();
StringBuffer xmlStringDet = new StringBuffer();
......@@ -178,6 +191,9 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
xmlStringHdr.append("<tran_date><![CDATA[").append(orderDate).append("]]></tran_date>");
xmlStringHdr.append("<tran_type><![CDATA[").append("FOR").append("]]></tran_type>");
xmlStringHdr.append("<invoice_id><![CDATA[").append(invoiceID).append("]]></invoice_id>");
xmlStringHdr.append("<item_ser><![CDATA[").append(itemSer).append("]]></item_ser>");
xmlStringHdr.append("<cust_code><![CDATA[").append(custCode).append("]]></cust_code>");
xmlStringHdr.append("<cust_ref><![CDATA[").append("TEST").append("]]></cust_ref>");
xmlStringHdr.append("<site_code><![CDATA[").append(loginSiteCode).append("]]></site_code>");
xmlStringHdr.append("<full_ret><![CDATA[").append("Y").append("]]></full_ret>");
xmlStringHdr.append("<udf_str1><![CDATA[").append("MIN_RATE_HIST_NO").append("]]></udf_str1>");
......@@ -187,7 +203,13 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
String lineNoOrd = "",refSer = "",itemCode = "",quantity = "",lineNoInvoice = "";
int domID = 0;
sql = " SELECT D.LINE_NO,D.ITEM_CODE,D.QUANTITY FROM INVOICE H,INVOICE_TRACE D WHERE H.INVOICE_ID = D.INVOICE_ID AND H.INVOICE_ID = ? ";
//sql = " SELECT D.LINE_NO,D.ITEM_CODE,D.QUANTITY FROM INVOICE H,INVOICE_TRACE D WHERE H.INVOICE_ID = D.INVOICE_ID AND H.INVOICE_ID = ? ";
sql ="SELECT INV_LINE_NO, LOT_NO, LOT_SL, QUANTITY, ITEM_CODE, RATE, "+
" RATE__STDUOM, DISCOUNT, "+
" DESP_ID, DESP_LINE_NO, LINE_NO "+ //Added on 08/06/06 as code changes in PB
" FROM INVOICE_TRACE WHERE INVOICE_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceID);
rs = pstmt.executeQuery();
......@@ -195,9 +217,25 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
{
domID++;
lineNoInvoice = rs.getString("LINE_NO");
lineNoInvoice = rs.getString("INV_LINE_NO");
itemCode = checkNullAndTrim(rs.getString("ITEM_CODE"));
quantity = checkNullAndTrim(rs.getString("QUANTITY"));
lotNo = rs.getString("LOT_NO");
rate = rs.getString("RATE");
lotSl = rs.getString("LOT_SL");
despID = rs.getString("DESP_ID");
despLineNo = rs.getString("DESP_LINE_NO");
String sql1 = "SELECT LOC_CODE FROM DESPATCHDET WHERE DESP_ID = '"+despID+"' AND LTRIM(RTRIM(LINE_NO)) = LTRIM(RTRIM('"+despLineNo+"'))";
pstmt1 = conn.prepareStatement(sql1);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
locCode = rs1.getString("LOC_CODE");
}
pstmt1.close();pstmt1=null;
rs1.close();rs1=null;
xmlStringDet.append("<Detail2 dbID=':' domID='"+ domID +"' objName='salesreturn_retn' objContext='2'>");
xmlStringDet.append("<attribute pkNames='tran_id:line_no:' status='N' updateFlag='A' selected='N'/>");
......@@ -209,10 +247,16 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
xmlStringDet.append("<line_no><![CDATA[").append(lineNoOrd).append("]]></line_no>");
xmlStringDet.append("<invoice_id><![CDATA[").append(invoiceID).append("]]></invoice_id>");
xmlStringDet.append("<line_no__invtrace><![CDATA[").append(lineNoInvoice).append("]]></line_no__invtrace>");
xmlStringDet.append("<line_no__inv><![CDATA[").append(lineNoInvoice).append("]]></line_no__inv>");
xmlStringDet.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>");
xmlStringDet.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>");
xmlStringDet.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
xmlStringDet.append("<lot_no>").append("<![CDATA[").append(lotNo).append("]]>").append("</lot_no>\r\n");
xmlStringDet.append("<lot_sl>").append("<![CDATA[").append(lotSl).append("]]>").append("</lot_sl>\r\n");
xmlStringDet.append("<loc_code>").append("<![CDATA[").append(locCode).append("]]>").append("</loc_code>\r\n");
xmlStringDet.append("<ret_rep_flag><![CDATA[").append("R").append("]]></ret_rep_flag>");
xmlStringDet.append("</Detail2>");
}
......@@ -230,7 +274,8 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
xmlString.append("</Header0></group0></DocumentRoot>");
System.out.println("@@xmlString For generation Sales Return:: "+xmlString.toString());
masterStatefulLocal = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
/* masterStatefulLocal = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
if(xtraParams == null)
{
......@@ -238,10 +283,13 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
}
userInfo = getUserInfo(xtraParams);
retString = masterStatefulLocal.processRequest(userInfo, xmlString.toString(), true, conn);
retString = masterStatefulLocal.processRequest(userInfo, xmlString.toString(), true, conn);*/
retString = saveData(xtraParams,loginSiteCode,xmlString.toString(),conn);
System.out.println("@@Sales Return return string"+retString);
if ( retString.indexOf("Success") > -1 && retString.indexOf("<TranID>") > 0 )
{
String tranIDSreturn = retString.substring( retString.indexOf("<TranID>")+8, retString.indexOf("</TranID>"));
......@@ -304,7 +352,8 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
}
else
{
throw new Exception(retString);
isError=true;
return retString;
}
}
......@@ -832,4 +881,52 @@ public class InvoiceCancelEJB extends ActionHandlerEJB implements InvoiceCancelE
return s;
}
private String saveData(String xtraParams,String siteCode, String xmlString, Connection conn) throws ITMException
{
System.out.println("saving data...........");
InitialContext ctx = null;
String retString = null;
String userId =""; //Added By PriyankaC on 15/03/2018. [START]
MasterStatefulLocal masterStateful = null; // for ejb3
E12GenericUtility genericUtility=new E12GenericUtility();
ibase.utility.UserInfoBean userInfoBean=new UserInfoBean();
try
{
//Added By PriyankaC on 15/03/2018. [START]
userId = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode");
System.out.println("userId" + userId + "]");
//Added By PriyankaC on 15/03/2018. [END]
AppConnectParm appConnect = new AppConnectParm();
ctx = new InitialContext(appConnect.getProperty());
masterStateful = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String[] authencate = new String[2];
//authencate[0] = "";
authencate[0] = userId; //Changed By PriynkaC on 15/03/2018
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
userInfoBean.setEmpCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
userInfoBean.setRemoteHost(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId"));
userInfoBean.setSiteCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"));
userInfoBean.setLoginCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode"));
userInfoBean.setEntityCode(genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode"));
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString, true, conn);
} catch (ITMException itme)
{
System.out.println("ITMException :CreateDistOrder :saveData :==>");
throw itme;
} catch (Exception e)
{
e.printStackTrace();
System.out.println("Exception :CreateDistOrder :saveData :==>");
throw new ITMException(e);
}
return retString;
}
}
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