merge from branch

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

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

@@ -255,9 +255,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 				/**************************For despatch GP NO Generation********************************************************************/	
 
 
-
-
-
+				varValue=	distCommon.getDisparams("999999", "GP_NO_REQ", conn);
+				if("NULLFOUND".equalsIgnoreCase(varValue))
+				{
+					varValue = "Y";
+				}
+				if("Y".equals(varValue))
+				{
 					sql1 = "select site_code__exc "
 						+" from site where site_code = ? ";
 
@@ -335,7 +339,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 					pstmt1.close();
 					pstmt1 = null;
 
-
+				}
 
 				//despatch_edit.setitem(ll_ctr,"confirmed", 'Y')	//Ruchira 21/09/2k5 taken out of abovve if ... endif statement.
 				//		CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
@@ -1370,23 +1374,38 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
 							//Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false;
 							clubOrder = "N";
 							clubPendingOrd="N";
-							adjDrcr="N";
-							adjCustAdv="N";
-							advAdjMode="C";
-							adjNewProdInv="N";
+							//adjDrcr="N";
+							//adjCustAdv="N";
+							//advAdjMode="C";
+							//adjNewProdInv="N";
 
+							adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn));
+							adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn));
+							adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn));
+							advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
 
-							PostOrderProcess postOrderProcess = new PostOrderProcess();
-
+							System.out.println("@@@@@adjDrcr["+adjDrcr+"]adjCustAdv["+adjCustAdv+"]adjNewProdInv["+adjNewProdInv+"]advAdjMode["+advAdjMode+"]");
 							
+							PostOrderProcess postOrderProcess = new PostOrderProcess();
 							// fromSaleOrder,   toSaleOrder, fromCustCode,   toCustCode, tranIdDespatch,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn
+							long startTime = System.currentTimeMillis();
+							System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
 							
 							errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId ,  orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn);
 
+							long endTime = System.currentTimeMillis();
+							System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
+							System.out.println("DIFFERANCE IN TIME FOR POST ORDER PROCESS IN SECONDS:::["+(endTime-startTime)/1000+"]for SALE_ORDER["+fromSaleOrder+"]");
+
+							
 							System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
+							if(errString.indexOf("Success") > -1)
+							{
+								errString = "";
 							}
 						}
