Despatch IC and stock button skip item if expiry date is null

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

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

@@ -2600,6 +2600,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 
 
 										ld_chk_date = distCommon.CalcExpiry(ld_alloc_date,ll_min_shelf_life);
+										if(ld_exp_date!=null)
+										{
 											if( ld_chk_date.after(ld_exp_date))
 											{
 												errCode = "VTNEXPDT";
@@ -2614,6 +2616,7 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 												errFields.add(childNodeName.toLowerCase());
 											}
 											//End of the code added by ajit on date 30-Jan-2015
+										}
 
 									}//end if
 								}//				end if

webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -873,12 +873,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				if(stkExpDate != null)
 				{
 					stkExpDate1 = sdf.format(stkExpDate);
+					expDate = new Timestamp(stkExpDate.getTime());
 				}
 				else
 				{
 					stkExpDate1 = "";
+					continue;
 				}
-				expDate = new Timestamp(stkExpDate.getTime());
+				//expDate = new Timestamp(stkExpDate.getTime());
 				System.out.println("Inside loop expDate ["+expDate+"]");