Skip to content

B
business-java
Commit 82dde2e1 authored by ngadkari's avatar ngadkari
Browse files
Options

rate conversion and Conv. Qty STD column make non editable when unit and unit std are same 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203874 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1b08a2da
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 8 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java
View file @ 82dde2e1
...@@ -9313,7 +9313,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -9313,7 +9313,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
double lsCommPerc1D = 0.00, lsCommPerc2D = 0.00; double lsCommPerc1D = 0.00, lsCommPerc2D = 0.00;
String lsCommPercOn2D = "", lsCommPercOn1D = ""; String lsCommPercOn2D = "", lsCommPercOn1D = "";
lsItemCode = checkNull(genericUtility.getColumnValue("item_code", dom)); lsItemCode = checkNull(genericUtility.getColumnValue("item_code", dom));
String unit="",unitStd="",unitRate="",conveQtyStduom="",convRtuomStduom="";
sql = "select (case when sale_rate is null then 0 else sale_rate end) as lc_sale_rate,sh_descr from item where item_code=?"; sql = "select (case when sale_rate is null then 0 else sale_rate end) as lc_sale_rate,sh_descr from item where item_code=?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, lsItemCode); pstmt.setString(1, lsItemCode);
...@@ -9480,6 +9481,30 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -9480,6 +9481,30 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("<![CDATA[" + lsCommPercOn2D + "]]>").append("</comm_perc_on_3>"); .append("<![CDATA[" + lsCommPercOn2D + "]]>").append("</comm_perc_on_3>");
} }
} }
//added by nandkumar gadkari on 22/07/19-----start-----------------------
unit = checkNull(genericUtility.getColumnValue("unit", dom));
unitStd = checkNull(genericUtility.getColumnValue("unit__std", dom));
conveQtyStduom = genericUtility.getColumnValue("conv__qty_stduom", dom);
unitRate = checkNull(genericUtility.getColumnValue("unit__rate", dom));
convRtuomStduom = genericUtility.getColumnValue("conv__rtuom_stduom", dom);
if (unit.trim().equalsIgnoreCase(unitStd.trim())) {
valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("<![CDATA[" + conveQtyStduom + "]]>").append("</conv__qty_stduom>");
}
else
{
valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + conveQtyStduom + "]]>").append("</conv__qty_stduom>");
}
if(unitStd.trim().equalsIgnoreCase(unitRate.trim()))//if condition added by nandkumar gadkari on 22/07/19
{
valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("<![CDATA[" + convRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
else
{
valueXmlString.append("<conv__rtuom_stduom protect = \"0\">").append("<![CDATA[" + convRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
//added by nandkumar gadkari on 22/07/19-----end-----------------------
} else if (currentColumn.trim().equalsIgnoreCase("itm_default")) { } else if (currentColumn.trim().equalsIgnoreCase("itm_default")) {
String lsSiteCodeShip = "", dueDateStr = ""; String lsSiteCodeShip = "", dueDateStr = "";
String lsCommPercOnStr = ""; String lsCommPercOnStr = "";
...@@ -13874,8 +13899,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -13874,8 +13899,18 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
ldRate = Double.parseDouble(checkDouble(genericUtility.getColumnValue("rate", dom))); ldRate = Double.parseDouble(checkDouble(genericUtility.getColumnValue("rate", dom)));
lcRateStduom = distCommon.convQtyFactor(mVal1, mCode, mItem, ldRate, conn); lcRateStduom = distCommon.convQtyFactor(mVal1, mCode, mItem, ldRate, conn);
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>")
if(mVal1.trim().equalsIgnoreCase(mCode.trim()))//if condition added by nandkumar gadkari on 22/07/19
{
valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("<![CDATA[" + lcConvRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
else
{
valueXmlString.append("<conv__rtuom_stduom protect = \"0\">").append("<![CDATA[" + lcConvRtuomStduom + "]]>")
.append("</conv__rtuom_stduom>"); .append("</conv__rtuom_stduom>");
}
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + lcRateStduom + "]]>") valueXmlString.append("<rate__stduom>").append("<![CDATA[" + lcRateStduom + "]]>")
.append("</rate__stduom>"); .append("</rate__stduom>");
} catch (ITMException e) { } catch (ITMException e) {
...@@ -13989,12 +14024,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -13989,12 +14024,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>") valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>")
.append("</conv__rtuom_stduom>"); .append("</conv__rtuom_stduom>");
// changes by mayur on 26/10/17 ---end // changes by mayur on 26/10/17 ---end
if(mVal1.trim().equalsIgnoreCase(mVal.trim()))//if condition added by nandkumar gadkari on 22/07/19
{
valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("<![CDATA[" + lcConvRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
} }
if (mNum3 == 0) { if (mNum3 == 0) {
if (mVal.trim().equalsIgnoreCase(mVal1.trim())) { if (mVal.trim().equalsIgnoreCase(mVal1.trim())) {
valueXmlString.append("<conv__rtuom_stduom>").append("1").append("</conv__rtuom_stduom>"); valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("1").append("</conv__rtuom_stduom>"); //column protected by nandkumar gadkari on 22/07/19
} else { } else {
valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>") valueXmlString.append("<conv__rtuom_stduom protect = \"0\">").append("<![CDATA[" + lcConvRtuomStduom + "]]>")
.append("</conv__rtuom_stduom>"); .append("</conv__rtuom_stduom>");
} }
} }
...@@ -14213,9 +14252,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -14213,9 +14252,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
mNum1 = Double.parseDouble(checkDouble(genericUtility.getColumnValue("quantity", dom))); mNum1 = Double.parseDouble(checkDouble(genericUtility.getColumnValue("quantity", dom)));
mNum2 = Double.parseDouble(checkDouble(genericUtility.getColumnValue("conv__qty_stduom", dom))); mNum2 = Double.parseDouble(checkDouble(genericUtility.getColumnValue("conv__qty_stduom", dom)));
if (lsUnit.trim().equalsIgnoreCase(mVal1.trim())) { if (lsUnit.trim().equalsIgnoreCase(mVal1.trim())) {
valueXmlString.append("<conv__qty_stduom>").append("1").append("</conv__qty_stduom>"); valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("1").append("</conv__qty_stduom>");// column protected by nandkumar gadkari on 22/07/19
} else { } else {
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + mNum2 + "]]>") valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + mNum2 + "]]>")
.append("</conv__qty_stduom>"); .append("</conv__qty_stduom>");
} }
mNum = distCommon.getConvQuantityFact(lsUnit, mVal1, lsItemCodeOrd, mNum1, mNum2, conn); mNum = distCommon.getConvQuantityFact(lsUnit, mVal1, lsItemCodeOrd, mNum1, mNum2, conn);
...@@ -14233,9 +14272,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -14233,9 +14272,12 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
.append("</quantity__stduom>"); .append("</quantity__stduom>");
// changes by mayur on 25/10/17 // changes by mayur on 25/10/17
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + mNum2 + "]]>") if (lsUnit.trim().equalsIgnoreCase(mVal1.trim())) {// if condition to protect column added by nandkumar gadkari on 22/07/19
valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("<![CDATA[" + mNum2 + "]]>").append("</conv__qty_stduom>");
} else {
valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + mNum2 + "]]>")
.append("</conv__qty_stduom>"); .append("</conv__qty_stduom>");
}
lsPlistDis = checkNull(genericUtility.getColumnValue("price_list__disc", dom1)); lsPlistDis = checkNull(genericUtility.getColumnValue("price_list__disc", dom1));
Timestamp orderDate = Timestamp Timestamp orderDate = Timestamp
.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1), .valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
......
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