bug fixed

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java

@@ -1279,7 +1279,7 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 			ls_loc_code_git = distCommon.getDisparams( "999999", "TRANSIT_LOC", conn);
 
 			// 01-mar-2019 manoharan transit entry in case of automatic tranaction also done as suggested by KB
-			if( "Y".equalsIgnoreCase(ls_channel_partner) && "E".equalsIgnoreCase(ls_dis_link))
+			if( "Y".equalsIgnoreCase(gitUpdate) && "E".equalsIgnoreCase(ls_dis_link))
 				// 10-oct-2019 manoharan to update GIT stock based on channel_partner flag in header
 				//if( "Y".equalsIgnoreCase(ls_channel_partner) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) ))
 				if( "Y".equals(gitUpdate) && ("E".equalsIgnoreCase(ls_dis_link) || ("A".equalsIgnoreCase(ls_dis_link) )))
@@ -1587,11 +1587,15 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					stockUpd.put("acct_code__dr",ls_acct_code__dr);
 					stockUpd.put("cctr_code__cr",ls_cctr_code__cr);
 					stockUpd.put("cctr_code__dr",ls_cctr_code__dr);
+					if (lc_no_art == null || lc_no_art.trim().length() == 0 || "null".equals(lc_no_art))
+					{
+						lc_no_art = "0";
+					}
 					stockUpd.put("no_art",Double.parseDouble(lc_no_art));
 					stockUpd.put("gross_weight",lc_gross_wt);
 					stockUpd.put("tare_weight",lc_tare_wt);
 					stockUpd.put("net_weight",lc_net_wt);
-
+					System.out.println("Before stockUpdate1 ["+merrcode+"]");
 					merrcode = stockUpdate.updateStock(stockUpd,xtraParams, conn);
 					System.out.println("After stockUpdate1 ["+merrcode+"]");
 					if(merrcode !=null && merrcode.trim().length() >0)