Changes done for sort desp line and sord line wise @1934; invoice trace and...

Changes done for sort desp line and sord line wise @1934; invoice trace and invoice detail same tax chapter set for chargeable and free item.

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

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

@@ -560,7 +560,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			String dueDate1=getDueDate(invDespMap.get("cr_term"),ldsInvHdrMp.get("invoice__date"),invDespMap.get("eff_date"),ldsInvHdrMp.get("lr_date"),
 					invDespMap.get("cr_days"),conn);
 			xmlBuff.append("<due_date><![CDATA["+dueDate1+"]]></due_date>");			//Get due date from method "gbf_get_duedate()"
-
+			System.out.println("563 invDespMap invoice tax_class::["+invDespMap.get("tax_class")+"]tax_chap::["+invDespMap.get("tax_chap")+"]tax_env::["+invDespMap.get("tax_env")+"]");
 			xmlBuff.append("<tax_class><![CDATA["+invDespMap.get("tax_class")+"]]></tax_class>");			
 			xmlBuff.append("<tax_chap><![CDATA["+invDespMap.get("tax_chap")+"]]></tax_chap>");			
 			xmlBuff.append("<tax_env><![CDATA["+invDespMap.get("tax_env")+"]]></tax_env>");			
@@ -688,7 +688,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				invTraceDetMap=mainInvDespDetMap.get(keyStr);
 				System.out.println("Inner InvDespDetMap size:-["+invTraceDetMap.size()+"]");
 				lineNo++;
-				
+				System.out.println("691 invTraceDetMap invoice tax_class::["+invTraceDetMap.get("tax_class")+"]tax_chap::["+invTraceDetMap.get("tax_chap")+"]tax_env::["+invTraceDetMap.get("tax_env")+"]");
 				xmlBuff.append("<Detail2 dbID=\"\" domID=\""+lineNo+"\" objContext=\"2\" objName=\"invoice_po\">");		
 				xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" status=\"N\" updateFlag=\"A\"/>");
 				xmlBuff.append("<invoice_id/>");
@@ -1678,7 +1678,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			invDespDetSql="SELECT despatchdet.desp_id,despatchdet.line_no,despatchdet.sord_no,despatchdet.line_no__sord,despatchdet.exp_lev,"
 				+ "despatchdet.item_code__ord,despatchdet.item_code,despatchdet.lot_no,despatchdet.lot_sl,despatchdet.quantity__ord,"
 				+ "despatchdet.quantity,despatchdet.loc_code,despatchdet.status,despatchdet.conv__qty_stduom,despatchdet.unit__std,"
-				+ "despatchdet.unit,despatchdet.quantity__stduom as dquantity__stduom,sorddet.tax_class,sorddet.tax_chap,sorddet.tax_env,"
+				+ "despatchdet.unit,despatchdet.quantity__stduom as dquantity__stduom,despatchdet.tax_class,despatchdet.tax_chap,despatchdet.tax_env,"
 				+ "sorddet.discount,sorddet.unit__rate,sorddet.conv__qty_stduom,sorddet.conv__rtuom_stduom,sorddet.unit__std,"
 				+ "sorddet.quantity__stduom as squantity__stduom,sorddet.rate__stduom as srate__stduom,sorddet.rate,despatchdet.quantity_real,despatchdet.quantity_inv,"
 				+ "despatchdet.invoice_id,despatchdet.no_art,despatchdet.rate__clg,despatchdet.rate__stduom as drate__stduom ,despatchdet.disc_amt,"
@@ -1701,7 +1701,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				//+ " AND( DESPATCHDET.SORD_NO = ?)"
 				+ " AND( DESPATCHDET.DESP_ID >= ?)"
 				+ " AND( DESPATCHDET.DESP_ID <= ? ) )"
-				+ " ORDER BY despatchdet.sord_no ASC,despatchdet.line_no__sord ASC,despatchdet.exp_lev ASC";
+				+ " ORDER BY despatchdet.sord_no ASC,despatchdet.line_no,despatchdet.line_no__sord ASC,despatchdet.exp_lev ASC";
 			pstmt=conn.prepareStatement(invDespDetSql);
 			pstmt.setString(1,status);
 			//pstmt.setString(2,sordNo);
@@ -1791,7 +1791,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				{
 					disc_schem_offinv_amt="0";
 				}
-
+				System.out.println("invTraceMap tax_class::["+tax_class+"]tax_chap::["+tax_chap+"]tax_env::["+tax_env+"]");
 				invTraceMap.put("desp_id", desp_id);	        	
 				invTraceMap.put("line_no", line_no);	        	
 				invTraceMap.put("sord_no", sord_no);	        	
@@ -1933,7 +1933,10 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			System.out.println("@@@@@@@@@@@@@@@@@ mainInvDespDetMap["+mainInvDespDetMap+"]");
 
 				//beanMapKey=rs.getString("sord_no").trim()+"@".trim()+rs.getString("line_no__sord").trim();
-				beanMapKey=rs.getString("sord_no").trim()+"@".trim()+rs.getString("line_no").trim();
+			//Changes done by Pavan R on 09/JAN/18 Start to sort desp line and sord line wise
+			//beanMapKey=rs.getString("sord_no").trim()+"@".trim()+rs.getString("line_no").trim();	
+			beanMapKey=rs.getString("sord_no").trim()+"@".trim()+rs.getString("line_no").trim()+"@".trim()+rs.getString("line_no__sord").trim();
+			//Changes done by Pavan R on 09/JAN/18 End
 				System.out.println("beanMapKey>>>>["+beanMapKey+"]");
 				/**
 				 * Check generated key is exist in
@@ -1942,7 +1945,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				if(invDetBeanMap.get(beanMapKey)==null)
 				{
 					invoiceDetBean= new InvoiceDetBean();
-
+					System.out.println("1945@@ invDetBeanMap tax_class::["+tax_class+"]tax_chap::["+tax_chap+"]tax_env::["+tax_env+"]");
 					invoiceDetBean.setmTotDespQty(Double.parseDouble(quantity==null?"0.00":quantity));
 					invoiceDetBean.setmTotStdQty(Double.parseDouble(desp_quantity__stduom==null?"0.00":desp_quantity__stduom));
 					invoiceDetBean.setmNoArt(Integer.parseInt(no_art==null?"0":no_art));