Skip to content

B
business-java
Commit 93c3903e authored by prane's avatar prane
Browse files
Options

to set cr_term on itemchanged of sold to,bil to and ord type on billto/dlvto logic 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@189384 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e4375905
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 23 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 93c3903e
......@@ -3567,7 +3567,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
mPriceListClg = "", lsCommPerc1 = "", lsCommPerc2 = "";
String mPriceList = "", lsFinscheme = "", lsCommTable2 = "", lsDisLink = "", lsChannelPartner = "";
String ContractNo = "", lsCommPercOn = "";
String taxClassHdr="", taxChapHdr="",taxEnvHdr="", siteCodeShip="",stanCodeFr="",stanCodeTo="",custCodeDlv="", custTaxOpt="",custCodeTax="",orderType="";
String taxClassHdr="", taxChapHdr="",taxEnvHdr="", siteCodeShip="",stanCodeFr="",stanCodeTo="",custCodeDlv="", custTaxOpt="",custCodeTax="",orderType="",custCodeBill1="";
//Added by mayur on 26-July-2018---[start]
String billAddr1 = "",billAddr2 = "",billAddr3 = "",billCity = "",stateCode1 = "",billPin = "",
cstNoBill = "",drugLicNo = "",drugLicNo1 = "",drugLicNo2 = "",lstNoBill = "";
......@@ -3789,6 +3789,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
lsCustCodeDlv = checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
custCodeBill1 = checkNull(genericUtility.getColumnValue("cust_code__bil", dom));
sql = "select descr,available_yn from sordertype where order_type = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -3856,10 +3857,31 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append(reStr);
}
sql = "select cust_tax_opt from sordertype where order_type = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsOrderType);
rs = pstmt.executeQuery();
if (rs.next()) {
custTaxOpt = checkNull(rs.getString("cust_tax_opt"));
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(custTaxOpt == null || custTaxOpt.trim().length() == 0 || "null".equals(custTaxOpt))
{
custTaxOpt = "0";
}
System.out.println("Inside OrderType itemchanged..."+lsOrderType);
if (lsOrderType != null && lsOrderType.equalsIgnoreCase("NP")) {
sql = "select cr_term__np from customer_series where cust_code =? and item_ser = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode); //changed by Pavan R on 16aug18 [to set cr_term on billto/dlvto]
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill1);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, lsCustCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -3873,7 +3895,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrTermNp == null || mcrTermNp.trim().length() == 0) {
sql = "select cr_term__np from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill1);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, lsCustCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTermNp = rs.getString("cr_term__np");
......@@ -3919,7 +3946,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrterm == null || mcrterm.trim().length() == 0) {
sql = "select cr_term from customer_series where cust_code =? and item_ser =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill1);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, lsCustCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -5372,10 +5404,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
}
}
}
System.out.println("Inside cust_code__bil....lbOrdFlag["+lbOrdFlag+"]");
if (lbOrdFlag) {
sql = "select cr_term from customer_series where cust_code = ? and item_ser= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode); //changed by Pavan R on 16aug18 [to set cr_term on billto/dlvto]
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -5389,7 +5427,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrTerm == null || mcrTerm.trim().length() == 0) {
sql = "select cr_term from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTerm = rs.getString("cr_term");
......@@ -5402,7 +5445,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} else {
sql = "select cr_term from customer_series where cust_code = ? and item_ser= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -5416,7 +5464,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrTerm == null || mcrTerm.trim().length() == 0) {
sql = "select cr_term from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsCustCode);
//pstmt.setString(1, lsCustCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTerm = rs.getString("cr_term");
......@@ -5430,7 +5483,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (!lbOrdFlag) {
sql = "select cr_term from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1, custCodeBill);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTerm = rs.getString("cr_term");
......@@ -6104,17 +6162,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
maddr3 = "", mTransMode = "", mstate = "", lsSingleLot = "";
String mcurr = "", mbankCode = "", mrcpMode = "", lsChqName = "", lsCurrcdFrt = "",
lsCurrcdIns = "", mcurrdescr = "", lsEmailAddr = "", lsFrtterm = "";
String lsDescrCl = "";
String lsDescrCl = "", orderTypeLs="";
double mNum = 0.00;
custCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
System.out.println("custCode getting from dom["+custCode+"]");
lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom));
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
custCodeDlv = checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
lsOrdtypeSample = distCommon.getDisparams("999999", "SAMPLE_ORDER_TYPE", conn);
//changes to get cust_code in
sql = "select cust_code__bil, cust_name from customer where cust_code =? ";
sql = "select cust_code__bil, cust_name, order_type from customer where cust_code =? ";
System.out.println("sql["+sql+"]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -6122,6 +6180,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (rs.next()) {
mbillto = checkNull(rs.getString("cust_code__bil"));
custName = checkNull(rs.getString("cust_name"));
orderTypeLs = checkNull(rs.getString("order_type"));
}
rs.close();
rs = null;
......@@ -6170,7 +6229,34 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs = null;
pstmt.close();
pstmt = null;
custCodeDlv = checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
orderType = checkNull(genericUtility.getColumnValue("order_type",dom));
//if condition added to check if initially null from dom
if(orderType == null || orderType.trim().length() == 0)
{
orderType = orderTypeLs;
}
if(custCodeDlv == null || custCodeDlv.trim().length() == 0)
{
custCodeDlv = custCode;
}
System.out.println("6244orderType::["+orderType+"]custCodeDlv["+custCodeDlv+"]");
sql = "select cust_tax_opt from sordertype where order_type = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, orderType);
rs = pstmt.executeQuery();
if (rs.next()) {
custTaxOpt = checkNull(rs.getString("cust_tax_opt"));
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
if(custTaxOpt == null || custTaxOpt.trim().length() == 0 || "null".equals(custTaxOpt))
{
custTaxOpt = "0";
}
System.out.println("inside cust_code itemchanged::6251");
sql = "select terr_code from customer_series where cust_code =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -6272,10 +6358,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
}
}
}
System.out.println("lbOrdFlag...6353["+lbOrdFlag+"]");
if (lbOrdFlag) {
sql = "select cr_term from customer_series where cust_code = ? and item_ser= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
//pstmt.setString(1, custCode); //changed by Pavan R on 16aug18 start [to set cr_term on billto/dlvto]
if("1".equals(custTaxOpt)) {
pstmt.setString(1, mbillto);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -6289,7 +6381,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrTerm == null || mcrTerm.trim().length() == 0) {
sql = "select cr_term from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
//pstmt.setString(1, custCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, mbillto);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTerm = rs.getString("cr_term");
......@@ -6302,7 +6399,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} else {
sql = "select cr_term from customer_series where cust_code = ? and item_ser= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
//pstmt.setString(1, custCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, mbillto);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
pstmt.setString(2, lsItemser);
rs = pstmt.executeQuery();
if (rs.next()) {
......@@ -6316,7 +6418,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (mcrTerm == null || mcrTerm.trim().length() == 0) {
sql = "select cr_term from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
//pstmt.setString(1, custCode);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, mbillto);
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, custCodeDlv);
}
rs = pstmt.executeQuery();
if (rs.next()) {
mcrTerm = rs.getString("cr_term");
......@@ -6393,7 +6500,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
// lsOrderType = checkNull(genericUtility.getColumnValue("order_type", dom1));
System.out.println("lsCrTerm"+lsCrTerm);
sql = "SELECT CR_TERM_MAPPING.CR_TERM_MAP FROM CR_TERM_MAPPING"
+ " WHERE ( CR_TERM_MAPPING.CR_TERM = ? ) AND ( CR_TERM_MAPPING.ORD_TYPE = ?) ";
pstmt = conn.prepareStatement(sql);
......@@ -6572,13 +6679,13 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close();
rs = null;
//added by Pavan R on 11jun2k18 [to set taxes based on a cust_tax_opt parameter in order type]
custCodeDlv = checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
//custCodeDlv = checkNull(genericUtility.getColumnValue("cust_code__dlv", dom));
taxClassHdr = checkNull(genericUtility.getColumnValue("tax_class", dom));
taxChapHdr = checkNull(genericUtility.getColumnValue("tax_chap", dom));
taxEnvHdr = checkNull(genericUtility.getColumnValue("tax_env", dom));
mItemSer = checkNull(genericUtility.getColumnValue("item_ser", dom));
orderType = checkNull(genericUtility.getColumnValue("order_type",dom));
sql = "select cust_tax_opt from sordertype where order_type = ? ";
//orderType = checkNull(genericUtility.getColumnValue("order_type",dom));
/*sql = "select cust_tax_opt from sordertype where order_type = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, orderType);
rs = pstmt.executeQuery();
......@@ -6593,6 +6700,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
{
custTaxOpt = "0";
}
*/
System.out.println("cust_code::custTaxOpt["+custTaxOpt+"]custCodeDlv["+custCodeDlv+"]mbillto["+mbillto+"]orderType["+orderType+"]");
sql = "select stan_code from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
......
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