Skip to content

B
business-java
Commit 777c6790 authored by ssalve's avatar ssalve
Browse files
Options

Sarita : Done changes to set rate_clg if lsListType from price_list__clg on 09 APR 2019 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@199388 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a2dc48f0
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 12 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 777c6790
...@@ -8947,11 +8947,19 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -8947,11 +8947,19 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
if (lsListType.equalsIgnoreCase("B") || lsListType.equalsIgnoreCase("F") if (lsListType.equalsIgnoreCase("B") || lsListType.equalsIgnoreCase("F")
|| lsListType.equalsIgnoreCase("I")) { || lsListType.equalsIgnoreCase("I")) {
valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + lcRate + "]]>") //Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [START]
.append("</rate>"); /*valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + lcRate + "]]>")
.append("</rate>");*/
valueXmlString.append("<rate__clg protect = \"1\">").append("<![CDATA[" + lcRate + "]]>")
.append("</rate__clg>");
//Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [END]
} else { } else {
valueXmlString.append("<rate protect = \"0\">").append("<![CDATA[" + lcRate + "]]>") //Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [START]
.append("</rate>"); /*valueXmlString.append("<rate protect = \"0\">").append("<![CDATA[" + lcRate + "]]>")
.append("</rate>");*/
valueXmlString.append("<rate__clg protect = \"0\">").append("<![CDATA[" + lcRate + "]]>")
.append("</rate__clg>");
//Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [END]
} }
// Values to be retrived from Header dom manoj // Values to be retrived from Header dom manoj
lsCommPerc = Double.parseDouble(genericUtility.getColumnValue("comm_perc", dom1) == null ? "0.00" lsCommPerc = Double.parseDouble(genericUtility.getColumnValue("comm_perc", dom1) == null ? "0.00"
...@@ -11002,12 +11010,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -11002,12 +11010,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
System.out.println("dom mRateClg1 :" + mRateClg); System.out.println("dom mRateClg1 :" + mRateClg);
if ("B".equalsIgnoreCase(lsListType) || "I".equalsIgnoreCase(lsListType) if ("B".equalsIgnoreCase(lsListType) || "I".equalsIgnoreCase(lsListType)
|| "F".equalsIgnoreCase(lsListType)) { || "F".equalsIgnoreCase(lsListType)) {
valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + rate + "]]>") //Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [START]
.append("</rate>"); /*valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + rate + "]]>")
.append("</rate>");*/
valueXmlString.append("<rate__clg protect = \"1\">").append("<![CDATA[" + rate + "]]>")
.append("</rate__clg>");
//Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [END]
setNodeValue(dom, "rate", getAbsString(String.valueOf(rate))); setNodeValue(dom, "rate", getAbsString(String.valueOf(rate)));
} else if (lsQuotNo != null && lsQuotNo.trim().length() > 0) { } else if (lsQuotNo != null && lsQuotNo.trim().length() > 0) {
valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + rate + "]]>") //Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [START]
.append("</rate>"); /*valueXmlString.append("<rate protect = \"1\">").append("<![CDATA[" + rate + "]]>")
.append("</rate>");*/
valueXmlString.append("<rate__clg protect = \"1\">").append("<![CDATA[" + rate + "]]>")
.append("</rate__clg>");
//Commented and Added by sarita to set rate__clg instead rate as checking for price_list__clg on 09 APR 2019 [END]
setNodeValue(dom, "rate", getAbsString(String.valueOf(rate))); setNodeValue(dom, "rate", getAbsString(String.valueOf(rate)));
} else { } else {
valueXmlString.append("<rate protect = \"0\">").append("<![CDATA[" + rate + "]]>") valueXmlString.append("<rate protect = \"0\">").append("<![CDATA[" + rate + "]]>")
...@@ -13782,10 +13798,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -13782,10 +13798,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
ldRate = idRateWtDiscount; // Mining less ldRate = idRateWtDiscount; // Mining less
// gbf_calc_rate(lc_plist_disc, ld_rate); // Mining less // gbf_calc_rate(lc_plist_disc, ld_rate); // Mining less
calRate(checkDoubleNull(lsPlistDis), ldRate); calRate(checkDoubleNull(lsPlistDis), ldRate);
//Commented and Added by sarita to unprotect rate on 08 APR 2019 [START] valueXmlString.append("<rate>").append("<![CDATA[" + ldRate + "]]>").append("</rate>");
//valueXmlString.append("<rate>").append("<![CDATA[" + ldRate + "]]>").append("</rate>");
valueXmlString.append("<rate protect = \"0\">").append("<![CDATA[" + ldRate + "]]>").append("</rate>");
//Commented and Added by sarita to unprotect rate on 08 APR 2019 [END]
//////// Nandkumar Gadkari-----start COMMENTED //////// Nandkumar Gadkari-----start COMMENTED
//Changed by PavanR 04oct18[to protect discount if discount auto-populated] //Changed by PavanR 04oct18[to protect discount if discount auto-populated]
if (lsPlistDis != null && lsPlistDis.trim().length() > 0) { if (lsPlistDis != null && lsPlistDis.trim().length() > 0) {
......
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