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,20 +2600,23 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 
 
 										ld_chk_date = distCommon.CalcExpiry(ld_alloc_date,ll_min_shelf_life);
-										if( ld_chk_date.after(ld_exp_date))
+										if(ld_exp_date!=null)
 										{
-											errCode = "VTNEXPDT";
-											errList.add(errCode);
-											errFields.add(childNodeName.toLowerCase());
-										}
-										//Code added by ajit on date 30_jan-2015 instructed by pravin
-										if( ld_exp_date.before(ld_alloc_date) && "Y".equalsIgnoreCase(ls_track_shelf_life)) 
-										{
-											errCode="VTLOTAEUR";
-											errList.add(errCode);
-											errFields.add(childNodeName.toLowerCase());
+											if( ld_chk_date.after(ld_exp_date))
+											{
+												errCode = "VTNEXPDT";
+												errList.add(errCode);
+												errFields.add(childNodeName.toLowerCase());
+											}
+											//Code added by ajit on date 30_jan-2015 instructed by pravin
+											if( ld_exp_date.before(ld_alloc_date) && "Y".equalsIgnoreCase(ls_track_shelf_life)) 
+											{
+												errCode="VTLOTAEUR";
+												errList.add(errCode);
+												errFields.add(childNodeName.toLowerCase());
+											}
+											//End of the code added by ajit on date 30-Jan-2015
 										}
-										//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

@@ -872,13 +872,15 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				stkExpDate = rs.getDate("EXP_DATE");
 				if(stkExpDate != null)
 				{
-					stkExpDate1 = sdf.format(stkExpDate); 
+					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+"]");