Tax chap insert in sorditem and carry forward to despatch.

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

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

@@ -46,6 +46,7 @@ public class PostOrdDespatchGen
 	E12GenericUtility genericUtility=new E12GenericUtility();
 	FinCommon finCommon=new FinCommon();
 	ArrayList<String> sordDisList=new ArrayList<String>();
+	@SuppressWarnings("unchecked")
 	public String createDespatch(String saleOrderfr, String saleOrderTo,String custCodeFr, String custCodeTo, Timestamp frDate,
 			Timestamp toDate, String siteCodeShip, String clubOrder,String xtraParams,Connection conn)	throws RemoteException, ITMException, SQLException 
 			{
@@ -255,7 +256,6 @@ public class PostOrdDespatchGen
 				rateStd = rs.getDouble("RATE__STD");
 				unitRateSord = rs.getString("UNIT__RATE");
 				unitSord = rs.getString("UNIT");
-				
 				 taxClass=rs.getString("TAX_CLASS");
 				 taxChap=rs.getString("TAX_CHAP");
 				 taxEnv=rs.getString("TAX_ENV");
@@ -712,6 +712,25 @@ public class PostOrdDespatchGen
 						pstmt1 = null;
 						status="I";
 						
+						
+						//adding tax chap from sorditem
+						sql="select tax_chap  from sorditem where  sale_order = ? and item_code = ? and exp_lev = ? and line_no = ?";
+						pstmt1=	conn.prepareStatement(sql);
+						pstmt1.setString(1, saleOrder);
+						pstmt1.setString(2, itemCode);
+						pstmt1.setString(3, expLev);
+						pstmt1.setString(4, lineNo);
+						rs1=pstmt1.executeQuery();
+						if(rs1.next())
+						{
+							taxChap =checkNull(rs1.getString("tax_chap"));
+						}
+						rs1.close();
+						rs1 = null;
+						pstmt1.close();
+						pstmt1 = null;
+						
+						
 					//	System.out.println("@@@@@@@ quantity allocQty["+allocQty+"]");
 						
 						tempMapSord=new HashMap();// contain values for sorditem
@@ -749,9 +768,9 @@ public class PostOrdDespatchGen
 						tempMapSord.put("site_code__mfg", siteCde);
 						tempMapSord.put("status", status);
 
-						tempMapSord.put("tax_chap", taxChap);
-						tempMapSord.put("tax_class", taxClass);
-						tempMapSord.put("tax_env", taxEnv);
+						tempMapSord.put("tax_chap", taxChap.trim());
+						tempMapSord.put("tax_class", taxClass.trim());
+						tempMapSord.put("tax_env", taxEnv.trim());
 						confDiffAmt=0;
 						tempMapSord.put("conf_diff_amt", confDiffAmt);
 
@@ -1657,7 +1676,7 @@ public class PostOrdDespatchGen
 								"LOT_NO ,LOT_SL,QUANTITY__ORD,QUANTITY,LOC_CODE ,STATUS," +
 								"CONV__QTY_STDUOM,UNIT__STD,UNIT,QUANTITY__STDUOM,QUANTITY_REAL," +
 								"RATE__STDUOM,NO_ART ,SITE_CODE,MFG_DATE,EXP_DATE,SITE_CODE__MFG," +
-								"RATE__CLG,DISC_AMT,COST_RATE,CUST_ITEM__REF,RETEST_DATE,CONF_DIFF_AMT,CONV__RTUOM_STDUOM,RATE__STD,TAX_CLASS,TAX_CHAP,TAX_ENV) " +
+								"RATE__CLG,DISC_AMT,COST_RATE,CUST_ITEM__REF,RETEST_DATE,CONF_DIFF_AMT,CONV__RTUOM_STDUOM,RATE__STD,TAX_CHAP,TAX_CLASS,TAX_ENV) " +
 								"values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 						pstmtdDet = conn.prepareStatement(sql);
 						pstmtdDet.setString(1,tranId);
@@ -1698,9 +1717,9 @@ public class PostOrdDespatchGen
 						pstmtdDet.setDouble(30,(Double)sordDetMap.get("conf_diff_amt"));
 						pstmtdDet.setDouble(31,(Double)sordDetMap.get("conv__rtuom_stduom"));
 						pstmtdDet.setDouble(32,(Double)sordDetMap.get("rate__std"));
-						pstmtdDet.setString(33,sordDetMap.get("tax_class").toString());		
-						pstmtdDet.setString(34,sordDetMap.get("tax_chap").toString());		
-						pstmtdDet.setString(35,sordDetMap.get("tax_env").toString());		
+						pstmtdDet.setString(33,sordDetMap.get("tax_class").toString());
+						pstmtdDet.setString(34,sordDetMap.get("tax_chap").toString());
+						pstmtdDet.setString(35,sordDetMap.get("tax_env").toString());
 
 						pstmtdDet.addBatch();
 						pstmtdDet.executeBatch();