Skip to content

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

Client Request ID-D17FSHL001 Client name-SYNCOM 

Added tax_class ,tax_chap,tax_env

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@171815 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9136332e
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 32 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java
View file @ 5a2830fa
......@@ -478,7 +478,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
if(updCnt > 0)
{
///// added by arun pal 06-OCT-2017
///// added by arun pal 12-OCT-2017
System.out.println("channel Partner configuration ");
errString=confirmSaleOrder(saleOrder,xtraParams,conn);
System.out.println("confirmSaleOrder error code >>>"+errString);
......@@ -536,8 +536,8 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
System.out.println("@@@@@@@ channel partner in "+channelPartner);
String pItemCode="",plineNo="",pItemFlg="",pUnit="",pUnitStd="",pItemCodeOrd="",pNature="",plineNoContr="",pDspDate="",acctCodeCr=null,acctCodeDr=null,cctrCodeCr=null;
String taxEnv="" , pStatus="",locCode="",ppackCode="",pspecRef="",cctrCodeDr=null;
double pQuantityStduom=0,pConvQtyStduom=0,pRate=0,taxAmt=0,ptotAmt=0,pDiscount=0,pnoArt=0,prateClg=0,prateStd=0;
String ptaxEnv="" , pStatus="",locCode="",ppackCode="",pspecRef="",cctrCodeDr=null,ptaxClass="",ptaxChap="";
double pQuantityStduom=0,pConvQtyStduom=0,pRate=0,taxAmt=0,ptotAmt=0,pDiscount=0,pnoArt=0,prateClg=0,prateStd=0,ptaxAmt=0;
String custItemRef="";
Timestamp pDspDate1=null, pstatusDate=null,reqDate=null,dlvDate=null;
int lineNoSo=0;
......@@ -567,7 +567,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
lineNoSo=rs1.getInt(1);
System.out.println("@@@@ lineNoSo"+lineNoSo);
sql="select line_no,SITE_CODE,TAX_AMT,TAX_ENV,LOC_CODE,REQ_DATE ,DLV_DATE,STATUS,ACCT_CODE__DR,ACCT_CODE__CR,CCTR_CODE__CR,CCTR_CODE__DR from porddet where purc_order=? and line_no=? ";
sql="select line_no,SITE_CODE,LOC_CODE,REQ_DATE ,DLV_DATE,STATUS,ACCT_CODE__DR,ACCT_CODE__CR,CCTR_CODE__CR,CCTR_CODE__DR from porddet where purc_order=? and line_no=? ";
//sql1="select line_no from porddet where purc_order=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder );
......@@ -575,19 +575,20 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("sql"+sql);
lineNoPo=rs.getString(1);
siteCode=rs.getString(2);
taxAmt=rs.getDouble(3);
//taxAmt=rs.getDouble(3);
//totAmt=rs.getDouble(3);
taxEnv=rs.getString(4);
locCode=rs.getString(5);
reqDate=rs.getTimestamp(6);
dlvDate=rs.getTimestamp(7);
pStatus=rs.getString(8);
acctCodeDr=rs.getString(9);
acctCodeCr=rs.getString(10);
cctrCodeCr=rs.getString(11);
cctrCodeDr=rs.getString(12);
//taxEnv=rs.getString(3);
locCode=rs.getString(3);
reqDate=rs.getTimestamp(4);
dlvDate=rs.getTimestamp(5);
pStatus=rs.getString(6);
acctCodeDr=rs.getString(7);
acctCodeCr=rs.getString(8);
cctrCodeCr=rs.getString(9);
cctrCodeDr=rs.getString(10);
System.out.println("@@@@@@@@ lineNoPo"+lineNoPo);
......@@ -610,7 +611,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
sql="SELECT sale_order, line_no, site_code, item_code, item_code__ord, item_flg, " +
"quantity, unit, line_no__contr, unit__std, quantity__stduom, dsp_date, rate, " +
"min_shelf_life, max_shelf_life, cust_item__ref, nature, conv__qty_stduom,NET_AMT," +
"STATUS_DATE,DISCOUNT,NO_ART,PACK_CODE,RATE__CLG,SPEC_REF,RATE__STD FROM" +
"STATUS_DATE,DISCOUNT,NO_ART,PACK_CODE,RATE__CLG,SPEC_REF,RATE__STD,TAX_CLASS ,TAX_CHAP,TAX_ENV FROM" +
" sorddet WHERE sale_order = ? and line_no=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
......@@ -644,6 +645,13 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
prateClg= rs.getDouble("RATE__CLG");
pspecRef=rs.getString("SPEC_REF");
prateStd= rs.getDouble("RATE__STD");
//ptaxAmt= rs.getDouble("TAX_AMT");
ptaxClass=rs.getString("TAX_CLASS");
ptaxChap=rs.getString("TAX_CHAP");
ptaxEnv=rs.getString("TAX_ENV");
System.out.println("sql"+sql);
......@@ -656,8 +664,9 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
sql="Insert into porddet(PURC_ORDER,LINE_NO,SITE_CODE,ITEM_CODE,QUANTITY,UNIT,"+
"RATE,CONV__QTY_STDUOM,CONV__RTUOM_STDUOM,UNIT__STD,QUANTITY__STDUOM,ACCT_CODE__DR,ACCT_CODE__CR,"+
"CCTR_CODE__CR,TAX_AMT,TAX_ENV,TOT_AMT,STATUS,DISCOUNT,LOC_CODE,REQ_DATE ,DLV_DATE,NO_ART,PACK_CODE,RATE__CLG,SPEC_REF,STD_RATE,CCTR_CODE__DR)"+
"values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
"CCTR_CODE__CR,TOT_AMT,STATUS,DISCOUNT,LOC_CODE,REQ_DATE ,DLV_DATE,NO_ART," +
"PACK_CODE,RATE__CLG,SPEC_REF,STD_RATE,CCTR_CODE__DR,TAX_CLASS ,TAX_CHAP,TAX_ENV)"+
"values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
// System.out.println("@@@@ inserted in"+sql);// where purc_order=? and line_no=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
......@@ -675,21 +684,26 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
pstmt.setString(12, acctCodeDr);
pstmt.setString(13, acctCodeCr);
pstmt.setString(14, cctrCodeCr);
pstmt.setDouble(15, taxAmt);
//pstmt.setDouble(15, taxAmt);
//pstmt.setDouble(16, totAmt);
pstmt.setString(16, taxEnv);
pstmt.setDouble(17, ptotAmt);
pstmt.setString(18, pStatus);
pstmt.setDouble(19, pDiscount);
pstmt.setString(20, locCode);
pstmt.setTimestamp(21, reqDate);
pstmt.setTimestamp(22, dlvDate);
pstmt.setDouble(23, pnoArt);
pstmt.setString(24, ppackCode);
pstmt.setDouble(25, prateClg);
pstmt.setString(26, pspecRef);
pstmt.setDouble(27, prateStd);
pstmt.setString(28, cctrCodeDr);
//pstmt.setString(16, ptaxEnv);
pstmt.setDouble(15, ptotAmt);
pstmt.setString(16, pStatus);
pstmt.setDouble(17, pDiscount);
pstmt.setString(18, locCode);
pstmt.setTimestamp(19, reqDate);
pstmt.setTimestamp(20, dlvDate);
pstmt.setDouble(21, pnoArt);
pstmt.setString(22, ppackCode);
pstmt.setDouble(23, prateClg);
pstmt.setString(24, pspecRef);
pstmt.setDouble(25, prateStd);
pstmt.setString(26, cctrCodeDr);
pstmt.setString(27, ptaxClass);
pstmt.setString(28, ptaxChap);
pstmt.setString(29, ptaxEnv);
//pstmt.setDouble(30, ptaxAmt);
//TAX_AMT
rs = pstmt.executeQuery();
......@@ -704,7 +718,7 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
}
}//end else if
///ended by arun pal 06-OCT-2017
///ended by arun pal 12-OCT-2017
/*errString=confirmSaleOrder(saleOrder,xtraParams,conn); */
System.out.println("confirmSaleOrder error code >>>"+errString);
......
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