Commit 73a206d0 authored by msalla's avatar msalla

Purchase return tax mapping issue

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@206023 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 960c8079
...@@ -14,6 +14,7 @@ import ibase.webitm.ejb.*; ...@@ -14,6 +14,7 @@ import ibase.webitm.ejb.*;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import javax.ejb.Stateless;//added for ejb3 import javax.ejb.Stateless;//added for ejb3
import ibase.webitm.ejb.ActionHandlerEJB; import ibase.webitm.ejb.ActionHandlerEJB;
import ibase.webitm.ejb.dis.DistCommon;
@Stateless @Stateless
...@@ -65,9 +66,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -65,9 +66,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
{ {
System.out.println("Getting Connection From Database......"); System.out.println("Getting Connection From Database......");
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 09-06-2016 :START //Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END //Changes and Commented By Bhushan on 09-06-2016 :END
conn.setAutoCommit(false); conn.setAutoCommit(false);
System.out.println("Connection Established......"); System.out.println("Connection Established......");
...@@ -182,16 +183,20 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -182,16 +183,20 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
double amtDec=0.0; double amtDec=0.0;
double baseValue = 0.00; double baseValue = 0.00;
String merrcode = ""; String merrcode = "";
PreparedStatement pstmt =null; PreparedStatement pstmt =null,pstmt1=null;
ResultSet rs = null; ResultSet rs = null,rs1=null;
String fileNo = ""; String fileNo = "";
String advCurrCode = ""; String advCurrCode = "";
String ls_adv_lic = ""; String ls_adv_lic = "";
//String qty = ""; //String qty = "";
String allocqty = ""; String allocqty = "";
double avl =0.00; double avl =0.00;
String ls_allowtax="";
String mtaxclass="",mtaxchap="",mtaxenv="",purcOrder="",poLineno="",retopt="";
try try
{ {
DistCommon disscommon = new DistCommon();
String detCnt = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"detCnt"); String detCnt = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"detCnt");
System.out.println("detCnt ...... :"+detCnt); System.out.println("detCnt ...... :"+detCnt);
String siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode"); String siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginSiteCode");
...@@ -199,9 +204,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -199,9 +204,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
if(conn==null) if(conn==null)
{ {
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
//Changes and Commented By Bhushan on 09-06-2016 :START //Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END //Changes and Commented By Bhushan on 09-06-2016 :END
connDriver=null; connDriver=null;
} }
...@@ -214,10 +219,14 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -214,10 +219,14 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
{ {
itemCode = genericUtility.getColumnValue("item_code",dom); itemCode = genericUtility.getColumnValue("item_code",dom);
itemCode = itemCode == null ? "" :itemCode.trim(); itemCode = itemCode == null ? "" :itemCode.trim();
//added by monika-23 august 2019
purcOrder= genericUtility.getColumnValue("purc_order",dom1);
poLineno= genericUtility.getColumnValue("line_no",dom);
retopt = genericUtility.getColumnValue("ret_opt", dom1);//end
} }
System.out.println("itemCode>>>>>>>>>>>>>>>>"+itemCode);
System.out.println("siteCode>>>>>>>>>>>>>>>>"+siteCode);
sql = " SELECT stock.site_code , site.descr , " sql = " SELECT stock.site_code , site.descr , "
+" stock.item_code as item_code,item.descr as item_descr , " +" stock.item_code as item_code,item.descr as item_descr , "
+" stock.loc_code , stock.lot_no , " +" stock.loc_code , stock.lot_no , "
...@@ -243,7 +252,40 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -243,7 +252,40 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
//if(rs.next())
{ {
//addedd by monika-23 aug 2019- to add tax chap tax env and tax class
//String isnull=null;
if (retopt.equalsIgnoreCase("C"))
{
ls_allowtax = "Y";
} else {
ls_allowtax = disscommon.getDisparams("999999",
"CALC_TAX_ON_REPLACE", conn);
}
if (ls_allowtax.equalsIgnoreCase("Y")) {
sql = "select tax_class,tax_chap,tax_env "
+ " from porddet "
+ " where purc_order = ? and line_no = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,purcOrder);//
pstmt1.setString(2, poLineno);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
mtaxclass =rs1.getString("tax_class");
mtaxchap =rs1.getString("tax_chap");
mtaxenv = rs1.getString("tax_env");
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
qty = rs.getString(11)== null?"0.00":rs.getString(11); qty = rs.getString(11)== null?"0.00":rs.getString(11);
allocqty = rs.getString(12)== null?"0.00":rs.getString(12); allocqty = rs.getString(12)== null?"0.00":rs.getString(12);
avl = Double.parseDouble(qty)-Double.parseDouble(allocqty) ; avl = Double.parseDouble(qty)-Double.parseDouble(allocqty) ;
...@@ -264,6 +306,11 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -264,6 +306,11 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
valueXmlString.append("<supp_code__mfg>").append("<![CDATA[").append(rs.getString(18)==null ?"":rs.getString(18)).append("]]>").append("</supp_code__mfg>\r\n"); valueXmlString.append("<supp_code__mfg>").append("<![CDATA[").append(rs.getString(18)==null ?"":rs.getString(18)).append("]]>").append("</supp_code__mfg>\r\n");
valueXmlString.append("<batch_no>").append("<![CDATA[").append(rs.getString(16)==null ?"":rs.getString(16)).append("]]>").append("</batch_no>\r\n"); valueXmlString.append("<batch_no>").append("<![CDATA[").append(rs.getString(16)==null ?"":rs.getString(16)).append("]]>").append("</batch_no>\r\n");
valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(17)==null ?"":rs.getString(17)).append("]]>").append("</dimension>\r\n"); valueXmlString.append("<dimension>").append("<![CDATA[").append(rs.getString(17)==null ?"":rs.getString(17)).append("]]>").append("</dimension>\r\n");
//addedd by monika-23 aug 2019- to add tax chap tax env and tax class
valueXmlString.append("<tax_class>").append("<![CDATA[").append(mtaxclass).append("]]>").append("</tax_class>\r\n");
valueXmlString.append("<tax_chap>").append("<![CDATA[").append(mtaxchap).append("]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_env>").append("<![CDATA[").append(mtaxenv).append("]]>").append("</tax_env>");
//end
valueXmlString.append("</Detail>\r\n"); valueXmlString.append("</Detail>\r\n");
} }
rs.close(); rs.close();
...@@ -319,9 +366,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca ...@@ -319,9 +366,9 @@ public class GenStkHelpAct extends ActionHandlerEJB implements GenStkHelpActLoca
try try
{ {
//Changes and Commented By Bhushan on 09-06-2016 :START //Changes and Commented By Bhushan on 09-06-2016 :START
//conn = connDriver.getConnectDB("DriverITM"); //conn = connDriver.getConnectDB("DriverITM");
conn = getConnection(); conn = getConnection();
//Changes and Commented By Bhushan on 09-06-2016 :END //Changes and Commented By Bhushan on 09-06-2016 :END
stmt = conn.createStatement(); stmt = conn.createStatement();
userId = new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginCode");//Added by Alka on 31/05/2007 userId = new ibase.utility.E12GenericUtility().getValueFromXTRA_PARAMS(xtraParams, "loginCode");//Added by Alka on 31/05/2007
......
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