Commit 5c659826 authored by ssalve's avatar ssalve

Sarita : done changes to resolve connection issues on 03APRIL2018

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183022 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9ddb3aab
......@@ -3465,9 +3465,15 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
Document dom1 = null;
Document dom2 = null;
String valueXmlString = "";
//Added by sarita for Connection on 03APR2018[start]
Connection conn = null;
System.out.println("hELLO PRINT");
try {
//Added by sarita for Connection on 03APR2018[start]
conn = getConnection();
conn.setAutoCommit(false);
//Added by sarita for Connection on 03APR2018[end]
System.out.println("xmlString@@@@@@@" + xmlString);
if (xmlString != null && xmlString.trim().length() > 0) {
......@@ -3490,22 +3496,51 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn,
// editFlag, xtraParams);
if ("1".equals(objContext.trim())) {
valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
//Commented by sarita on 03APR2018
//valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams,conn);
} else {
valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
//Commented by sarita on 03APR2018
//valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams,conn);
}
System.out.println("VALUE HELLO PRINT[" + valueXmlString + "]");
} catch (Exception e) {
}
catch (Exception e)
{
System.out.println("Exception : [FreightRateIC][itemChanged( String, String )] :==>\n" + e.getMessage());
throw new ITMException(e);
}
//Added by sarita on 03APR2018[start]
finally {
try
{
if (conn != null)
{
conn.close();
conn = null;
}
}
catch(Exception e)
{
e.printStackTrace();
}
}
//Added by sarita on 03APR2018[end]
System.out.println("VALUE HELLO PRINTA@@[" + valueXmlString + "]");
return valueXmlString;
}
//Commented by sarita on 03APR2018
/*public String itemChangedHdr(Document dom, Document dom1, Document dom2, String objContext, String currentColumn,
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException */
public String itemChangedHdr(Document dom, Document dom1, Document dom2, String objContext, String currentColumn,
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException {
Connection conn = null;
String editFlag, String xtraParams,Connection conn) throws RemoteException, ITMException, SQLException
{
//Commented by sarita on 03APR2018[start]
//Connection conn = null;
//Commented by sarita on 03APR2018[end]
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -3563,9 +3598,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
Timestamp ldDueDate = null;
try {
// conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
conn.setAutoCommit(false);
connDriver = null;
//Commented by sarita on 03APPR2018 [start]
//conn = getConnection();
//conn.setAutoCommit(false);
//connDriver = null;
//Commented by sarita on 03APPR2018 [end]
if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext.trim());
}
......@@ -3812,21 +3849,27 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "cctr_code__sal", getAbsString(lsCctrcodeSal));
if (lsCctrcodeSal == null || lsCctrcodeSal.trim().length() == 0) {
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4242,7 +4285,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (lsCctrcodeSal == null || lsCctrcodeSal.trim().length() == 0) {
System.out.println(
"valueXmlString before internal item change :-[" + valueXmlString.toString() + "]");
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
System.out.println("Rest string after [sales_pers] item change :- [" + reStr + "]");
......@@ -4254,7 +4299,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("valueXmlString before internal item change sales_pers__1:-["
+ valueXmlString.toString() + "]");
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
System.out.println("Rest string after [sales_pers1] item change :- [" + reStr + "]");
......@@ -4264,7 +4311,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("valueXmlString after internal item change [sales_pers1]:-["
+ valueXmlString.toString() + "]");
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4272,7 +4321,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append(reStr);
}
if (lsCustCode != null && lsCustCode.trim().length() > 0) {
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4421,7 +4472,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "exch_rate__ins", getAbsString(lcExchRate));
}
}
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "exch_rate", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "exch_rate", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "exch_rate", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4640,7 +4693,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm>");
setNodeValue(dom, "curr_code__comm", getAbsString(mCcurr));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4890,7 +4945,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm_1>");
setNodeValue(dom, "curr_code__comm_1", getAbsString(mCcurr));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -5134,7 +5191,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm_2>");
setNodeValue(dom, "curr_code__comm_2", getAbsString(mCcurr));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm2", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm2", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm2", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -5279,7 +5338,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</order_type>");
setNodeValue(dom, "order_type", getAbsString(lsOrderType));
}
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6157,7 +6218,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<part_qty>").append("<![CDATA[" + lsPartQty + "]]>").append("</part_qty>");
setNodeValue(dom, "part_qty", getAbsString(lsPartQty));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6391,7 +6454,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers", getAbsString(mslpers));
if (mslpers != null && mslpers.trim().length() > 0) {
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6403,7 +6468,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers__1", getAbsString(mslPers1));
if (mslPers1 != null && mslPers1.trim().length() > 0) {
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6415,7 +6482,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers__2", getAbsString(mslPers2));
if (mslPers2 != null && mslPers2.trim().length() > 0) {
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6660,7 +6729,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</single_lot>");
setNodeValue(dom, "single_lot", getAbsString(lsSingleLot));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code__dlv", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code__dlv", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code__dlv", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7093,7 +7164,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<cust_code>").append("<![CDATA[" + lsCustCode + "]]>")
.append("</cust_code>");
setNodeValue(dom, "cust_code", getAbsString(lsCustCode));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7104,7 +7177,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<sales_pers>").append("<![CDATA[" + lsSalesPers + "]]>")
.append("</sales_pers>");
setNodeValue(dom, "sales_pers", getAbsString(lsSalesPers));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
//Commented and Added by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7273,17 +7348,25 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} catch (Exception e) {
System.out.println("Exception : [itemChangedNew] :==>\n" + e.getMessage());
throw new ITMException(e);
} finally {
}
//Commented by sarita on 03APR2018[start]
/*finally {
if (conn != null) {
conn.close();
conn = null;
}
}
}*/
//Commented by sarita on 03APR2018[end]
}
//Commented by sarita on 03APR2018
/*public String itemChangedDet(Document dom, Document dom1, Document dom2, String objContext, String currentColumn,
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException */
public String itemChangedDet(Document dom, Document dom1, Document dom2, String objContext, String currentColumn,
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException {
Connection conn = null;
String editFlag, String xtraParams,Connection conn) throws RemoteException, ITMException, SQLException
{
//Commented by sarita on 03APR2018
//Connection conn = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -7339,10 +7422,13 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
Timestamp ldDueDate = null;
try {
// conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
conn.setAutoCommit(false);
connDriver = null;
//Commented by sarita on 03APR2018 [start]
//conn = getConnection();
//conn.setAutoCommit(false);
//connDriver = null;
//Commented by sarita on 03APR2018 [end]
if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext.trim());
}
......@@ -7993,7 +8079,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// gbf_ic_item_code("item_code")//Need to Add manoj
// itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag,
// xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8059,7 +8147,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// valueXmlString.append("<item_code protect = \"1\">").append("<![CDATA[" +
// itemCodeOrd + "]]>").append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(itemCodeOrd));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8095,7 +8185,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<item_code protect = \"0\">")
.append("<![CDATA[" + lsSchemeCode + "]]>").append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8110,7 +8202,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<item_code protect = \"0\">")
.append("<![CDATA[" + lsSchemeCode + "]]>").append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8141,7 +8235,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("<![CDATA[" + itemCodeOrd + "]]>").append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(itemCodeOrd1));
}
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8899,7 +8995,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<avail_qty>").append("<![CDATA[" + lcStkQty + "]]>").append("</avail_qty>");
setNodeValue(dom, "avail_qty", getAbsString(lcStkQty));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9233,7 +9331,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("lsUnitSal[" + lsUnitSal + "]");
valueXmlString.append("<unit>").append("<![CDATA[" + lsUnitSal + "]]>").append("</unit>");
setNodeValue(dom, "unit", getAbsString(lsUnitSal));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9327,7 +9427,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</unit__rate>");
setNodeValue(dom, "unit__rate", getAbsString(uom));
// }
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9401,7 +9503,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</rate__clg>");
setNodeValue(dom, "rate__clg", getAbsString(String.valueOf(mRateClg)));
}
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9707,7 +9811,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "rate__clg", getAbsString(String.valueOf(mRateClg)));
}
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9778,7 +9884,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
//////// Nandkumar Gadkari-----start
// setNodeValue(dom, "discount", getAbsString(String.valueOf("0")));
//////// Nandkumar Gadkari-----end
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9833,7 +9941,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// "]]>").append("</quantity>");
// setNodeValue( dom, "quantity", getAbsString( String.valueOf(mQty)));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -10019,7 +10129,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if (currentColumn.trim().equalsIgnoreCase("price_list__disc")) {
// valueXmlString.append(gbfIcSiteCode(valueXmlString,dom,dom1,dom2,editFlag,
// xtraParams,objContext,conn));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -10083,12 +10195,15 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} catch (Exception e) {
System.out.println("Exception : [itemChangedDet] :==>\n" + e.getMessage());
throw new ITMException(e);
} finally {
}
//Commented by sarita on 03APR2018[start]
/*finally {
if (conn != null) {
conn.close();
conn = null;
}
}
}*/
//Commented by sarita on 03APR2018[end]
}
private StringBuffer itmContractNo(StringBuffer valueXmlString, Document dom, Document dom1, Document dom2,
......@@ -10645,35 +10760,45 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<loc_group>").append("<![CDATA[" + lsLocGroup + "]]>").append("</loc_group>");
setNodeValue(dom, "loc_group", getAbsString(lsLocGroup));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -10879,14 +11004,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</exch_rate__comm_2>");
setNodeValue(dom, "exch_rate__comm_2", getAbsString(""));
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -11507,7 +11636,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
if ("F".equalsIgnoreCase(mCode) || "B".equalsIgnoreCase(mCode) || "S".equalsIgnoreCase(mCode)) {
valueXmlString.append("<rate>").append("<![CDATA[" + '0' + "]]>").append("</rate>");
setNodeValue(dom, "rate", getAbsString("0"));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12759,7 +12890,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsItemCodeOrd));
System.out.println("lsItemCodeOrd>>>>" + lsItemCodeOrd + "objContext>>>>" + objContext);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12798,7 +12931,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12825,7 +12960,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12875,7 +13012,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "item_code", getAbsString(lsItemCodeOrd));
// }
}
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams,conn);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -13650,8 +13789,11 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
itemCodeParent = itemCodeOrd;
}
}
//Commented by sarita on 03APR2018
/*schemeCode = getCheckScheme(itemCodeParent, orderType, custCode, siteCode, stateCodeDlv, countCode,
orderDate);*/
schemeCode = getCheckScheme(itemCodeParent, orderType, custCode, siteCode, stateCodeDlv, countCode,
orderDate);
orderDate,conn);
} catch (Exception e) {
e.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
......@@ -13660,12 +13802,56 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
return schemeCode;
}
//getCheckScheme method added by sarita on 03APR2018 [start]
public String getCheckScheme(String itemCode, String orderType, String custCode, String siteCode, String stateCode,
String countCode, Timestamp orderDate) throws ITMException
{
Connection conn = null;
String retString = "";
try
{
conn = getConnection();
conn.setAutoCommit(false);
retString = getCheckScheme(itemCode, orderType,custCode, siteCode, stateCode,
countCode, orderDate,conn);
}
catch(Exception e)
{
e.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
throw new ITMException(e);
}
finally
{
try
{
if (conn != null)
{
conn.close();
conn = null;
}
}
catch(Exception e)
{
e.printStackTrace();
}
}
return retString;
}
//getCheckScheme method added by sarita on 03APR2018 [end]
// gbf_check_scheme
//Commented by sarita on 03APR2018
/*public String getCheckScheme(String itemCode, String orderType, String custCode, String siteCode, String stateCode,
String countCode, Timestamp orderDate) throws ITMException */
public String getCheckScheme(String itemCode, String orderType, String custCode, String siteCode, String stateCode,
String countCode, Timestamp orderDate) throws ITMException {
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
String countCode, Timestamp orderDate,Connection conn) throws ITMException
{
//Commented by sarita on 03APR2018 [start]
//Connection conn = null;
//ConnDriver connDriver = new ConnDriver();
//Commented by sarita on 03APR2018 [end]
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
String sql = "";
......@@ -13680,7 +13866,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
long schCnt = 0;
try {
// conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Commented by sarita on 03APR2018
//conn = getConnection();
if (orderType == null) {
orderType = "";
}
......
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