Skip to content

B
business-java
Commit 184ca1fd authored by prane's avatar prane
Browse files
Options

validation of comparing rate between min_rate and max_rate for list_type = "I" also in sales order 

and Taxes should be set based on itemchanged on cust_code__dlv

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203225 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1bea3957
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 184ca1fd
......@@ -3521,14 +3521,14 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt.close();
pstmt = null;
if (rate < lcMinRate && !"B".equalsIgnoreCase(lsListType)) {
if (rate < lcMinRate && ( !"B".equalsIgnoreCase(lsListType) || ! "I".equalsIgnoreCase(lsListType))) {
errCode = "VTRATE3";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
System.out.println(
"There are no contracts pending for release,as per the specified parameters");
}
if (rate > lcMaxRate && !"B".equalsIgnoreCase(lsListType)) {
if (rate > lcMaxRate && ( !"B".equalsIgnoreCase(lsListType) || ! "I".equalsIgnoreCase(lsListType))) {
errCode = "VTRATE8";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
......@@ -3823,7 +3823,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("lcMaxRate P : "+lcMaxRate);
System.out.println("lcMinRate P : "+lcMinRate);
if(! lsListType.equalsIgnoreCase("B"))
if(! lsListType.equalsIgnoreCase("B") || ! lsListType.equalsIgnoreCase("I"))
{
System.out.println("Inside wfvaldata of rate__clg");
if (lcRateClg < lcMinRate) {
......@@ -6915,7 +6915,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
String custName = "", addr1 = "", addr2 = "", addr3 = "", city = "", pin = "", countCode = "",
stanCode = "", tranCode = "", stateCode = "", tele1 = "", tele2 = "", tele3 = "", fax1 = "",
tranName = "", frtTerm = "", lsEmpCodeOrd = "", lsEmpCodeOrd1 = "";
String lsFname = "", lsLname = "", lsPendingOrder = "";
String lsFname = "", lsLname = "", lsPendingOrder = "", custCodeBill="";
lsCustCodeDlv = genericUtility.getColumnValue("cust_code__dlv", dom);
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
System.out.println("Inside Cust Code DLV Validation::"+lsCustCodeDlv);
......@@ -7040,7 +7040,6 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<employee_emp_lname>").append("<![CDATA[" + lsLname + "]]>")
.append("</employee_emp_lname>");
}
sql = "select descr from station where stan_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, stanCode);
......@@ -7054,7 +7053,64 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
pstmt = null;
valueXmlString.append("<station_descr>").append("<![CDATA[" + descr + "]]>")
.append("</station_descr>");
//Pavan Rane 10jul19 start [to Tax_env on Cust_code__dlv]
siteCodeShip = checkNull(genericUtility.getColumnValue("site_code__ship", dom));
orderType = checkNull(genericUtility.getColumnValue("order_type",dom));
custCodeBill = checkNull(genericUtility.getColumnValue("cust_code__bil", dom));
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"));
}
rs.close();rs = null;
pstmt.close();pstmt = null;
if(custTaxOpt == null || custTaxOpt.trim().length() == 0 || "null".equals(custTaxOpt))
{
custTaxOpt = "0";
}
System.out.println("cust_code__dlv::custTaxOpt["+custTaxOpt+"]custCodeDlv["+lsCustCodeDlv+"]custCodeBill["+custCodeBill+"]orderType["+orderType+"]");
sql = "select stan_code from site where site_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCodeShip);
rs = pstmt.executeQuery();
if (rs.next()) {
stanCodeFr = rs.getString("stan_code");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
sql = "select stan_code from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql);
if("1".equals(custTaxOpt)) {
pstmt.setString(1, custCodeBill);
custCodeTax = custCodeBill;
}else if("0".equals(custTaxOpt)) {
pstmt.setString(1, lsCustCodeDlv);
custCodeTax = lsCustCodeDlv;
}
rs = pstmt.executeQuery();
if (rs.next()) {
stanCodeTo = rs.getString("stan_code");
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
taxChapHdr = distCommon.getTaxChap("", lsItemser, "C", custCodeTax, siteCodeShip, conn);
taxClassHdr = distCommon.getTaxClass("C", custCodeTax, "", siteCodeShip, conn);
taxEnvHdr = distCommon.getTaxEnv(stanCodeFr, stanCodeTo, taxChapHdr, taxClassHdr, siteCodeShip, conn);
System.out.println("cust_code__dlv::taxChapHdr["+taxChapHdr+"]taxClassHdr["+taxClassHdr+"]taxEnvHdr["+taxEnvHdr+"]");
valueXmlString.append("<tax_class>").append("<![CDATA[" + taxClassHdr + "]]>").append("</tax_class>");
setNodeValue(dom, "tax_class", getAbsString(taxClassHdr));
valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxChapHdr + "]]>").append("</tax_chap>");
setNodeValue(dom, "tax_chap", getAbsString(taxChapHdr));
valueXmlString.append("<tax_env>").append("<![CDATA[" + taxEnvHdr + "]]>").append("</tax_env>");
setNodeValue(dom, "tax_env", getAbsString(taxEnvHdr));
//Pavan Rane 10jul19 end
sql = "select tran_name, (case when frt_term is null then 'B' else frt_term end) as frt_term from transporter where tran_code = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
......
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