Skip to content

C
Component Sharing
Commit 2b380bd3 authored by SABURI PATEKAR's avatar SABURI PATEKAR
Browse files
Options

Merge branch 'master' of https://gitlab.proteustech.in/gsb/component-sharing.git

parents fdb06af0 a5054f6d
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
Ajit/VHB/After release changes/ReqForQuotationIC.java
View file @ 2b380bd3
...@@ -172,7 +172,7 @@ public class ReqForQuotationIC extends ValidatorEJB { ...@@ -172,7 +172,7 @@ public class ReqForQuotationIC extends ValidatorEJB {
{ {
String salesPerson = checkNull(genericUtility.getColumnValue("sales_pers", dom)); String salesPerson = checkNull(genericUtility.getColumnValue("sales_pers", dom));
BaseLogger.log("3", null, null, "ReqForQuotationIC salesPerson wfValData case 1 [" + salesPerson + "]"); BaseLogger.log("3", null, null, "ReqForQuotationIC salesPerson wfValData case 1 [" + salesPerson + "]");
String salesPersonSql = "select count(SALES_PERS) as salesPersonCount from SALESPERSON where SALES_PERS = ?"; String salesPersonSql = "select count(SALES_PERS) as salesPersonCount from SALES_PERS where SALES_PERS = ?";
PreparedStatement salesPersonPs = connection.prepareStatement(salesPersonSql); PreparedStatement salesPersonPs = connection.prepareStatement(salesPersonSql);
salesPersonPs.setString(1, salesPerson); salesPersonPs.setString(1, salesPerson);
ResultSet salesPersonRs = salesPersonPs.executeQuery(); ResultSet salesPersonRs = salesPersonPs.executeQuery();
...@@ -663,6 +663,7 @@ public class ReqForQuotationIC extends ValidatorEJB { ...@@ -663,6 +663,7 @@ public class ReqForQuotationIC extends ValidatorEJB {
// Set sales_pers to logged in user's code // Set sales_pers to logged in user's code
valueXmlString.append("<sales_pers>").append("<![CDATA[" + userCode + "]]>").append("</sales_pers>\r\n"); valueXmlString.append("<sales_pers>").append("<![CDATA[" + userCode + "]]>").append("</sales_pers>\r\n");
} }
if ("cust_code".equalsIgnoreCase(currentColumn.trim())) { if ("cust_code".equalsIgnoreCase(currentColumn.trim())) {
BaseLogger.log("3", null, null, "ReqForQuotationIC in item change case 1 cust_code condition"); BaseLogger.log("3", null, null, "ReqForQuotationIC in item change case 1 cust_code condition");
...@@ -1118,6 +1119,9 @@ public class ReqForQuotationIC extends ValidatorEJB { ...@@ -1118,6 +1119,9 @@ public class ReqForQuotationIC extends ValidatorEJB {
} }
if (rateQuotVal.compareTo(rateApprvVal) > 0) { if (rateQuotVal.compareTo(rateApprvVal) > 0) {
BaseLogger.log("3", null, null, "in rateQuotVal greater condition"); BaseLogger.log("3", null, null, "in rateQuotVal greater condition");
BaseLogger.log("3", null, null, "in rateQuotVal greater condition valueXmlString::"+ valueXmlString); BaseLogger.log("3", null, null, "in rateQuotVal greater condition valueXmlString::"+ valueXmlString);
...@@ -1138,6 +1142,8 @@ public class ReqForQuotationIC extends ValidatorEJB { ...@@ -1138,6 +1142,8 @@ public class ReqForQuotationIC extends ValidatorEJB {
} }
//Calculating Revised PTR,PTD and PTS [Start] //Calculating Revised PTR,PTD and PTS [Start]
PreparedStatement resvisedRatePstmt =null; PreparedStatement resvisedRatePstmt =null;
...@@ -1212,6 +1218,8 @@ public class ReqForQuotationIC extends ValidatorEJB { ...@@ -1212,6 +1218,8 @@ public class ReqForQuotationIC extends ValidatorEJB {
closeResources(rs, psSiteCustomer, conn); closeResources(rs, psSiteCustomer, conn);
closeResources(rs, psCustomer, conn); closeResources(rs, psCustomer, conn);
closeResources(rs, psPriceList, conn); closeResources(rs, psPriceList, conn);
closeResources(rs, psPriceList, con);
} }
BaseLogger.log("3", getUserInfo(), null, "ReqForQuotationIC valueXmlString::"+valueXmlString.toString()); BaseLogger.log("3", getUserInfo(), null, "ReqForQuotationIC valueXmlString::"+valueXmlString.toString());
......
Ajit/VHB/After release changes/ReqForQuotationWiz.java
View file @ 2b380bd3
...@@ -242,7 +242,7 @@ public class ReqForQuotationWiz extends ValidatorEJB{ ...@@ -242,7 +242,7 @@ public class ReqForQuotationWiz extends ValidatorEJB{
{ {
String salesPerson = checkNull(genericUtility.getColumnValue("sales_pers", dom)); String salesPerson = checkNull(genericUtility.getColumnValue("sales_pers", dom));
BaseLogger.log("3", null, null, "ReqForQuotationIC salesPerson wfValData case 1 [" + salesPerson + "]"); BaseLogger.log("3", null, null, "ReqForQuotationIC salesPerson wfValData case 1 [" + salesPerson + "]");
String salesPersonSql = "select count(SALES_PERS) as salesPersonCount from SALESPERSON where SALES_PERS = ?"; String salesPersonSql = "select count(SALES_PERS) as salesPersonCount from SALES_PERS where SALES_PERS = ?";
PreparedStatement salesPersonPs = connectionObject.prepareStatement(salesPersonSql); PreparedStatement salesPersonPs = connectionObject.prepareStatement(salesPersonSql);
salesPersonPs.setString(1, salesPerson); salesPersonPs.setString(1, salesPerson);
ResultSet salesPersonRs = salesPersonPs.executeQuery(); ResultSet salesPersonRs = salesPersonPs.executeQuery();
......
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