Action stock button display only Near expiry stock if ordertype "NE".

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

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

@@ -2550,8 +2550,14 @@ public class DispatchIC extends ValidatorEJB implements DispatchICLocal,Dispatch
 										//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 ))
 										System.out.println("minShelfDate ["+ld_chk_date1+"] maxShelfDate["+ld_chk_date2+"]");
-										//changes done by kunal on 10/1/2019
-										if ((ld_exp_date.compareTo(ld_chk_date1) > -1)) 
+										//if ((ld_exp_date.compareTo(ld_chk_date1) > -1) && (ld_exp_date .compareTo(ld_chk_date2) < 1 )) 
+										//Change done by kunal on 10/1/2019 to remove max shelf date validation as suggested by piyush sir
+										if ((ld_exp_date.after(ld_chk_date1))) 
+										{
+											errCode = "VTNEXPDT";
+											errList.add(errCode);
+											errFields.add(childNodeName.toLowerCase());
+										}
 										{
 											errCode = "VTNEXPDT";
 											errList.add(errCode);

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

@@ -717,6 +717,30 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 			{
 				trackShelfLife = rs.getString(1);
 			}
+			
+			
+			if(locCode == null || locCode.trim().length() == 0)
+			{
+				locCode = "%";
+			}
+			else
+			{
+				locCode = locCode.trim() + "%";
+			}//end if
+			sql="SELECT (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) "+
+			" FROM ITEM WHERE ITEM_CODE = ?"; //'"+itemCode+"'" ;
+			//Changed and added by Pavan R 22oct18[to handle open cursor issue]
+			//rs = stmt.executeQuery(sql);
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, itemCode);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				trackShelfLife =rs.getString(1);
+			}
+			rs.close();rs = null;
+			pstmt.close(); pstmt = null;
+			
 			//added by kunal on on 10/1/2019 to get check Near expiry order type 
 			sql = "Select order_type from sorder where sale_order = '"+saleOrder+"'";
 			pstmt = conn.prepareStatement(sql);
@@ -756,28 +780,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 	
 					ld_chk_date2 = distCommon.CalcExpiry(despTDate,ll_max_shelf_life);
 			}
+			//added by kunal on on 10/1/2019 to get check Near expiry order type end
+			
 			System.out.println("itemCode:"+itemCode+":locCode:"+locCode+":quantity:"+quantity+":siteCode:"+siteCode+":");
-			if(locCode == null || locCode.trim().length() == 0)
-			{
-				locCode = "%";
-			}
-			else
-			{
-				locCode = locCode.trim() + "%";
-			}//end if
-			sql="SELECT (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) "+
-			" FROM ITEM WHERE ITEM_CODE = ?"; //'"+itemCode+"'" ;
-			//Changed and added by Pavan R 22oct18[to handle open cursor issue]
-			//rs = stmt.executeQuery(sql);
-			pstmt = conn.prepareStatement(sql);
-			pstmt.setString(1, itemCode);
-			rs = pstmt.executeQuery();
-			if(rs.next())
-			{
-				trackShelfLife =rs.getString(1);
-			}
-			rs.close();rs = null;
-			pstmt.close(); pstmt = null;
 			//Changed and added by Pavan R 22oct18[to handle open cursor issue] Start
 			sql="SELECT STOCK.ITEM_CODE,STOCK.LOT_NO, STOCK.LOT_SL,STOCK.ALLOC_QTY, STOCK.MFG_DATE, "+
 					"  STOCK.EXP_DATE, STOCK.QUANTITY,STOCK.QUANTITY - STOCK.ALLOC_QTY AS BALANCE_QTY, " + 
@@ -868,6 +873,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				}
 				stkRate =rs.getString("RATE");
 				
+				//added by kunal on 10/1/2019 to check trackshelf and near expiry start
 				if("Y".equalsIgnoreCase(trackShelfLife.trim()))
 				{
 					//added by kunal on 10/1/2019 to skip lot if expired
@@ -878,18 +884,19 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					//added by kunal on 10/1/2019 to skip if stock not near expiry for NE
 					if("NE".equalsIgnoreCase(orderType.trim()))
 					{
-						if ((expDate.compareTo(ld_chk_date1) > -1))
+						if ((expDate.after(ld_chk_date1)))
 						{
 							continue;
 						}
 						
 					}
 					//added by kunal on 10/1/2019 to skip if stock is near expiry and order type not NE
-					else if(!(expDate.compareTo(ld_chk_date1) > -1))
+					else if((expDate.before(ld_chk_date1)))
 					{
 						continue;
 					}
 				}
+				//added by kunal on 10/1/2019 to check trackshelf and near expiry end
 				// 20/03/12 manoharan
 				if(stkItemCode == null)
 				{