Skip to content

B
business-java
Commit 35d909e7 authored by cpatil's avatar cpatil
Browse files
Options

remove trim from tax_env 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97561 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7aa7d760
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 7 deletions
webitm-dis/ibase/webitm/ejb/dis/DistOrderAmdIC.java
View file @ 35d909e7
...@@ -1116,8 +1116,10 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -1116,8 +1116,10 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
valueXmlString.append("<rate>").append("<![CDATA[" + ( rate != null ? rate.trim() : "" )+ "]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA[" + ( rate != null ? rate.trim() : "" )+ "]]>").append("</rate>");
valueXmlString.append("<line_no__sord_o>").append("<![CDATA[" + ( lineNoSord != null ? lineNoSord.trim() : "" )+ "]]>").append("</line_no__sord_o>"); valueXmlString.append("<line_no__sord_o>").append("<![CDATA[" + ( lineNoSord != null ? lineNoSord.trim() : "" )+ "]]>").append("</line_no__sord_o>");
valueXmlString.append("<unit_o>").append("<![CDATA[" + ( unit != null ? unit.trim() : "" )+ "]]>").append("</unit_o>"); valueXmlString.append("<unit_o>").append("<![CDATA[" + ( unit != null ? unit.trim() : "" )+ "]]>").append("</unit_o>");
valueXmlString.append("<tax_env_o>").append("<![CDATA[" + ( taxEnv != null ? taxEnv.trim() : "" )+ "]]>").append("</tax_env_o>"); //valueXmlString.append("<tax_env_o>").append("<![CDATA[" + ( taxEnv != null ? taxEnv.trim() : "" )+ "]]>").append("</tax_env_o>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + ( taxEnv != null ? taxEnv.trim() : "" )+ "]]>").append("</tax_env>"); valueXmlString.append("<tax_env_o>").append("<![CDATA[" + ( taxEnv != null ? taxEnv : "" )+ "]]>").append("</tax_env_o>"); // remove trim by cpatil
//valueXmlString.append("<tax_env>").append("<![CDATA[" + ( taxEnv != null ? taxEnv.trim() : "" )+ "]]>").append("</tax_env>");
valueXmlString.append("<tax_env>").append("<![CDATA[" + ( taxEnv != null ? taxEnv : "" )+ "]]>").append("</tax_env>");
valueXmlString.append("<tax_chap_o>").append("<![CDATA[" + ( taxChap != null ? taxChap.trim() : "" )+ "]]>").append("</tax_chap_o>"); valueXmlString.append("<tax_chap_o>").append("<![CDATA[" + ( taxChap != null ? taxChap.trim() : "" )+ "]]>").append("</tax_chap_o>");
valueXmlString.append("<tax_chap>").append("<![CDATA[" + ( taxChap != null ? taxChap.trim() : "" )+ "]]>").append("</tax_chap>"); valueXmlString.append("<tax_chap>").append("<![CDATA[" + ( taxChap != null ? taxChap.trim() : "" )+ "]]>").append("</tax_chap>");
valueXmlString.append("<tax_class_o>").append("<![CDATA[" + ( taxClass != null ? taxClass.trim() : "" )+ "]]>").append("</tax_class_o>"); valueXmlString.append("<tax_class_o>").append("<![CDATA[" + ( taxClass != null ? taxClass.trim() : "" )+ "]]>").append("</tax_class_o>");
......
webitm-dis/ibase/webitm/ejb/dis/adv/DistOrderAmdConf.java
View file @ 35d909e7
...@@ -244,7 +244,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -244,7 +244,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
packInstr = rs.getString( "pack_instr" ) == null ? "" : rs.getString( "pack_instr" ); packInstr = rs.getString( "pack_instr" ) == null ? "" : rs.getString( "pack_instr" );
taxClass = rs.getString( "tax_class" ) == null ? "" : rs.getString( "tax_class" ); taxClass = rs.getString( "tax_class" ) == null ? "" : rs.getString( "tax_class" );
taxChap = rs.getString( "tax_chap" ) == null ? "" : rs.getString( "tax_chap" ); taxChap = rs.getString( "tax_chap" ) == null ? "" : rs.getString( "tax_chap" );
taxEnv = rs.getString( "tax_env" ) == null ? "" : rs.getString( "tax_env" ); //taxEnv = rs.getString( "tax_env" ) == null ? "" : rs.getString( "tax_env" );
taxEnv = rs.getString( "tax_env" );
netAmtDet = rs.getString( "net_amt" ) == null ? "" : rs.getString( "net_amt" ); netAmtDet = rs.getString( "net_amt" ) == null ? "" : rs.getString( "net_amt" );
taxAmtDet = rs.getString( "tax_amt" ) == null ? "" : rs.getString( "tax_amt" ); taxAmtDet = rs.getString( "tax_amt" ) == null ? "" : rs.getString( "tax_amt" );
totAmtDet = rs.getString( "tot_amt" ) == null ? "" : rs.getString( "tot_amt" ); totAmtDet = rs.getString( "tot_amt" ) == null ? "" : rs.getString( "tot_amt" );
...@@ -280,7 +281,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -280,7 +281,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
pstmt.setString(7,packInstr.trim()); pstmt.setString(7,packInstr.trim());
pstmt.setString(8,taxClass.trim()); pstmt.setString(8,taxClass.trim());
pstmt.setString(9,taxChap.trim()); pstmt.setString(9,taxChap.trim());
pstmt.setString(10,taxEnv.trim()); pstmt.setString(10,taxEnv);
pstmt.setString(11,netAmtDet.trim()); pstmt.setString(11,netAmtDet.trim());
pstmt.setString(12,totAmtDet.trim()); pstmt.setString(12,totAmtDet.trim());
pstmt.setString(13,taxAmtDet.trim()); pstmt.setString(13,taxAmtDet.trim());
...@@ -330,7 +331,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -330,7 +331,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
packInstr = rs.getString( "pack_instr" ) == null ? "" : rs.getString( "pack_instr" ); packInstr = rs.getString( "pack_instr" ) == null ? "" : rs.getString( "pack_instr" );
taxClass = rs.getString( "tax_class" ) == null ? "" : rs.getString( "tax_class" ); taxClass = rs.getString( "tax_class" ) == null ? "" : rs.getString( "tax_class" );
taxChap = rs.getString( "tax_chap" ) == null ? "" : rs.getString( "tax_chap" ); taxChap = rs.getString( "tax_chap" ) == null ? "" : rs.getString( "tax_chap" );
taxEnv = rs.getString( "tax_env" ) == null ? "" : rs.getString( "tax_env" ); //taxEnv = rs.getString( "tax_env" ) == null ? "" : rs.getString( "tax_env" );
taxEnv = rs.getString( "tax_env" );
sql = " select (max(line_no) + 1) line_no from distorder_det where dist_order = ? "; sql = " select (max(line_no) + 1) line_no from distorder_det where dist_order = ? ";
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) || "mysql".equalsIgnoreCase(CommonConstants.DB_NAME )) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) || "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
...@@ -358,7 +360,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -358,7 +360,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
pstmt.setString(8,packInstr.trim()); pstmt.setString(8,packInstr.trim());
pstmt.setString(9,taxClass.trim()); pstmt.setString(9,taxClass.trim());
pstmt.setString(10,taxChap.trim()); pstmt.setString(10,taxChap.trim());
pstmt.setString(11,taxEnv.trim()); pstmt.setString(11,taxEnv);
pstmt.setString(12,qtyOrder.trim()); pstmt.setString(12,qtyOrder.trim());
pstmt.executeUpdate(); pstmt.executeUpdate();
rs1.close(); rs1.close();
......
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