Despatch and post Order expired item validation bug fix

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

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

@@ -2548,7 +2548,8 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 										//Timestamp ld_exp_date=null;
 										//if not(ld_exp_date >= ld_chk_date1 and ld_exp_date <= ld_chk_date2) then //Code commented by ajit on date 30-Jan-2015
 										//if (ld_exp_date >= ld_chk_date1 && ld_exp_date <= ld_chk_date2) then // added by ajit on date 30-Jan-2015 instructed by pravin
-										if ((ld_exp_date.compareTo(ld_chk_date1) > -1) && (ld_exp_date .compareTo(ld_chk_date2) < 1 )) 
+										//if ((ld_exp_date.compareTo(ld_chk_date1) > -1) && (ld_exp_date .compareTo(ld_chk_date2) < 1 )) 
+										if ((ld_exp_date.compareTo(ld_chk_date1) < 1) && (ld_exp_date .compareTo(ld_chk_date2) > -1 ))
 										{
 											errCode = "VTNEXPDT";
 											errList.add(errCode);

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

@@ -1914,6 +1914,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 			while(rs.next())
 			{
 				saleOrderCnt++;
+				skipline="";
 				saleOrder = checkNull(rs.getString("sale_order"));
 				//System.out.println("saleOrder :"+saleOrder);
 				partQty = checkNull(rs.getString("part_qty"));
@@ -2870,7 +2871,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 								else
 								{
 									//(NOT(mexp_date >= mchk_date1 AND mexp_date <= mchk_date2) )
-									if(!(expDate.after(chkDate1) && expDate.after(chkDate2)))
+									if(!(expDate.after(chkDate1) && expDate.before(chkDate2)))
 									{
 										System.out.println("Near Expiry Item or Expired Item");
 										skiplot = skiplot + "'"+lineNo;
@@ -3960,7 +3961,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 									logMsg = saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tNo Stock Available";
 									strToWrite=strToWrite+logMsg+"\t\r\n";
 									postLog = "Short stock for "+prtQtyMsg+" type PartQty "+saleOrder+" "+itemCode+" "+locCode+" "+lotNo+" "+lineNo;
-									errorLog("P09", postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
+									if(!skipline.contains(lineNo.trim()))
+									{
+										errorLog("P09", postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
+									}
 									partQtyFlag = true; //If partQty is 0
 									if("0".equalsIgnoreCase(partQty))
 									{