Commit fd62b962 authored by pchavan's avatar pchavan

Set Total freight amount on porder post save.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203695 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3e77956c
...@@ -138,7 +138,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -138,7 +138,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
BaseLogger.log("9", null, null, "taxAMthdr["+taxAmtHdr+"]totAmtHdr["+totAmtHdr+"]quantity["+quantity+"]"); BaseLogger.log("9", null, null, "taxAMthdr["+taxAmtHdr+"]totAmtHdr["+totAmtHdr+"]quantity["+quantity+"]");
ordAmtHdr = totAmtHdr - taxAmtHdr; ordAmtHdr = totAmtHdr - taxAmtHdr;
/*sql1 ="select frt_rate,frt_type ,frt_amt__fixed from porder where purc_order = ?"; sql1 ="select frt_rate,frt_type ,frt_amt__fixed from porder where purc_order = ?";
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
...@@ -147,7 +147,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -147,7 +147,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
frtRate = rs1.getDouble(1); frtRate = rs1.getDouble(1);
frtType = checkNull(rs1.getString(2)); frtType = checkNull(rs1.getString(2));
frtAmtFixed = rs1.getDouble(3); frtAmtFixed = rs1.getDouble(3);
}*/ }
if (rs !=null) if (rs !=null)
{ {
rs.close(); rs.close();
...@@ -163,7 +163,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -163,7 +163,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
}*/ }*/
/*if(frtType.equalsIgnoreCase("Q")) if(frtType.equalsIgnoreCase("Q"))
{ {
frtAmtQty = frtRate * quantity; frtAmtQty = frtRate * quantity;
} }
...@@ -177,7 +177,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -177,7 +177,7 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
System.out.println("frtAmtQty@@@@@@@@@@@@@@@@@@@ " + frtAmtQty); System.out.println("frtAmtQty@@@@@@@@@@@@@@@@@@@ " + frtAmtQty);
frtAmt = frtAmtFixed + frtAmtQty; frtAmt = frtAmtFixed + frtAmtQty;
System.out.println("frtAmtQty@@@@@@@@@@@@@@@@@@@ " + frtAmt);*/ System.out.println("frtAmtQty@@@@@@@@@@@@@@@@@@@ " + frtAmt);
/** /**
* Following if(count>0) is commented * Following if(count>0) is commented
...@@ -187,14 +187,16 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -187,14 +187,16 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
* */ * */
// if(count > 0) // if(count > 0)
// { // {
sql = "update porder set tax_amt = ?,tot_amt = ?,ord_amt = ? where purc_order = ? "; //Changed By PriyankaC on 17July2019.
// sql = "update porder set tax_amt = ?,tot_amt = ?,ord_amt = ? where purc_order = ? ";
sql = "update porder set tax_amt = ?,tot_amt = ?,ord_amt = ? ,frt_amt = ? where purc_order = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setDouble(1, taxAmtHdr); pstmt.setDouble(1, taxAmtHdr);
pstmt.setDouble(2, totAmtHdr); pstmt.setDouble(2, totAmtHdr);
pstmt.setDouble(3, ordAmtHdr); pstmt.setDouble(3, ordAmtHdr);
/*pstmt.setDouble(4, frtAmtQty); //pstmt.setDouble(4, frtAmtQty);
pstmt.setDouble(5, frtAmt);*/ pstmt.setDouble(4, frtAmt);
pstmt.setString(4, tranId); pstmt.setString(5, tranId);
count = pstmt.executeUpdate(); count = pstmt.executeUpdate();
//System.out.println("post count---->>["+count+"]"); //System.out.println("post count---->>["+count+"]");
if (pstmt != null) if (pstmt != null)
...@@ -319,6 +321,15 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal, ...@@ -319,6 +321,15 @@ public class POrderPostSave extends ValidatorEJB implements POrderPostSaveLocal,
} }
return errorString; return errorString;
} }
private String checkNull(String input)
{
if (input == null || "null".equalsIgnoreCase(input) || "undefined".equalsIgnoreCase(input))
{
input= "";
}
return input.trim();
}
} }
......
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