Skip to content

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

Bug fix on sold to itmchg bilto addr set on sold instead of bilto 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@188931 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3ef900a1
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 47 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ e893a034
......@@ -5213,17 +5213,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
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("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+"]");
//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 = null;
......@@ -6096,7 +6096,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} 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="", custNameBill = "", tranMode = "", mbillto = "", lsTerrcode = "", mslpers = "",
mslPers1 = "", mslPers2 = "", mcrTerm = "";
String lsTaxclasshdr = "", lsTaxchaphdr = "", lsTaxenvhdr = "", lsSiteCodeShip = "",
lsStationfr = "", lsStationto = "", mCrdescr = "", lsPendingOrder = "";
......@@ -6113,43 +6113,58 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsSiteCode = checkNull(genericUtility.getColumnValue("site_code", 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 =? ";
System.out.println("sql["+sql+"]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if (rs.next()) {
mbillto = checkNull(rs.getString("cust_code__bil"));
custName = checkNull(rs.getString("cust_name"));
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//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," +
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.setString(1, custCode);
pstmt.setString(1, mbillto);
rs = pstmt.executeQuery();
if (rs.next()) {
custName = rs.getString("cust_name");
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");
custNameBill = checkNull(rs.getString("cust_name"));
//mbillto = checkNull(rs.getString("cust_code__bil"));
billAddr1 = checkNull(rs.getString("addr1"));
billAddr2 = checkNull(rs.getString("addr2"));
billAddr3 = checkNull(rs.getString("addr3"));
billCity = checkNull(rs.getString("city"));
stateCode1 = checkNull(rs.getString("state_code"));
billPin = checkNull(rs.getString("pin"));
cstNoBill = checkNull(rs.getString("cst_no"));
lstNoBill = checkNull(rs.getString("lst_no"));
drugLicNo = checkNull(rs.getString("drug_lic_no"));
drugLicNo1 = checkNull(rs.getString("drug_lic_no_1"));
drugLicNo2 = checkNull(rs.getString("drug_lic_no_2"));
System.out.println("custName["+custName+"]");
System.out.println("custNameBill["+custNameBill+"]");
System.out.println("mbillto["+mbillto+"]");
System.out.println("billAddr1["+billAddr1+"]");
System.out.println("billAddr2["+billAddr2+"]");
System.out.println("billAddr3["+billAddr3+"]");
//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+"]");
//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 = null;
......@@ -6614,23 +6629,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("cust_code::taxChapHdr["+taxChapHdr+"]taxClassHdr["+taxClassHdr+"]taxEnvHdr["+taxEnvHdr+"]");
//added by Pavan R on 11jun2k18 End
valueXmlString.append("<cust_name>").append("<![CDATA[" + custName + "]]>").append("</cust_name>");
setNodeValue(dom, "cust_name", getAbsString(descr));
setNodeValue(dom, "cust_name", getAbsString(custName));
valueXmlString.append("<cust_code__bil>").append("<![CDATA[" + mbillto + "]]>")
.append("</cust_code__bil>");
setNodeValue(dom, "cust_code__bil", getAbsString(mbillto));
sql = "select cust_name from customer where cust_code =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, mbillto);
rs = pstmt.executeQuery();
if (rs.next()) {
lsCustnameBil = rs.getString("cust_name");
}
pstmt.close();
pstmt = null;
rs.close();
rs = null;
sql = "select cust_name from customer where cust_code =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -6643,7 +6646,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close();
rs = null;
valueXmlString.append("<cust_name__bil>").append("<![CDATA[" + lsCustnameBil + "]]>")
valueXmlString.append("<cust_name__bil>").append("<![CDATA[" + custNameBill + "]]>")
.append("</cust_name__bil>");
setNodeValue(dom, "cust_name__bil", getAbsString(lsCustnameBil));
......
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