-
+					}
+					System.out.println("@@@@@@@@@689 out:::::["+errString+"]");
 					if( errString == null || errString.trim().length() == 0)
 					{
 						System.out.println("errCode in despatch posting===="+errString);

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

@@ -62,7 +62,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 	double lcAdj = 0;
 	String xmlValues = null;
 	String mTranId="", mTranSer="", mRefNo="";
-	
+	String  sqlStr1 = "";
 	try
 	{
 
@@ -71,8 +71,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		genericUtility = new E12GenericUtility();
 		itmDBAccessEJB = new ITMDBAccessEJB();
 
-		//24/01/14 manoharan FI3JSUN007 adjust freight dr note also
-		drnNotIn = " ";
+		//24/01/14 manoharan FI3JSUN007 adjust freight dr note alsof
 
 		if (frtDrnArr.length == 1)
 		{
@@ -84,11 +83,16 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 
 		drnNotIn ="";
 		for(int i = 0; i < frtDrnArr.length; i++)
+		{
+			if(  frtDrnArr[i] != null && frtDrnArr[i].trim().length() > 0)
 			{
 				drnNotIn =drnNotIn+"'"+frtDrnArr[i]+"',";
 			}
+		}
+		if( drnNotIn != null && drnNotIn.trim().length() > 0)
+		{
 			drnNotIn =drnNotIn.substring(0,drnNotIn.length()-1);
-		System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]");
+		}System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]");
 		adjustNewProduct = distCommon.getDisparams("999999","ADJUST_NEWPRODUCT",conn);
 		if (!"NULLFOUND".equals(adjustNewProduct) || "Y".equals(adjustNewProduct) )
 		{
@@ -257,23 +261,23 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		pstmt.close();
 		pstmt = null;
 		//ended by bhavin
-
+System.out.println("@@@@@@@@264 drnNotIn["+drnNotIn+"]");
 		//24/01/14 Manoharan FI3JSUN007 adjust all the freight drn
 		if (drnNotIn.trim().length() > 0  )
 		{
-			sqlStr = "insert into receivables_adj "
+			sqlStr1 = "insert into receivables_adj "
 				+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 				+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
-			pstmtInsert  = conn.prepareStatement(sqlStr);
+			pstmtInsert  = conn.prepareStatement(sqlStr1);
 			//old logic kept in this Condition
 			sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "
-				+ " where  tran_ser = 'MDRCRD' and ref_no in ( ? ) "  //( " + drnNotIn + ") ) "
+				+ " where  tran_ser = 'MDRCRD' and ref_no in ( "+drnNotIn+" ) "  
 				+ " and tot_amt - adj_amt > 0 " 
 				+ " and site_code = '" + siteCode + "' " 
 				+ " and item_ser  = '" + itemSer + "' " 
 				+ " and cust_code = '" + custCode + "' order by tran_id ";
 			pstmt = conn.prepareStatement(sqlStr);
-			pstmt.setString(1,mOrderNo);
+			//pstmt.setString(1,drnNotIn);
 			rs = pstmt.executeQuery();
 			while(rs.next())
 			{
@@ -328,7 +332,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		//04-09-2005 manoharan
 		//reverted on 15-09-2005 as per sun requirement
 		//if (adjDrCr = TRUE ) //Commented by jasmina-19/01/10-DI89SUN228
-
+System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]adjustNewProduct["+adjustNewProduct+"]ordTypeNewPrd["+ordTypeNewPrd+"]");
 		if (adjDrCr  || (adjNewProdInv  && ("Y".equals(adjustNewProduct) && ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) ) ) //Added by jasmina-19/01/10-DI89SUN228
 		{
 			//if (adjDrCr or adjustNewProduct = 'Y' )
@@ -353,8 +357,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			//
 
 			String[] arrStr;
+			System.out.println("@@@@@@@@360 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]");
 			if (adjDrCr && adjNewProdInv ) //if (condition Added by jasmina-19/01/10-DI89SUN228
 			{
+				System.out.println("1@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				//old logic kept in this Condition
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) 
@@ -394,6 +400,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 				//}
 				// 04-09-2005 manoharan
 				//if ((not isnull(ordTypeNewPrd)) and (len(trim(ordTypeNewPrd)) > 0) )
+				System.out.println("@@@@@@@@ ordTypeNewPrd["+ordTypeNewPrd+"]adjustNewProduct["+adjustNewProduct+"]tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				if (ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
 				{
 					// end 04-09-2005 manoharan
@@ -418,7 +425,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 					}
 					else
 					{
-						sqlStr = sqlStr + " ) ";
+					//	sqlStr = sqlStr + " ) ";//TEST
 					}
 				}
 				sqlStr =  sqlStr + " and tot_amt - adj_amt > 0 " 
@@ -430,6 +437,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (adjDrCr && (!adjNewProdInv) )  //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("2@@@@@@@@ ");
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) 
 				{
@@ -476,6 +484,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (!adjDrCr && adjNewProdInv ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("3@@@@@@@@ ");
 				if ( ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
 				{
 					
@@ -503,10 +512,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 
 			
 			
-			sqlStr = "insert into receivables_adj "
+			sqlStr1 = "insert into receivables_adj "
 				+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 				+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
-			pstmtInsert  = conn.prepareStatement(sqlStr);
+			pstmtInsert  = conn.prepareStatement(sqlStr1);
 
 			pstmt = conn.prepareStatement(sqlStr);
 			rs = pstmt.executeQuery();
@@ -593,6 +602,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			//String[] arrStr;
 			if (adjDrCr && adjNewProdInv) //if (condition Added by jasmina-19/01/10-DI89SUN228
 			{
+				System.out.println("4@@@@@@@@ ");
 				//old logic kept in this Condition
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
@@ -658,7 +668,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 					}
 					else
 					{
-						sqlStr = sqlStr + " ) ";
+						//sqlStr = sqlStr + " ) ";
 					}
 				}
 				sqlStr =  sqlStr + " and tot_amt - adj_amt > 0 " 
@@ -670,6 +680,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}
 			else if (adjDrCr && !adjNewProdInv)  //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
+				System.out.println("5@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
 				sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
 				if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
 				{
@@ -716,7 +727,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			}	
 			else if (!adjDrCr && adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
 			{
-				
+				System.out.println("6@@@@@@@@ ");
 				if ((ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) && "Y".equals(adjustNewProduct))
 				{
 					arrStr = ordTypeNewPrd.split(",");
@@ -972,11 +983,11 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 				nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
 				System.out.println("nextID ["+nextID + "]");
 				// 09-01-02 End Arif
-				sqlStr = "insert into receivables_adj "
+				sqlStr1 = "insert into receivables_adj "
 					+ " (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
 					+ " values (?, ?, ?, ?, ?, ?, ?, ? ,?) ";
 				pstmtInsert.close();	
-				pstmtInsert = conn.prepareStatement(sqlStr);
+				pstmtInsert = conn.prepareStatement(sqlStr1);
 
 				pstmtInsert.setString(1,nextID);
 				pstmtInsert.setString(2,mTranSer);
@@ -1015,18 +1026,18 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
 			System.out.println("nextID ["+nextID + "]");
 			// 09-01-02 End Arif
-			sqlStr = "INSERT INTO receivables_adj "
+			sqlStr1 = "INSERT INTO receivables_adj "
 				+ " (tran_id, ref_ser, ref_no, tot_amt, "
 				+ " adj_amt, ref_ser_adj, ref_no_adj, "
 				+ " net_amt, tran_id__rcv ) "
 				+ " values (?, ?, ?, ?, ?, ' ', ' ', ?, ' ') ";
-			pstmtInsert = conn.prepareStatement(sqlStr);
+			pstmtInsert = conn.prepareStatement(sqlStr1);
 
 			pstmtInsert.setString(1,nextID);
 			pstmtInsert.setString(2,adjTranSer);
 			pstmtInsert.setString(3,adjRefNo);
 			pstmtInsert.setDouble(4,netAmt);
-			pstmtInsert.setDouble(5,(mDrAmt - netAmt) * -1);
+			pstmtInsert.setDouble(5,netAmt-((mDrAmt - netAmt) * -1));
 			pstmtInsert.setDouble(6,(netAmt - (mDrAmt - netAmt)));
 			pstmtInsert.executeUpdate();
 			pstmtInsert.close();
@@ -1037,7 +1048,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 			pstmtInsert = conn.prepareStatement(sqlStr);
 
 			pstmtInsert.setDouble(1,(mDrAmt - netAmt) * -1);
-			pstmtInsert.setString(1,invoiceId);
+			pstmtInsert.setString(2,invoiceId);
 			pstmtInsert.executeUpdate();
 
 		}

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

@@ -339,7 +339,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 		int lineNo=0,lineNoDet=0;
 		Timestamp dueDate=null;
 		String acctCodeDis="",cctrCodeDis="",acctCodeAr="",cctrCodeAr = "",acctCodePr="",cctrCodePr="",marketReg = "",mfgDateStr="",expDateStr="";
-
+		double netAmt=0,taxAmt=0,commAmt=0,discAmt=0,invAmt=0;
 		/**
 		 * Generate Bean object
 		 * */
@@ -564,7 +564,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 			xmlBuff.append("<sales_pers_comm_2><![CDATA["+invDespMap.get("sales_pers_comm_2")+"]]></sales_pers_comm_2>"); 			 
 			xmlBuff.append("<sales_pers_comm_3><![CDATA["+invDespMap.get("sales_pers_comm_3")+"]]></sales_pers_comm_3>"); 			 
 			xmlBuff.append("<round_adj><![CDATA[]]></round_adj>");		// Set round_adj  			 
-			xmlBuff.append("<net_amt><![CDATA[]]></net_amt>");		  	// Set net_amt	
+			xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>");		  	// Set net_amt	
 			xmlBuff.append("</Detail1>");
 
 
@@ -603,8 +603,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<tax_class><![CDATA["+invTraceDetMap.get("tax_class")+"]]></tax_class>");											
 				xmlBuff.append("<tax_chap><![CDATA["+invTraceDetMap.get("tax_chap")+"]]></tax_chap>");											
 				xmlBuff.append("<tax_env><![CDATA["+invTraceDetMap.get("tax_env")+"]]></tax_env>");
-				xmlBuff.append("<tax_amt><![CDATA[]]></tax_amt>");				//tax_amt missing							
-				xmlBuff.append("<net_amt><![CDATA[]]></net_amt>");				//net_amt missing
+				xmlBuff.append("<tax_amt><![CDATA[0]]></tax_amt>");				//tax_amt missing							
+				xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>");				//net_amt missing
 				xmlBuff.append("<unit__std><![CDATA[" + invTraceDetMap.get("sord_unit__std") + "]]></unit__std>");
 				xmlBuff.append("<conv__qty_stduom><![CDATA[" + invTraceDetMap.get("sord_conv__qty_stduom") + "]]></conv__qty_stduom>");				
 				xmlBuff.append("<quantity__stduom><![CDATA[" + invTraceDetMap.get("desp_quantity__stduom") + "]]></quantity__stduom>");
@@ -751,7 +751,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<conv__rtuom_stduom><![CDATA[" + invoiceDetBean.getConv__rtuom_stduom() + "]]></conv__rtuom_stduom>");				
 				xmlBuff.append("<rate__stduom><![CDATA[" + invoiceDetBean.getDesp_rate__stduom() + "]]></rate__stduom>");				
 				xmlBuff.append("<discount><![CDATA[" + invoiceDetBean.getDiscount() + "]]></discount>");				
-				xmlBuff.append("<disc_amt><![CDATA[" + invoiceDetBean.getDisc_amt()+ "]]></disc_amt>");				
+				xmlBuff.append("<disc_amt><![CDATA[" + invoiceDetBean.getDisc_amt() + "]]></disc_amt>");				
 				xmlBuff.append("<disc_schem_billback_amt><![CDATA[" + invoiceDetBean.getDisc_schem_billback_amt()+ "]]></disc_schem_billback_amt>");				
 				xmlBuff.append("<disc_schem_offinv_amt><![CDATA[" + invoiceDetBean.getDisc_schem_offinv_amt() + "]]></disc_schem_offinv_amt>");				
 				xmlBuff.append("<acc_code__item><![CDATA[" + invoiceDetBean.getAcc_code__item() + "]]></acc_code__item>");								
@@ -769,8 +769,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<rate__clg><![CDATA["+invoiceDetBean.getRate__clg()+"]]></rate__clg>");											
 				xmlBuff.append("<fin_scheme><![CDATA["+invoiceDetBean.getFin_scheme()+"]]></fin_scheme>");											
 				xmlBuff.append("<cust_item__ref><![CDATA["+invoiceDetBean.getCust_item__ref()+"]]></cust_item__ref>");											
-				xmlBuff.append("<tax_amt><![CDATA[]]></tax_amt>");				//tax_amt missing							
-				xmlBuff.append("<net_amt><![CDATA[]]></net_amt>");				//net_amt missing								
+				xmlBuff.append("<tax_amt><![CDATA[0]]></tax_amt>");				//tax_amt missing							
+				xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>");				//net_amt missing								
 				xmlBuff.append("<chg_date><![CDATA["+sysDate+"]]></chg_date>");												
 				xmlBuff.append("<chg_user><![CDATA["+userId+"]]></chg_user>");												
 				xmlBuff.append("<chg_term><![CDATA["+termId+"]]></chg_term>");	
@@ -807,6 +807,43 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue);
 				System.out.println("@V@ Tran id :- [" + tranId + "]");
 				
+				sql="update invdet set net_amt=(quantity__stduom*rate__stduom)- ( case when disc_amt is null then 0 else disc_amt end ) +tax_amt where invoice_id=?";
+				//sql="update invdet set net_amt=(quantity__stduom*rate__stduom)-disc_amt+tax_amt where invoice_id=?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,tranId);
+				pstmt.executeUpdate();
+				pstmt.close();
+				pstmt=null;
+				sql="select sum(net_amt),sum(tax_amt),sum(comm_amt),sum(disc_amt) from invdet where invoice_id=?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setString(1,tranId);
+				rs=pstmt.executeQuery();
+				if(rs.next())
+				{
+					netAmt=rs.getDouble(1);
+					taxAmt=rs.getDouble(2);
+					commAmt=rs.getDouble(3);
+					discAmt=rs.getDouble(4);
+				}
+				rs.close();
+				rs=null;
+				pstmt.close();
+				pstmt=null;
+				sql="update invoice set net_amt=?,tax_amt=?,comm_amt=?,disc_amt=?,inv_amt=? where invoice_id=?";
+				pstmt=conn.prepareStatement(sql);
+				pstmt.setDouble(1,netAmt);
+				pstmt.setDouble(2,taxAmt);
+				pstmt.setDouble(3,commAmt);
+				pstmt.setDouble(4,discAmt);
+				pstmt.setDouble(5,netAmt-taxAmt);
+				pstmt.setString(6,tranId);
+				pstmt.executeUpdate();
+				pstmt.close();
+				pstmt=null;
+				netAmt=0;
+				taxAmt=0;
+				commAmt=0;
+				discAmt=0;
 				fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
 
 				/**
@@ -820,7 +857,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 //				pstmt=null;
 				
 				String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv="";
-				double taxAmt=0,netAmt=0;
+				//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());