Updated changes in PostOrdInvoiceGen component and DespatIC component

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

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

@@ -3193,7 +3193,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 
 		String lineNoSord="",reStr="",custItemRef="",SOalloc="",itemCodeOrd="",expLev="",unit="",lotSl="",lotNo="",unitStd="",packInstr="",noArt="";
 		String nature="",lineType="",itemcodeFree="",partNo="";
-		String siteCodeDet ="",taxClass="",taxChap="",taxEnv="",itemCode="",packCode="",loc="",listType="",itemRef="",applyPrice="",priceVar="",_priceVar="";		
+		String siteCodeDet ="",taxClass="",taxChap="",taxChap1="",taxEnv="",itemCode="",packCode="",loc="",listType="",itemRef="",applyPrice="",priceVar="",_priceVar="";		
 		double discount=0,rateStduom=0,rateClg=0,quantity=0,qtyAlloc=0,convQtyStduom=0,ordQty=0,quantityStduom=0,quantityReal=0,packQty=0,rate=0,totRate=0;
 		int pos=0;
 		double diffRate=0,itemRate=0,discAmt=0,effCost=0,offRate=0,bbRate=0;
@@ -4486,7 +4486,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 					pStmt.close();
 					pStmt = null;  
 
-					sql = " select item_ref " +
+					sql = " select item_ref,tax_chap " +
 							"	from sorditem " +
 							"	where sale_order = ? and line_no = ? and exp_lev = ? ";
 					pStmt = conn.prepareStatement(sql);
@@ -4497,6 +4497,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 					if (rs.next())
 					{
 						itemRef = checkNull(rs.getString("item_ref"));
+						taxChap1 = checkNull(rs.getString("tax_chap"));
 					}
 					rs.close();
 					rs = null;
@@ -4657,9 +4658,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 					setNodeValue(dom, "disc_amt", lc_disc_amt);
 				}
 					
-                  //Changes by mayur on 06-03-18-------[start]
-					
-					if("null".equalsIgnoreCase(("tax_class")) || taxClass == null || taxClass.trim().length()==0)
+                     //Changes by mayur on 06-03-18-------[start]					
+					if("null".equalsIgnoreCase(taxClass) || taxClass == null || taxClass.trim().length()==0)
 					{
 						valueXmlString.append("<tax_class>").append("<![CDATA[ ]]>").append("</tax_class>");
 						
@@ -4670,18 +4670,18 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 						
 					}
 					
-					if("null".equalsIgnoreCase(("tax_chap")) || taxChap == null || taxChap.trim().length()==0)
+					if("null".equalsIgnoreCase(taxChap1) || taxChap1 == null || taxChap1.trim().length()==0)
 					{
 						valueXmlString.append("<tax_chap>").append("<![CDATA[ ]]>").append("</tax_chap>");
 						
 					}
 					else 
 					{
-						valueXmlString.append("<tax_chap>").append("<![CDATA["+taxChap+"]]>").append("</tax_chap>");
+						valueXmlString.append("<tax_chap>").append("<![CDATA["+taxChap1+"]]>").append("</tax_chap>");
 							
 					}
 					
-					if("null".equalsIgnoreCase(("tax_env")) || taxEnv == null || taxEnv.trim().length()==0)
+					if("null".equalsIgnoreCase(taxEnv) || taxEnv == null || taxEnv.trim().length()==0)
 					{
 						valueXmlString.append("<tax_env>").append("<![CDATA[ ]]>").append("</tax_env>");
 						
@@ -4699,7 +4699,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 					//valueXmlString.append("<tax_env>").append("<![CDATA["+taxEnv+"]]>").append("</tax_env>");
 
 					setNodeValue(dom, "tax_class", getAbsString(taxClass));
-					setNodeValue(dom, "tax_chap", getAbsString(taxChap));
+					setNodeValue(dom, "tax_chap", getAbsString(taxChap1));
 					setNodeValue(dom, "tax_env", getAbsString(taxEnv));
 
 					loc = checkNull(genericUtility.getColumnValue("loc_code", dom));

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

@@ -1884,9 +1884,9 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				//invTraceMap.put("tax_class", tax_class);	        	
 				//invTraceMap.put("tax_chap", tax_chap);	        	
 				//invTraceMap.put("tax_env", tax_env);	 
-				
+	   
 				//Commented by mayur on 05-03-18-------start
-				if("null".equalsIgnoreCase(("tax_class")) || tax_class == null || tax_class.trim().length()==0)
+				if("null".equalsIgnoreCase(tax_class) || tax_class == null || tax_class.trim().length()==0)
 				{
 
 					invTraceMap.put("tax_class"," ");	     
@@ -1898,7 +1898,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				}  
 				
 				
-				if("null".equalsIgnoreCase(("tax_chap")) || tax_chap == null || tax_chap.trim().length()==0)
+				if("null".equalsIgnoreCase(tax_chap) || tax_chap == null || tax_chap.trim().length()==0)
 				{
 
 					invTraceMap.put("tax_chap"," ");	 
@@ -1909,9 +1909,18 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 					invTraceMap.put("tax_chap", tax_chap);	
 				}   
 					
-			 
+				if("null".equalsIgnoreCase(tax_env) || tax_env == null || tax_env.trim().length()==0)
+				{
+
+					invTraceMap.put("tax_env"," ");	 
+				}
+				else
+				{
+
+					invTraceMap.put("tax_env", tax_chap);	
+				}   			 
 				//Commented by mayur on 05-03-18-------end
-				invTraceMap.put("tax_env",tax_env);	       	
+			   	
 				invTraceMap.put("discount", discount);	        	
 				invTraceMap.put("unit__rate", unit__rate);	        	
 				invTraceMap.put("sord_conv__qty_stduom", sord_conv__qty_stduom);