wrong tax chap inserted invdet by sorting beanMapKey as sordNo+sordLine+itemCode

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@178271 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoiceGen.java

@@ -1028,7 +1028,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 //				pstmt.close();
 //				pstmt=null;
 				
-				String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv="";
+				String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv="",itemCode="";
 				//double taxAmt=0,netAmt=0;
 				double totTaxAmt=0,totNetAmt=0;
 				//fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
@@ -1063,29 +1063,41 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 						+ " from invoice_trace"
 						+ " where invoice_id=? "
 						+ " group by sord_no,sord_line_no,tax_class,tax_chap,tax_env");*/
-				pstmt=conn.prepareStatement("select sord_no,line_no,tax_class,tax_chap,tax_env,sum(tax_amt),sum(net_amt)"
+				/*pstmt=conn.prepareStatement("select sord_no,line_no,tax_class,tax_chap,tax_env,sum(tax_amt),sum(net_amt)"
 						+ " from invoice_trace"
 						+ " where invoice_id=? "
-						+ " group by sord_no,line_no,tax_class,tax_chap,tax_env");
+						+ " group by sord_no,line_no,tax_class,tax_chap,tax_env");*/
+				pstmt=conn.prepareStatement("select sord_no,sord_line_no,item_code,tax_class,tax_chap,tax_env,sum(tax_amt),sum(net_amt)"
+						+ " from invoice_trace"
+						+ " where invoice_id=? "
+						+ " group by sord_no,sord_line_no,item_code,tax_class,tax_chap,tax_env");
 				pstmt.setString(1,tranId);
 				rs=pstmt.executeQuery();
 				while(rs.next())
 				{
 					sordNo=rs.getString(1);
 					soLineNo=rs.getString(2);
-					taxClass=rs.getString(3);
-					taxChap=rs.getString(4);
-					taxEnv=rs.getString(5);
-					taxAmt=rs.getDouble(6);
-					netAmt=rs.getDouble(7);
+					itemCode=rs.getString(3);
+					taxClass=rs.getString(4);
+					taxChap=rs.getString(5);
+					taxEnv=rs.getString(6);
+					taxAmt=rs.getDouble(7);
+					netAmt=rs.getDouble(8);
 					totTaxAmt+=taxAmt;
 					totNetAmt+=netAmt;
 								
-					sql="update invdet set tax_class=?,tax_chap=?,tax_env=?,tax_amt=tax_amt+?,net_amt=net_amt+?+?"
+					
+					/*sql="update invdet set tax_class=?,tax_chap=?,tax_env=?,tax_amt=tax_amt+?,net_amt=net_amt+?+?"
 							+ " where invoice_id=? "
 							+ " and sord_no=? "
 							//+ " and sord_line_no=?";
-							+ " and line_no=?";
+							+ " and line_no=?";*/
+					sql="update invdet set tax_class=?,tax_chap=?,tax_env=?,tax_amt=tax_amt+?,net_amt=net_amt+?+?"
+							+ " where invoice_id=? "
+							+ " and sord_no=? "
+							+ " and sord_line_no=?"
+							//+ " and line_no=?";
+							+ " and item_code=?";
 					pstmt1=conn.prepareStatement(sql);
 					pstmt1.setString(1,taxClass);
 					pstmt1.setString(2,taxChap);
@@ -1096,6 +1108,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 					pstmt1.setString(7,tranId);
 					pstmt1.setString(8,sordNo);
 					pstmt1.setString(9,soLineNo);
+					pstmt1.setString(10,itemCode);
 					pstmt1.executeUpdate();
 				}
 				rs.close();