Commit d2ecbf38 authored by mnair's avatar mnair

Changes done on line no-12195,12477 and 12484

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@172250 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b3d363a1
...@@ -12192,7 +12192,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -12192,7 +12192,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
valueXmlString.append("<rate>").append("<![CDATA[" + ldRate + "]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA[" + ldRate + "]]>").append("</rate>");
valueXmlString.append("<discount>").append("<![CDATA[" + '0' + "]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA[" + '0' + "]]>").append("</discount>");
} }
if (mVal.trim().length() > 0) //changes by mayur on 25/10/17
if (mVal.trim().length() == 0)
{ {
sql = "Select unit from item where item_code =?"; sql = "Select unit from item where item_code =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -12472,9 +12473,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal ...@@ -12472,9 +12473,17 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
{ {
mqtyStr = (String)mNum.get(1); mqtyStr = (String)mNum.get(1);
mqty = Double.parseDouble(checkDouble(mqtyStr)); mqty = Double.parseDouble(checkDouble(mqtyStr));
//changes by mayur on 25/10/17 start
mNum2 = Double.parseDouble(checkDouble(mNum.get(0).toString()));
System.out.println("mNum2 @@@@ get 0"+mNum2);
//changes by mayur on 25/10/17 end
} }
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + mqty + "]]>").append("</quantity__stduom>"); valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + mqty + "]]>").append("</quantity__stduom>");
//changes by mayur on 25/10/17
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[" + mNum2 + "]]>").append("</conv__qty_stduom>");
lsPlistDis = checkNull(genericUtility.getColumnValue("price_list__disc", dom1)); lsPlistDis = checkNull(genericUtility.getColumnValue("price_list__disc", dom1));
Timestamp orderDate = Timestamp.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1), Timestamp orderDate = Timestamp.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1),
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0"); genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.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