Commit 388c0db9 authored by mnair's avatar mnair

In itemchange---->Ordertype condition has been changed from (>0) to (== 0)

Changes has been done in the line no given below:
line no-4451,4467,4484,4500


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@44053 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3961efab
...@@ -4161,6 +4161,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4161,6 +4161,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<territory_descr>").append("<![CDATA[" + lsTerrdescr + "]]>").append("</territory_descr>"); valueXmlString.append("<territory_descr>").append("<![CDATA[" + lsTerrdescr + "]]>").append("</territory_descr>");
} }
} }
//Changes done by Mayur.K.Nair on 07/JUNE/17-----[START]
else if ((currentColumn.trim().equalsIgnoreCase("order_type"))) else if ((currentColumn.trim().equalsIgnoreCase("order_type")))
{ {
...@@ -4446,7 +4448,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4446,7 +4448,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
lsOrdtypeSample = distCommon.getDisparams("999999", "SAMPLE_ORDER_TYPE", conn); lsOrdtypeSample = distCommon.getDisparams("999999", "SAMPLE_ORDER_TYPE", conn);
if (lbOrdFlag) if (lbOrdFlag)
{ {
if (lsPlistClg == null || lsPlistClg.trim().length() > 0) if (lsPlistClg == null || lsPlistClg.trim().length() == 0)
{ {
sql = "select price_list__clg from site_customer where cust_code = ? and site_code = ?"; sql = "select price_list__clg from site_customer where cust_code = ? and site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4462,7 +4464,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4462,7 +4464,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close(); rs.close();
rs = null; rs = null;
} }
if (lsPlistClg == null || lsPlistClg.trim().length() > 0) if (lsPlistClg == null || lsPlistClg.trim().length() == 0)
{ {
sql = "select price_list__clg from customer where cust_code = ?"; sql = "select price_list__clg from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4479,7 +4481,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4479,7 +4481,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
} }
} else } else
{ {
if (lsPlistClg == null || lsPlistClg.trim().length() > 0) if (lsPlistClg == null || lsPlistClg.trim().length() == 0)
{ {
sql = "select price_list__clg from site_customer where cust_code = ? and site_code = ?"; sql = "select price_list__clg from site_customer where cust_code = ? and site_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4495,7 +4497,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4495,7 +4497,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
rs.close(); rs.close();
rs = null; rs = null;
} }
if (lsPlistClg == null || lsPlistClg.trim().length() > 0) if (lsPlistClg == null || lsPlistClg.trim().length() == 0)
{ {
sql = "select price_list__clg from customer where cust_code = ?"; sql = "select price_list__clg from customer where cust_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -4635,6 +4637,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -4635,6 +4637,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<ovos_amt>").append("<![CDATA[" + lcOvosAmt + "]]>").append("</ovos_amt>"); valueXmlString.append("<ovos_amt>").append("<![CDATA[" + lcOvosAmt + "]]>").append("</ovos_amt>");
setNodeValue( dom, "ovos_amt", getAbsString( lcOvosAmt ) ); setNodeValue( dom, "ovos_amt", getAbsString( lcOvosAmt ) );
} }
//Changes done by Mayur.K.Nair on 07/JUNE/17-----[END]
else if (currentColumn.trim().equalsIgnoreCase("item_ser")) else if (currentColumn.trim().equalsIgnoreCase("item_ser"))
{ {
......
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