物料过期功能修改。

myproject/src/main/java/com/myproject/manager/impl/StoragePosManagerImpl.java

@@ -347,9 +347,13 @@ public class StoragePosManagerImpl implements IStoragePosManager {
 
 
     @Override
     @Override
     public int expireCount(String storageId, int type){
     public int expireCount(String storageId, int type){
-
+        Date date = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.DATE, -1);
+        date = calendar.getTime();
         //Criteria c = Criteria.where("barcode.expireDate").lte(new Date()).orOperator(Criteria.where("barcode.expTime").lte(new Date()));
         //Criteria c = Criteria.where("barcode.expireDate").lte(new Date()).orOperator(Criteria.where("barcode.expTime").lte(new Date()));
-        Criteria c =  Criteria.where("barcode.expTime").lte(new Date());
+        Criteria c =  Criteria.where("barcode.expTime").lte(date);
         if(!Strings.isNullOrEmpty(storageId)){
         if(!Strings.isNullOrEmpty(storageId)){
             c = c.and("storageId").is(storageId);
             c = c.and("storageId").is(storageId);
         }
         }

myproject/src/main/webapp/WEB-INF/pages/component/storagePosFind.jsp

@@ -225,11 +225,11 @@
                     <%--</display:column>--%>
                     <%--</display:column>--%>
                     <security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT, ROLE_MANAGE_FEEDER">
                     <security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT, ROLE_MANAGE_FEEDER">
                         <display:column titleKey="checkOut.operate" media="html">
                         <display:column titleKey="checkOut.operate" media="html">
-                            <c:if test="${!limitCheckOut}">
+<%--                            <c:if test="${!limitCheckOut}">--%>
                                <button class="btn yellow limit${pos.barcode.inFixture}" id="btn${pos.id}"
                                <button class="btn yellow limit${pos.barcode.inFixture}" id="btn${pos.id}"
                                         onclick="checkoutStorage('${pos.id}')">
                                         onclick="checkoutStorage('${pos.id}')">
                                     <i class="fa fa-sign-out"></i><fmt:message key="button.checkout"/></button>
                                     <i class="fa fa-sign-out"></i><fmt:message key="button.checkout"/></button>
-                            </c:if>
+<%--                            </c:if>--%>
                         </display:column>
                         </display:column>
                     </security:authorize>
                     </security:authorize>
                     <c:if test="${limitCheckOut}">
                     <c:if test="${limitCheckOut}">