Skip to content

B
business-java
Commit 4d13b379 authored by nkhan's avatar nkhan
Browse files
Options

bug fix item change on item series 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103700 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 45b651e2
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 65 deletions
webitm-dis/ibase/webitm/ejb/dis/POrderIC.java
View file @ 4d13b379
...@@ -5984,22 +5984,18 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -5984,22 +5984,18 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, mcode); pStmt.setString(1, mcode);
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
if (rs.next()) { if (rs.next())
{
itemSer = checkNull(rs.getString("item_ser")); itemSer = checkNull(rs.getString("item_ser"));
siteCodeDlv = checkNull(rs siteCodeDlv = checkNull(rs.getString("site_code__dlv"));
.getString("site_code__dlv")); suppCodePref = checkNull(rs.getString("supp_code__pref"));
suppCodePref = checkNull(rs empCodePur = checkNull(rs.getString("emp_code__pur"));
.getString("supp_code__pref")); sitecodeBil = checkNull(rs.getString("SITE_CODE__BIL"));
empCodePur = checkNull(rs
.getString("emp_code__pur"));
sitecodeBil = checkNull(rs
.getString("SITE_CODE__BIL"));
projCode = checkNull(rs.getString("proj_code")); projCode = checkNull(rs.getString("proj_code"));
analCode = checkNull(rs.getString("anal_code")); analCode = checkNull(rs.getString("anal_code"));
} }
valueXmlString.append("<proj_code>") valueXmlString.append("<proj_code>").append("<![CDATA[" + projCode + "]]>")
.append("<![CDATA[" + projCode + "]]>")
.append("</proj_code>"); .append("</proj_code>");
valueXmlString.append("<item_ser>") valueXmlString.append("<item_ser>")
.append("<![CDATA[" + itemSer + "]]>") .append("<![CDATA[" + itemSer + "]]>")
...@@ -6085,24 +6081,24 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -6085,24 +6081,24 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
.append("").append("</task_code>"); .append("").append("</task_code>");
} }
} }
if (currentColumn.trim().equals("item_ser")) { if (currentColumn.trim().equals("item_ser"))
{
mcode = genericUtility.getColumnValue("item_ser", dom); mcode = genericUtility.getColumnValue("item_ser", dom);
empCode = genericUtility.getColumnValue("emp_code", dom, empCode = genericUtility.getColumnValue("emp_code", dom,"1");
"1");
if (empCode.trim().length() == 0 || empCode == null) { if (empCode.trim().length() == 0 || empCode == null)
{
sql = "select emp_code__pur from itemser where item_ser = ?"; sql = "select emp_code__pur from itemser where item_ser = ?";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, mcode); pStmt.setString(1, mcode);
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
if (rs.next()) { if (rs.next())
{
memp = rs.getString("emp_code__pur"); memp = rs.getString("emp_code__pur");
} }
if (memp != null && memp.trim().length() > 0) { if (memp != null && memp.trim().length() > 0)
valueXmlString.append("<emp_code>") {
.append("<![CDATA[" + memp + "]]>") valueXmlString.append("<emp_code>").append("<![CDATA[" + memp + "]]>").append("</emp_code>");
.append("</emp_code>");
} }
rs.close(); rs.close();
rs = null; rs = null;
...@@ -6110,91 +6106,89 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -6110,91 +6106,89 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
pStmt = null; pStmt = null;
} }
taxClass = checkNull(genericUtility.getColumnValue( taxClass = checkNull(genericUtility.getColumnValue("tax_class", dom));
"tax_class", dom)); taxChap = checkNull(genericUtility.getColumnValue("tax_chap", dom));
taxChap = checkNull(genericUtility.getColumnValue( taxEnv = checkNull(genericUtility.getColumnValue("tax_env",dom));
"tax_chap", dom)); itemSer = checkNull(genericUtility.getColumnValue("item_ser", dom));
taxEnv = checkNull(genericUtility.getColumnValue("tax_env", suppCode = checkNull(genericUtility.getColumnValue("supp_code", dom));
dom)); siteCodeDlv = checkNull(genericUtility.getColumnValue("site_code__dlv", dom));
itemSer = checkNull(genericUtility.getColumnValue( stationstanCode = checkNull(genericUtility.getColumnValue("station_stan_code", dom));
"item_ser", dom));
suppCode = checkNull(genericUtility.getColumnValue(
"supp_code", dom));
siteCodeDlv = checkNull(genericUtility.getColumnValue(
"site_code__dlv", dom));
stationstanCode = checkNull(genericUtility.getColumnValue(
"station_stan_code", dom));
sql = "select stan_code from site where site_code = ?"; sql = "select stan_code from site where site_code = ?";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, siteCodeDlv); pStmt.setString(1, siteCodeDlv);
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
if (rs.next()) { if (rs.next())
{
stationCodeto = rs.getString("stan_code"); stationCodeto = rs.getString("stan_code");
} }
rs.close(); rs.close();
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
if ("A".equalsIgnoreCase(editFlag) if ("A".equalsIgnoreCase(editFlag)&& suppCode.trim().length() > 0)
&& suppCode.trim().length() > 0) { {
if (taxClass == null || taxClass.trim().length() == 0) { if (taxClass == null || taxClass.trim().length() == 0)
{
// taxclassDes = // taxclassDes =
// gf_get_taxclass('S',suppCode,"",siteCodeDlv) // gf_get_taxclass('S',suppCode,"",siteCodeDlv)
taxclassDes = distComm.getTaxClass("S", suppCode, taxclassDes = distComm.getTaxClass("S", suppCode,"", siteCodeDlv, conn);
"", siteCodeDlv, conn); }
} else { else
{
taxclassDes = taxClass; taxclassDes = taxClass;
} }
if (taxChap == null || taxChap.trim().length() == 0) { if (taxChap == null || taxChap.trim().length() == 0)
{
// taxchapDes = gf_get_taxchap("", itemSer, 'S', // taxchapDes = gf_get_taxchap("", itemSer, 'S',
// suppCode,siteCodeDlv) // suppCode,siteCodeDlv)
taxchapDes = distComm.getTaxChap("", itemSer, "S", taxchapDes = distComm.getTaxChap("", itemSer, "S",
suppCode, siteCodeDlv, conn); suppCode, siteCodeDlv, conn);
} else { }
else
{
taxchapDes = taxChap; taxchapDes = taxChap;
} }
if (taxEnv == null || taxEnv.trim().length() == 0) { if (taxEnv == null || taxEnv.trim().length() == 0)
{
// taxenvDes = gf_get_taxenv(stationstanCode, // taxenvDes = gf_get_taxenv(stationstanCode,
// stationCodeto, taxchapDes, // stationCodeto, taxchapDes,
// taxclassDes,siteCodeDlv) // taxclassDes,siteCodeDlv)
taxenvDes = distComm.getTaxEnv(stationstanCode, taxenvDes = distComm.getTaxEnv(stationstanCode, stationCodeto, taxchapDes, taxclassDes,
stationCodeto, taxchapDes, taxclassDes,
siteCodeDlv, conn); siteCodeDlv, conn);
} else { }
else
{
taxenvDes = taxEnv; taxenvDes = taxEnv;
} }
valueXmlString.append("<tax_class>") valueXmlString.append("<tax_class>").append("<![CDATA[" + taxclassDes + "]]>").append("</tax_class>");
.append("<![CDATA[" + taxclassDes + "]]>") valueXmlString.append("<tax_chap>").append("<![CDATA[" + taxchapDes + "]]>").append("</tax_chap>");
.append("</tax_class>"); valueXmlString.append("<tax_env>").append("<![CDATA[" + taxenvDes + "]]>").append("</tax_env>");
valueXmlString.append("<tax_chap>")
.append("<![CDATA[" + taxchapDes + "]]>")
.append("</tax_chap>");
valueXmlString.append("<tax_env>")
.append("<![CDATA[" + taxenvDes + "]]>")
.append("</tax_env>");
} }
sql = "select term_table from itemser where item_ser = ?"; sql = "select term_table from itemser where item_ser = ?";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, mcode); pStmt.setString(1, mcode);
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
if (rs.next()) { if (rs.next())
termTable = rs.getString("term_table"); {
//Chananged By Nasruddin checkNull condition 14-10-16
//termTable = rs.getString("term_table");
termTable = checkNull(rs.getString("term_table"));
} }
rs.close(); rs.close();
rs = null; rs = null;
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
System.out.println("termTable===>> ["+termTable+"]");
if (termTable.length() > 0 || termTable != null) { // Chananged By Nasruddin 14-10-16
valueXmlString.append("<term_table>") //if (termTable.length() > 0 || termTable != null)
.append("<![CDATA[" + termTable + "]]>") if (termTable.trim().length() > 0 && termTable != null)
.append("</term_table>"); {
valueXmlString.append("<term_table>").append("<![CDATA[" + termTable + "]]>").append("</term_table>");
} }
} }
if (currentColumn.trim().equals("supp_code")) { if (currentColumn.trim().equals("supp_code")) {
...@@ -10845,6 +10839,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote, ...@@ -10845,6 +10839,7 @@ public class POrderIC extends ValidatorEJB implements POrderICRemote,
e.printStackTrace(); e.printStackTrace();
} }
} }
System.out.println("valueXmlString @@@@@@@@@ ["+valueXmlString+"]");
return valueXmlString.toString(); return valueXmlString.toString();
} }
......
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