tax chap to be set based on despatch in CP Auto-GRN

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

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

@@ -779,7 +779,7 @@ public class PostOrderActivity {
 			//Pavan Rane 11jun19 end
 			xmlBuff.append("</Detail1>");
 
-			String itemCode="",sordNoDet="",soLineNoDet="",taxClass="",taxChap="",taxEnv="";
+			String itemCode="",sordNoDet="",soLineNoDet="",taxClass="",taxChap="",taxEnv="", taxChapDesp="";
 			String unit="",unitStd="",locCode="",lotNo="",lotSl="",siteMfg="",dimension="",packInstr="";
 			Timestamp  mfgDate=null,expDate=null,retestDate=null;
 			double quantity=0,qtyStdUom=0,convQtyStdUom=0,rateStdUom=0,rateClg=0,noArt=0,grossWt=0,tareWt=0,netWt=0,palletWt=0;
@@ -802,7 +802,7 @@ public class PostOrderActivity {
 					+ "despdt.loc_code,despdt.lot_no,despdt.lot_sl,despdt.mfg_date,despdt.exp_date,despdt.rate__stduom,"
 					+ "despdt.rate__clg,despdt.no_art,despdt.site_code__mfg," +
 					"despdt.GROSS_WEIGHT,despdt.TARE_WEIGHT,despdt.NETT_WEIGHT,"
-					+ "despdt.retest_date,despdt.dimension,despdt.pallet_wt,despdt.pack_instr " +
+					+ "despdt.retest_date,despdt.dimension,despdt.pallet_wt,despdt.pack_instr, despdt.tax_chap " +
 					" from  despatchdet despdt,SORDDET sdet where despdt.sord_no =sdet.sale_order and " +
 					" despdt.line_no__sord = sdet.line_no and  despdt.desp_id=? ";
 			//Added and Commented by sarita to remove tax_class , tax_chap,tax_env data getting from SORDDET table on 26 DEC 2018 [END]
@@ -842,14 +842,14 @@ public class PostOrderActivity {
 				dimension=rs.getString("dimension");
 				palletWt=rs.getDouble("pallet_wt");
 				packInstr=rs.getString("pack_instr");
-
+				taxChapDesp=rs.getString("tax_chap"); //Pavan Rane 26jul19 [tax chap to be set based on deps or pord in CP Auto-GRN]
 				System.out.println("@@Commented by mayur on 28-02-18@@");
 				System.out.println("siteMfg["+siteMfg+"]");
 
 				//Commented by sarita on 26 DEC 2018 [START]
-				/*System.out.println("taxClass["+taxClass+"]");
-					  System.out.println("taxChap["+taxChap+"]");
-					  System.out.println("taxEnv["+taxEnv+"]");*/
+				/*System.out.println("taxClass["+taxClass+"]");*/
+			 System.out.println("taxChapDesp["+taxChapDesp+"]");
+					  /*System.out.println("taxEnv["+taxEnv+"]");*/
 				//Commented by sarita on 26 DEC 2018 [END]
 
 				//Added By PriyankaC  to get qc_reqd from siteItem. [Start]
@@ -1298,8 +1298,10 @@ public class PostOrderActivity {
 				xmlBuff.append("<loc_code><![CDATA["+ sitelocCode +"]]></loc_code>");
 				xmlBuff.append("<lot_no><![CDATA["+ lotNo +"]]></lot_no>");
 				xmlBuff.append("<lot_sl><![CDATA["+ lotSl +"]]></lot_sl>");
-				xmlBuff.append("<tax_class><![CDATA["+ taxClass +"]]></tax_class>");
-				xmlBuff.append("<tax_chap><![CDATA["+ taxChap +"]]></tax_chap>");
+				xmlBuff.append("<tax_class><![CDATA["+ taxClass +"]]></tax_class>");				
+				//Pavan Rane 26jul19 start [tax chap to be set based on despatch in CP Auto-GRN]
+				xmlBuff.append("<tax_chap><![CDATA["+ taxChapDesp +"]]></tax_chap>");											
+				//Pavan Rane 26jul19 end [tax chap to be set based on despatch in CP Auto-GRN]				
 				xmlBuff.append("<tax_env><![CDATA["+ taxEnv +"]]></tax_env>");
 				xmlBuff.append("<pack_code><![CDATA["+ packCode +"]]></pack_code>");