Commit 92ca4ca7 authored by manohar's avatar manohar

changes in dist order amendment


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@91131 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 42ae420d
...@@ -1063,7 +1063,11 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal ...@@ -1063,7 +1063,11 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
double doubleRateClg = 0.0; double doubleRateClg = 0.0;
rate = genericUtility.getColumnValue( "rate", dom ); rate = genericUtility.getColumnValue( "rate", dom );
rateClg = genericUtility.getColumnValue( "rate__clg", dom ); rateClg = genericUtility.getColumnValue( "rate__clg", dom );
if (rateClg == null || rateClg.trim().length() == 0)
{
rateClg = "0";
}
doubleRateClg = Double.parseDouble( rateClg ); doubleRateClg = Double.parseDouble( rateClg );
if( rateClg == null || doubleRateClg == 0.0 || doubleRateClg == 0 ) if( rateClg == null || doubleRateClg == 0.0 || doubleRateClg == 0 )
......
...@@ -240,9 +240,10 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -240,9 +240,10 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
+" net_amt = ?, " +" net_amt = ?, "
+" tot_amt = ?, " +" tot_amt = ?, "
+" tax_amt = ?, " +" tax_amt = ?, "
+" cust_spec__no = ? " +" cust_spec__no = ?, "
+" qty_confirm = ? "
+" where dist_order = ? " +" where dist_order = ? "
+" and line_no = ? "; +" and line_no = ? " ;
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrderamd.trim()); pstmt.setString(1,distOrderamd.trim());
pstmt.setString(2,lineNoDistord.trim()); pstmt.setString(2,lineNoDistord.trim());
...@@ -257,9 +258,11 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -257,9 +258,11 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
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());
pstmt.setString(14,custSpecNo.trim()); pstmt.setString(14,custSpecNo.trim());
pstmt.setString(15,distOrderamd.trim()); pstmt.setString(15,qtyOrder.trim());
pstmt.setString(16,lineNoDistord.trim()); pstmt.setString(16,distOrderamd.trim());
pstmt.setString(17,lineNoDistord.trim());
pstmt.executeUpdate(); pstmt.executeUpdate();
...@@ -306,8 +309,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -306,8 +309,8 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
{ {
lineNo = rs1.getString( "line_no" ); lineNo = rs1.getString( "line_no" );
} }
sql = "insert into distorder_det ( dist_order,line_no,item_code,qty_order,rate,rate_clg,remarks,pack_instr,tax_class,tax_chap,tax_env ) " sql = "insert into distorder_det ( dist_order,line_no,item_code,qty_order,rate,rate_clg,remarks,pack_instr,tax_class,tax_chap,tax_env,qty_confirm ) "
+" values ( ?,?,?,?,?,?,?,?,?,?,?) "; +" values ( ?,?,?,?,?,?,?,?,?,?,?,?) ";
pstmt = conn.prepareStatement( sql ); pstmt = conn.prepareStatement( sql );
pstmt.setString(1,distOrder.trim()); pstmt.setString(1,distOrder.trim());
pstmt.setInt(2,Integer.parseInt(lineNo.trim())); pstmt.setInt(2,Integer.parseInt(lineNo.trim()));
...@@ -320,6 +323,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo ...@@ -320,6 +323,7 @@ public class DistOrderAmdConf extends ActionHandlerEJB implements DistOrderAmdCo
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.trim());
pstmt.setString(12,qtyOrder.trim());
pstmt.executeUpdate(); pstmt.executeUpdate();
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
......
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