Updated changes in PostOrdInvoiceGen and PostOrderActivity component

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

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

@@ -561,9 +561,36 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 					invDespMap.get("cr_days"),conn);
 			xmlBuff.append("<due_date><![CDATA["+dueDate1+"]]></due_date>");			//Get due date from method "gbf_get_duedate()"
 			System.out.println("563 invDespMap invoice tax_class::["+invDespMap.get("tax_class")+"]tax_chap::["+invDespMap.get("tax_chap")+"]tax_env::["+invDespMap.get("tax_env")+"]");
-			xmlBuff.append("<tax_class><![CDATA["+invDespMap.get("tax_class")+"]]></tax_class>");			
-			xmlBuff.append("<tax_chap><![CDATA["+invDespMap.get("tax_chap")+"]]></tax_chap>");			
-			xmlBuff.append("<tax_env><![CDATA["+invDespMap.get("tax_env")+"]]></tax_env>");			
+			
+			//Changed by mayur on 27-02-18--------[START] 
+			if("null".equalsIgnoreCase(invDespMap) || (invDespMap)==null)
+			{
+			       xmlBuff.append("<tax_class><![CDATA[ ]]></tax_class>");	
+			}
+			else
+			{
+				xmlBuff.append("<tax_class><![CDATA["+invDespMap.get("tax_class")+"]]></tax_class>");	
+			}
+			
+			if("null".equalsIgnoreCase(invDespMap) || (invDespMap)==null)
+			{
+			      xmlBuff.append("<tax_chap><![CDATA[ ]]></tax_chap>");	
+			}
+			else
+			{
+				xmlBuff.append("<tax_chap><![CDATA["+invDespMap.get("tax_chap")+"]]></tax_chap>");		
+			}
+			
+			if("null".equalsIgnoreCase(invDespMap) || (invDespMap)==null)
+			{
+				  xmlBuff.append("<tax_env><![CDATA[ ]]></tax_env>");				
+			}
+			else
+			{
+				xmlBuff.append("<tax_env><![CDATA["+invDespMap.get("tax_env")+"]]></tax_env>");			
+			}			
+			//Changed by mayur on 27-02-18--------[END] 		
+			
 			xmlBuff.append("<tax_date><![CDATA["+invDespMap.get("tax_date")+"]]></tax_date>");			
 			xmlBuff.append("<frt_amt><![CDATA["+invDespMap.get("frt_amt")+"]]></frt_amt>");			
 			xmlBuff.append("<frt_type><![CDATA["+invDespMap.get("frt_term")+"]]></frt_type>");			
@@ -701,9 +728,36 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
 				xmlBuff.append("<rate><![CDATA[" + invTraceDetMap.get("rate") + "]]></rate>");	
 				xmlBuff.append("<unit__rate><![CDATA[" + invTraceDetMap.get("unit__rate") + "]]></unit__rate>");
 				xmlBuff.append("<discount><![CDATA[" + invTraceDetMap.get("discount") + "]]></discount>");
-				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>");
+				
+				//Changed by mayur on 27-02-18--------[START] 
+				if("null".equalsIgnoreCase(invTraceDetMap) || (invTraceDetMap)==null)
+				{
+				       xmlBuff.append("<tax_class><![CDATA[ ]]></tax_class>");	
+				}
+				else
+				{					
+					xmlBuff.append("<tax_class><![CDATA["+invTraceDetMap.get("tax_class")+"]]></tax_class>");	
+				}
+				
+				if("null".equalsIgnoreCase(invTraceDetMap) || (invTraceDetMap)==null)
+				{
+				      xmlBuff.append("<tax_chap><![CDATA[ ]]></tax_chap>");	
+				}
+				else
+				{
+					xmlBuff.append("<tax_chap><![CDATA["+invTraceDetMap.get("tax_chap")+"]]></tax_chap>");				
+				}
+				
+				if("null".equalsIgnoreCase(invTraceDetMap) || (invTraceDetMap)==null)
+				{
+					 xmlBuff.append("<tax_env><![CDATA[ ]]></tax_env>");				
+				}
+				else
+				{					
+                     xmlBuff.append("<tax_env><![CDATA["+invTraceDetMap.get("tax_env")+"]]></tax_env>");		
+				}	
+				//Changed by mayur on 27-02-18--------[END] 
+				
 				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>");

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

@@ -709,6 +709,9 @@ public class PostOrderActivity {
 					palletWt=rs.getDouble("pallet_wt");
 					packInstr=rs.getString("pack_instr");
 					
+					System.out.println("@@Commented by mayur on 28-02-18@@");
+					System.out.println("siteMfg["+siteMfg+"]");
+					
 					System.out.println("taxClass["+taxClass+"]");
 					System.out.println("taxChap["+taxChap+"]");
 					System.out.println("taxEnv["+taxEnv+"]");
@@ -904,6 +907,9 @@ public class PostOrderActivity {
 						batchNo=rs1.getString("batch_no");
 						suppCodeMfg=rs1.getString("supp_code__mfg");
 						additionalCost=rs1.getDouble("rate");
+						
+						System.out.println("@@@@Commented by mayur on 28-02-18@@@");
+						System.out.println("suppCodeMfg["+suppCodeMfg+"]");
 						}
 						isItemLotAvail=false;
 						sql=" select supp_code__mfg from item_lot_info "
@@ -1058,7 +1064,11 @@ public class PostOrderActivity {
 						//xmlBuff.append("<expiry_date><![CDATA["+ sdf.format(expDate) +"]]></expiry_date>");
 						//Changes done by mayur on 29-JAN-2018------[END]
 						
-						xmlBuff.append("<site_code__mfg><![CDATA["+ siteMfg +"]]></site_code__mfg>");
+						//Changes done by mayur on 28-FEB-2018------[START]			
+						//xmlBuff.append("<site_code__mfg><![CDATA["+ siteMfg +"]]></site_code__mfg>");			              
+						xmlBuff.append("<site_code__mfg><![CDATA["+ suppCodeMfg +"]]></site_code__mfg>");
+						//Changes done by mayur on 28-FEB-2018------[END]
+						
 						xmlBuff.append("<supp_code__mnfr><![CDATA["+ suppCodemnfr +"]]></supp_code__mnfr>");
 						xmlBuff.append("<no_art><![CDATA["+ noArt +"]]></no_art>");
 						xmlBuff.append("<reas_code><![CDATA["+ defReasCode +"]]></reas_code>");