Add discount amount, rate__std,cost_rate in invoice trace

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

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

@@ -324,8 +324,14 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 		HashMap<String, String> sorderSalMap=null;
 		HashMap<String, String> disItemserMap=null;
 		HashMap<String, String> arCustomerMap=null;
+		
+		String sql="";
+		PreparedStatement pstmt=null;
+		ResultSet rs=null;
 
 		String xtraParams = null;
+		String lc_ratestd="",lc_cstrate="";
+		double lc_disc_amt=0.00,ld_discount=0.00;
 
 		String despIdKey="",despId="",sysDate="",salesInvPstHdr="",despLineNo="",userId="",termId="",loginSite="",tranId="";
 		String xmlInvString="",retString="";
@@ -633,9 +639,67 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<item_ser__prom><![CDATA[]]></item_ser__prom>");
 				xmlBuff.append("<curr_code><![CDATA["+invDespMap.get("sorder_curr_code")+"]]></curr_code>");
 				xmlBuff.append("<exch_rate><![CDATA["+invDespMap.get("sorder_exch_rate")+"]]></exch_rate>");
+				
+				
+				/**
+				 * select rate__std,cost_rate
+				 * from despatchdet
+				 * 
+				 * */
+				sql="select (case when rate__std is null then 0 else rate__std end ) as lc_ratestd,"
+						+ "(case when cost_rate is null then 0 else cost_rate end )as lc_cstrate"
+						+ "from despatchdet "
+						+ "where desp_id = ? "
+						+ " and line_no = ? "
+						+ " and item_code = ?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1, invTraceDetMap.get("desp_id"));
+				pstmt.setString(2, invTraceDetMap.get("line_no"));
+				pstmt.setString(3, invTraceDetMap.get("item_code"));
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					lc_ratestd=rs.getString("lc_ratestd");
+					lc_cstrate=rs.getString("lc_cstrate");
+				}
+				pstmt.close();
+				pstmt=null;
+				rs.close();
+				rs=null;
+				
+				
 				xmlBuff.append("<rate__stk><![CDATA[]]></rate__stk>");
-				xmlBuff.append("<rate__std><![CDATA[]]></rate__std>");
-				xmlBuff.append("<cost_rate><![CDATA[]]></cost_rate>");
+				xmlBuff.append("<rate__std><![CDATA["+lc_ratestd+"]]></rate__std>");
+				xmlBuff.append("<cost_rate><![CDATA["+lc_cstrate+"]]></cost_rate>");
+				
+				
+				/**
+				 * select dicsount 
+				 * from despatchdet
+				 * */
+				sql="select disc_amt "
+						+ "from despatchdet "
+						+ " where desp_id = ?"
+						+ " and line_no = ?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1, invTraceDetMap.get("desp_id"));
+				pstmt.setString(2, invTraceDetMap.get("line_no"));
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					lc_disc_amt=rs.getDouble("disc_amt");					
+				}
+				pstmt.close();
+				pstmt=null;
+				rs.close();
+				rs=null;
+				
+				if(lc_disc_amt > 0)
+				{
+					ld_discount=(lc_disc_amt * 100)/(Double.parseDouble(invTraceDetMap.get("desp_quantity__stduom")==null?"0.00":invTraceDetMap.get("desp_quantity__stduom")) * Double.parseDouble(invTraceDetMap.get("desp_rate__stduom")==null?"0.00":invTraceDetMap.get("desp_rate__stduom")));
+				}				
+				xmlBuff.append("<discount><![CDATA["+ld_discount+"]]></discount>");
+				
 				xmlBuff.append("<line_type><![CDATA["+invTraceDetMap.get("line_type")+"]]></line_type>");
 				xmlBuff.append("<cust_item__ref><![CDATA["+invTraceDetMap.get("cust_item__ref")+"]]></cust_item__ref>");
 				xmlBuff.append("<disc_schem_billback_amt><![CDATA[" + invTraceDetMap.get("disc_schem_billback_amt") + "]]></disc_schem_billback_amt>");				
@@ -697,9 +761,9 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<sales_pers_comm_3><![CDATA["+invDespMap.get("sales_pers_comm_3")+"]]></sales_pers_comm_3>");										
 				xmlBuff.append("<sales_pers_comm_3><![CDATA["+invDespMap.get("sales_pers_comm_3")+"]]></sales_pers_comm_3>");										
 				xmlBuff.append("<comm_amt__oc><![CDATA[]]></comm_amt__oc>");		//comm_amt__oc missing									
-				//xmlBuff.append("<tax_class><![CDATA["+invoiceDetBean.getTax_class()+"]]></tax_class>");											
-				//xmlBuff.append("<tax_chap><![CDATA["+invoiceDetBean.getTax_chap()+"]]></tax_chap>");											
-				//xmlBuff.append("<tax_env><![CDATA["+invoiceDetBean.getTax_env()+"]]></tax_env>");											
+				xmlBuff.append("<tax_class><![CDATA["+invoiceDetBean.getTax_class()+"]]></tax_class>");											
+				xmlBuff.append("<tax_chap><![CDATA["+invoiceDetBean.getTax_chap()+"]]></tax_chap>");											
+				xmlBuff.append("<tax_env><![CDATA["+invoiceDetBean.getTax_env()+"]]></tax_env>");											
 				xmlBuff.append("<desp_id><![CDATA["+invoiceDetBean.getDesp_id()+"]]></desp_id>");											
 				xmlBuff.append("<line_no_desp><![CDATA["+"1"+"]]></line_no_desp>");											
 				xmlBuff.append("<rate__clg><![CDATA["+invoiceDetBean.getRate__clg()+"]]></rate__clg>");											
@@ -745,6 +809,17 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 
 				fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
 
+				/**
+				 * Update invoice_trace
+				 * net_amount 
+				 * */
+				pstmt=conn.prepareStatement("update invoice_trace set net_amount=(quantity__stduom*rate__stduom)+tax_amt where invoice_id=? ");
+				pstmt.setString(1, tranId);
+				pstmt.executeUpdate();
+				pstmt.close();
+				pstmt=null;
+				
+				
 				/**
 				 * Call Credit check component
 				 * PostOrdCreditChk.java
@@ -1301,8 +1376,6 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 
 
 
-
-
 				invTraceMap.put("desp_id", desp_id);	        	
 				invTraceMap.put("line_no", line_no);	        	
 				invTraceMap.put("sord_no", sord_no);