Commit d85658d3 authored by ajadhav's avatar ajadhav

Changes in SQL

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183125 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 06c724b7
......@@ -243,8 +243,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom),
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat())
+ " 00:00:00.0");
sql = "select count(*) into as cnt from scontract where contract_no = ? and ? between eff_from and valid_upto";
//Changes and commented by Ajay on 05/04/18:START
// sql = "select count(*) into as cnt from scontract where contract_no = ? and ? between eff_from and valid_upto";
sql = "select count(*) as cnt from scontract where contract_no = ? and ? between eff_from and valid_upto";
//Changes and commented by Ajay on 05/04/18:END
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsContractNo);
pstmt.setTimestamp(2, orderDate);
......@@ -3465,15 +3467,9 @@ 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) {
......@@ -3496,51 +3492,22 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn,
// editFlag, xtraParams);
if ("1".equals(objContext.trim())) {
//Commented by sarita on 03APR2018
//valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams,conn);
valueXmlString = itemChangedHdr(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
} else {
//Commented by sarita on 03APR2018
//valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams,conn);
valueXmlString = itemChangedDet(dom, dom1, dom2, objContext, currentColumn, editFlag, xtraParams);
}
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,Connection conn) throws RemoteException, ITMException, SQLException
{
//Commented by sarita on 03APR2018[start]
//Connection conn = null;
//Commented by sarita on 03APR2018[end]
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException {
Connection conn = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -3598,11 +3565,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
Timestamp ldDueDate = null;
try {
// conn = connDriver.getConnectDB("DriverITM");
//Commented by sarita on 03APPR2018 [start]
//conn = getConnection();
//conn.setAutoCommit(false);
//connDriver = null;
//Commented by sarita on 03APPR2018 [end]
conn = getConnection();
conn.setAutoCommit(false);
connDriver = null;
if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext.trim());
}
......@@ -3849,27 +3814,21 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "cctr_code__sal", getAbsString(lsCctrcodeSal));
if (lsCctrcodeSal == null || lsCctrcodeSal.trim().length() == 0) {
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4285,9 +4244,7 @@ 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() + "]");
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
System.out.println("Rest string after [sales_pers] item change :- [" + reStr + "]");
......@@ -4299,9 +4256,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("valueXmlString before internal item change sales_pers__1:-["
+ valueXmlString.toString() + "]");
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
System.out.println("Rest string after [sales_pers1] item change :- [" + reStr + "]");
......@@ -4311,9 +4266,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("valueXmlString after internal item change [sales_pers1]:-["
+ valueXmlString.toString() + "]");
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4321,9 +4274,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append(reStr);
}
if (lsCustCode != null && lsCustCode.trim().length() > 0) {
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4472,9 +4423,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "exch_rate__ins", getAbsString(lcExchRate));
}
}
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "exch_rate", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4693,9 +4642,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm>");
setNodeValue(dom, "curr_code__comm", getAbsString(mCcurr));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -4945,9 +4892,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm_1>");
setNodeValue(dom, "curr_code__comm_1", getAbsString(mCcurr));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -5191,9 +5136,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</curr_code__comm_2>");
setNodeValue(dom, "curr_code__comm_2", getAbsString(mCcurr));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "curr_code__comm2", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -5338,9 +5281,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</order_type>");
setNodeValue(dom, "order_type", getAbsString(lsOrderType));
}
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6218,9 +6159,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<part_qty>").append("<![CDATA[" + lsPartQty + "]]>").append("</part_qty>");
setNodeValue(dom, "part_qty", getAbsString(lsPartQty));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "order_type", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6454,9 +6393,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers", getAbsString(mslpers));
if (mslpers != null && mslpers.trim().length() > 0) {
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6468,9 +6405,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers__1", getAbsString(mslPers1));
if (mslPers1 != null && mslPers1.trim().length() > 0) {
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6482,9 +6417,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "sales_pers__2", getAbsString(mslPers2));
if (mslPers2 != null && mslPers2.trim().length() > 0) {
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -6729,9 +6662,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</single_lot>");
setNodeValue(dom, "single_lot", getAbsString(lsSingleLot));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code__dlv", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7164,9 +7095,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<cust_code>").append("<![CDATA[" + lsCustCode + "]]>")
.append("</cust_code>");
setNodeValue(dom, "cust_code", getAbsString(lsCustCode));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "cust_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7177,9 +7106,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<sales_pers>").append("<![CDATA[" + lsSalesPers + "]]>")
.append("</sales_pers>");
setNodeValue(dom, "sales_pers", getAbsString(lsSalesPers));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -7348,25 +7275,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} catch (Exception e) {
System.out.println("Exception : [itemChangedNew] :==>\n" + e.getMessage());
throw new ITMException(e);
}
//Commented by sarita on 03APR2018[start]
/*finally {
} 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,Connection conn) throws RemoteException, ITMException, SQLException
{
//Commented by sarita on 03APR2018
//Connection conn = null;
String editFlag, String xtraParams) throws RemoteException, ITMException, SQLException {
Connection conn = null;
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
E12GenericUtility genericUtility = new E12GenericUtility();
......@@ -7422,13 +7341,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
Timestamp ldDueDate = null;
try {
// conn = connDriver.getConnectDB("DriverITM");
//Commented by sarita on 03APR2018 [start]
//conn = getConnection();
//conn.setAutoCommit(false);
//connDriver = null;
//Commented by sarita on 03APR2018 [end]
conn = getConnection();
conn.setAutoCommit(false);
connDriver = null;
if (objContext != null && objContext.trim().length() > 0) {
currentFormNo = Integer.parseInt(objContext.trim());
}
......@@ -8079,9 +7995,7 @@ 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);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8147,9 +8061,7 @@ 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));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8185,9 +8097,7 @@ 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));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8202,9 +8112,7 @@ 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));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8235,9 +8143,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("<![CDATA[" + itemCodeOrd + "]]>").append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(itemCodeOrd1));
}
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -8995,9 +8901,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<avail_qty>").append("<![CDATA[" + lcStkQty + "]]>").append("</avail_qty>");
setNodeValue(dom, "avail_qty", getAbsString(lcStkQty));
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "quantity", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9331,9 +9235,7 @@ 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));
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9427,9 +9329,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</unit__rate>");
setNodeValue(dom, "unit__rate", getAbsString(uom));
// }
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9503,9 +9403,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</rate__clg>");
setNodeValue(dom, "rate__clg", getAbsString(String.valueOf(mRateClg)));
}
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9811,9 +9709,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "rate__clg", getAbsString(String.valueOf(mRateClg)));
}
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9884,9 +9780,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
//////// Nandkumar Gadkari-----start
// setNodeValue(dom, "discount", getAbsString(String.valueOf("0")));
//////// Nandkumar Gadkari-----end
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -9941,9 +9835,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
// "]]>").append("</quantity>");
// setNodeValue( dom, "quantity", getAbsString( String.valueOf(mQty)));
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "unit", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -10129,9 +10021,7 @@ 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));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -10195,15 +10085,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} catch (Exception e) {
System.out.println("Exception : [itemChangedDet] :==>\n" + e.getMessage());
throw new ITMException(e);
}
//Commented by sarita on 03APR2018[start]
/*finally {
} 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,
......@@ -10760,45 +10647,35 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<loc_group>").append("<![CDATA[" + lsLocGroup + "]]>").append("</loc_group>");
setNodeValue(dom, "loc_group", getAbsString(lsLocGroup));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "sales_pers__2", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -11004,18 +10881,14 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</exch_rate__comm_2>");
setNodeValue(dom, "exch_rate__comm_2", getAbsString(""));
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
reStr = reStr.substring(0, pos);
valueXmlString.append(reStr);
//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);
reStr = itemChangedHdr(dom, dom1, dom2, objContext, "emp_code__ord1", editFlag, xtraParams);
pos = reStr.indexOf("<Detail1>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail1>");
......@@ -11636,9 +11509,7 @@ 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"));
//Commented by sarita on 03APR2018
//reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams,conn);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "rate", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12890,9 +12761,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsItemCodeOrd));
System.out.println("lsItemCodeOrd>>>>" + lsItemCodeOrd + "objContext>>>>" + objContext);
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12931,9 +12800,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -12960,9 +12827,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</item_code>");
setNodeValue(dom, "item_code", getAbsString(lsSchemeCode));
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -13012,9 +12877,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
setNodeValue(dom, "item_code", getAbsString(lsItemCodeOrd));
// }
}
//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);
reStr = itemChangedDet(dom, dom1, dom2, objContext, "item_code", editFlag, xtraParams);
pos = reStr.indexOf("<Detail2>");
reStr = reStr.substring(pos + 9);
pos = reStr.indexOf("</Detail2>");
......@@ -13789,11 +13652,8 @@ 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,conn);
orderDate);
} catch (Exception e) {
e.printStackTrace();
System.out.println("Exception ::" + e.getMessage());
......@@ -13802,56 +13662,12 @@ 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,Connection conn) throws ITMException
{
//Commented by sarita on 03APR2018 [start]
//Connection conn = null;
//ConnDriver connDriver = new ConnDriver();
//Commented by sarita on 03APR2018 [end]
String countCode, Timestamp orderDate) throws ITMException {
Connection conn = null;
ConnDriver connDriver = new ConnDriver();
PreparedStatement pstmt = null, pstmt1 = null;
ResultSet rs = null, rs1 = null;
String sql = "";
......@@ -13866,8 +13682,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
long schCnt = 0;
try {
// conn = connDriver.getConnectDB("DriverITM");
//Commented by sarita on 03APR2018
//conn = getConnection();
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