Commit 01eebe5f authored by mnair's avatar mnair

Updated changes in cust_code and cust_code__bil to set the item change of...

Updated changes in cust_code and cust_code__bil to set the item change of billing address base on the custcode

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188275 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 653111d4
...@@ -3567,6 +3567,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -3567,6 +3567,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
String mPriceList = "", lsFinscheme = "", lsCommTable2 = "", lsDisLink = "", lsChannelPartner = ""; String mPriceList = "", lsFinscheme = "", lsCommTable2 = "", lsDisLink = "", lsChannelPartner = "";
String ContractNo = "", lsCommPercOn = ""; 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="";
//Added by mayur on 26-July-2018---[start]
String billAddr1 = "",billAddr2 = "",billAddr3 = "",billCity = "",stateCode1 = "",billPin = "",
cstNoBill = "",drugLicNo = "",drugLicNo1 = "",drugLicNo2 = "",lstNoBill = "";
//Added by mayur on 26-July-2018---[end]
Timestamp ldPromDate = null, ldPordDate = null, ldUdfDate1 = null, ldPorderDate = null; Timestamp ldPromDate = null, ldPordDate = null, ldUdfDate1 = null, ldPorderDate = null;
Timestamp TranDateDet = null; Timestamp TranDateDet = null;
String dlvCity = "", state = "", countryCode = ""; // Added By PriyankaC on 27 JUNE 2017 String dlvCity = "", state = "", countryCode = ""; // Added By PriyankaC on 27 JUNE 2017
...@@ -5182,13 +5186,42 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5182,13 +5186,42 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
double mNum = 0.00; double mNum = 0.00;
custCodeBill = checkNull(genericUtility.getColumnValue("cust_code__bil", dom)); custCodeBill = checkNull(genericUtility.getColumnValue("cust_code__bil", dom));
sql = "select cust_name from customer where cust_code = ?"; System.out.println("custCodeBill getting from dom["+custCodeBill+"]");
//Added by mayur on 26-July-2018 -- [start]
//sql = "select cust_name from customer where cust_code = ?";
sql = "select cust_name,addr1,addr2,addr3,city,state_code,pin," +
"cst_no,lst_no,drug_lic_no,drug_lic_no_1,drug_lic_no_2 from customer where cust_code =? ";
System.out.println("sql ["+sql+"]");
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCodeBill); pstmt.setString(1, custCodeBill);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
custName = rs.getString("cust_name"); custName = rs.getString("cust_name");
billAddr1 = rs.getString("addr1");
billAddr2 = rs.getString("addr2");
billAddr3 = rs.getString("addr3");
billCity = rs.getString("city");
stateCode1 = rs.getString("state_code");
billPin = rs.getString("pin");
cstNoBill = rs.getString("cst_no");
lstNoBill = rs.getString("lst_no");
drugLicNo = rs.getString("drug_lic_no");
drugLicNo1 = rs.getString("drug_lic_no_1");
drugLicNo2 = rs.getString("drug_lic_no_2");
System.out.println("custName["+custName+"]");
System.out.println("billAddr1["+billAddr1+"]");
System.out.println("billAddr2["+billAddr2+"]");
System.out.println("billAddr3["+billAddr3+"]");
System.out.println("billCity["+billCity+"]");
System.out.println("stateCode["+stateCode1+"]");
System.out.println("billPin["+billPin+"]");
System.out.println("cstNoBill["+cstNoBill+"]");
System.out.println("lstNoBill["+lstNoBill+"]");
System.out.println("drugLicNo["+drugLicNo+"]");
System.out.println("drugLicNo1["+drugLicNo1+"]");
System.out.println("drugLicNo2["+drugLicNo2+"]");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -5267,6 +5300,52 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -5267,6 +5300,52 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</cust_name__bil>"); .append("</cust_name__bil>");
setNodeValue(dom, "cust_name__bil", getAbsString(custName)); setNodeValue(dom, "cust_name__bil", getAbsString(custName));
//Added by mayur on 26-July-2018 -- [start]--to get the billing details populated when the cust code bill is manually set
valueXmlString.append("<bill_addr1>").append("<![CDATA[" + billAddr1 + "]]>")
.append("</bill_addr1>");
setNodeValue(dom, "bill_addr1", getAbsString(billAddr1));
valueXmlString.append("<bill_addr2>").append("<![CDATA[" + billAddr2 + "]]>")
.append("</bill_addr2>");
setNodeValue(dom, "bill_addr2", getAbsString(billAddr2));
valueXmlString.append("<bill_addr3>").append("<![CDATA[" + billAddr3 + "]]>")
.append("</bill_addr3>");
setNodeValue(dom, "bill_addr3", getAbsString(billAddr3));
valueXmlString.append("<bill_city>").append("<![CDATA[" + billCity + "]]>")
.append("</bill_city>");
setNodeValue(dom, "bill_city", getAbsString(billCity));
valueXmlString.append("<state_code__bill>").append("<![CDATA[" + stateCode1 + "]]>")
.append("</state_code__bill>");
setNodeValue(dom, "state_code__bill", getAbsString(stateCode1));
valueXmlString.append("<bill_pin>").append("<![CDATA[" + billPin + "]]>")
.append("</bill_pin>");
setNodeValue(dom, "bill_pin", getAbsString(billPin));
valueXmlString.append("<cst_no__bill>").append("<![CDATA[" + cstNoBill + "]]>")
.append("</cst_no__bill>");
setNodeValue(dom, "cst_no__bill", getAbsString(cstNoBill));
valueXmlString.append("<lst_no__bill>").append("<![CDATA[" + lstNoBill + "]]>")
.append("</lst_no__bill>");
setNodeValue(dom, "lst_no__bill", getAbsString(lstNoBill));
valueXmlString.append("<drug_lic_no__bill>").append("<![CDATA[" + drugLicNo + "]]>")
.append("</drug_lic_no__bill>");
setNodeValue(dom, "drug_lic_no__bill", getAbsString(drugLicNo));
valueXmlString.append("<drug_lic_no_1__bill>").append("<![CDATA[" + drugLicNo1 + "]]>")
.append("</drug_lic_no_1__bill>");
setNodeValue(dom, "drug_lic_no_1__bill", getAbsString(drugLicNo1));
valueXmlString.append("<drug_lic_no_2__bill>").append("<![CDATA[" + drugLicNo2 + "]]>")
.append("</drug_lic_no_2__bill>");
setNodeValue(dom, "drug_lic_no_2__bill", getAbsString(drugLicNo2));
//Added by mayur on 26-July-2018 -- [end]
lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom)); lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom));
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom)); lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
lsOrderType = checkNull(genericUtility.getColumnValue("order_type", dom)); lsOrderType = checkNull(genericUtility.getColumnValue("order_type", dom));
...@@ -6011,6 +6090,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -6011,6 +6090,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
itmCustCodeNotify(valueXmlString, dom, dom1, dom2, editFlag, xtraParams, objContext, conn)); itmCustCodeNotify(valueXmlString, dom, dom1, dom2, editFlag, xtraParams, objContext, conn));
} else if (currentColumn.trim().equalsIgnoreCase("cust_code")) { } else if (currentColumn.trim().equalsIgnoreCase("cust_code")) {
System.out.println("--------------Inside itemchange of cust_code------------");
String custCode = "", custName = "", tranMode = "", mbillto = "", lsTerrcode = "", mslpers = "", String custCode = "", custName = "", tranMode = "", mbillto = "", lsTerrcode = "", mslpers = "",
mslPers1 = "", mslPers2 = "", mcrTerm = ""; mslPers1 = "", mslPers2 = "", mcrTerm = "";
String lsTaxclasshdr = "", lsTaxchaphdr = "", lsTaxenvhdr = "", lsSiteCodeShip = "", String lsTaxclasshdr = "", lsTaxchaphdr = "", lsTaxenvhdr = "", lsSiteCodeShip = "",
...@@ -6023,18 +6103,48 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -6023,18 +6103,48 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
double mNum = 0.00; double mNum = 0.00;
custCode = checkNull(genericUtility.getColumnValue("cust_code", dom)); custCode = checkNull(genericUtility.getColumnValue("cust_code", dom));
System.out.println("custCode getting from dom["+custCode+"]");
lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom)); lsItemser = checkNull(genericUtility.getColumnValue("item_ser", dom));
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom)); lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", dom));
lsOrdtypeSample = distCommon.getDisparams("999999", "SAMPLE_ORDER_TYPE", conn); lsOrdtypeSample = distCommon.getDisparams("999999", "SAMPLE_ORDER_TYPE", conn);
//Added by mayur on 26-July-2018---[start]
//sql = "select cust_name, cust_code__bil from customer where cust_code =? ";
sql = "select cust_name,cust_code__bil,addr1,addr2,addr3,city,state_code,pin," +
"cst_no,lst_no,drug_lic_no,drug_lic_no_1,drug_lic_no_2 from customer where cust_code =? ";
sql = "select cust_name, cust_code__bil from customer where cust_code =? "; System.out.println("sql["+sql+"]");
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
custName = rs.getString("cust_name"); custName = rs.getString("cust_name");
mbillto = rs.getString("cust_code__bil"); mbillto = rs.getString("cust_code__bil");
billAddr1 = rs.getString("addr1");
billAddr2 = rs.getString("addr2");
billAddr3 = rs.getString("addr3");
billCity = rs.getString("city");
stateCode1 = rs.getString("state_code");
billPin = rs.getString("pin");
cstNoBill = rs.getString("cst_no");
lstNoBill = rs.getString("lst_no");
drugLicNo = rs.getString("drug_lic_no");
drugLicNo1 = rs.getString("drug_lic_no_1");
drugLicNo2 = rs.getString("drug_lic_no_2");
System.out.println("custName["+custName+"]");
System.out.println("mbillto["+mbillto+"]");
System.out.println("billAddr1["+billAddr1+"]");
System.out.println("billAddr2["+billAddr2+"]");
System.out.println("billAddr3["+billAddr3+"]");
System.out.println("billCity["+billCity+"]");
System.out.println("stateCode["+stateCode1+"]");
System.out.println("billPin["+billPin+"]");
System.out.println("cstNoBill["+cstNoBill+"]");
System.out.println("lstNoBill["+lstNoBill+"]");
System.out.println("drugLicNo["+drugLicNo+"]");
System.out.println("drugLicNo1["+drugLicNo1+"]");
System.out.println("drugLicNo2["+drugLicNo2+"]");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -6532,6 +6642,52 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -6532,6 +6642,52 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</cust_name__bil>"); .append("</cust_name__bil>");
setNodeValue(dom, "cust_name__bil", getAbsString(lsCustnameBil)); setNodeValue(dom, "cust_name__bil", getAbsString(lsCustnameBil));
//Added by mayur on 26-July-2018 -- [start]--to get the billing details populated when the cust code is set
valueXmlString.append("<bill_addr1>").append("<![CDATA[" + billAddr1 + "]]>")
.append("</bill_addr1>");
setNodeValue(dom, "bill_addr1", getAbsString(billAddr1));
valueXmlString.append("<bill_addr2>").append("<![CDATA[" + billAddr2 + "]]>")
.append("</bill_addr2>");
setNodeValue(dom, "bill_addr2", getAbsString(billAddr2));
valueXmlString.append("<bill_addr3>").append("<![CDATA[" + billAddr3 + "]]>")
.append("</bill_addr3>");
setNodeValue(dom, "bill_addr3", getAbsString(billAddr3));
valueXmlString.append("<bill_city>").append("<![CDATA[" + billCity + "]]>")
.append("</bill_city>");
setNodeValue(dom, "bill_city", getAbsString(billCity));
valueXmlString.append("<state_code__bill>").append("<![CDATA[" + stateCode1 + "]]>")
.append("</state_code__bill>");
setNodeValue(dom, "state_code__bill", getAbsString(stateCode1));
valueXmlString.append("<bill_pin>").append("<![CDATA[" + billPin + "]]>")
.append("</bill_pin>");
setNodeValue(dom, "bill_pin", getAbsString(billPin));
valueXmlString.append("<cst_no__bill>").append("<![CDATA[" + cstNoBill + "]]>")
.append("</cst_no__bill>");
setNodeValue(dom, "cst_no__bill", getAbsString(cstNoBill));
valueXmlString.append("<lst_no__bill>").append("<![CDATA[" + lstNoBill + "]]>")
.append("</lst_no__bill>");
setNodeValue(dom, "lst_no__bill", getAbsString(lstNoBill));
valueXmlString.append("<drug_lic_no__bill>").append("<![CDATA[" + drugLicNo + "]]>")
.append("</drug_lic_no__bill>");
setNodeValue(dom, "drug_lic_no__bill", getAbsString(drugLicNo));
valueXmlString.append("<drug_lic_no_1__bill>").append("<![CDATA[" + drugLicNo1 + "]]>")
.append("</drug_lic_no_1__bill>");
setNodeValue(dom, "drug_lic_no_1__bill", getAbsString(drugLicNo1));
valueXmlString.append("<drug_lic_no_2__bill>").append("<![CDATA[" + drugLicNo2 + "]]>")
.append("</drug_lic_no_2__bill>");
setNodeValue(dom, "drug_lic_no_2__bill", getAbsString(drugLicNo2));
//Added by mayur on 26-July-2018 -- [end]
valueXmlString.append("<cr_term>").append("<![CDATA[" + mcrTerm + "]]>").append("</cr_term>"); valueXmlString.append("<cr_term>").append("<![CDATA[" + mcrTerm + "]]>").append("</cr_term>");
setNodeValue(dom, "cr_term", getAbsString(mcrTerm)); setNodeValue(dom, "cr_term", getAbsString(mcrTerm));
......
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