Commit a9f87048 LN

物料过期功能修改。

1 个父辈 88cfe62f
......@@ -347,9 +347,13 @@ public class StoragePosManagerImpl implements IStoragePosManager {
@Override
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.expTime").lte(new Date());
Criteria c = Criteria.where("barcode.expTime").lte(date);
if(!Strings.isNullOrEmpty(storageId)){
c = c.and("storageId").is(storageId);
}
......
......@@ -225,11 +225,11 @@
<%--</display:column>--%>
<security:authorize ifAnyGranted="ROLE_MANAGE_STACK_OUT, ROLE_MANAGE_FEEDER">
<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}"
onclick="checkoutStorage('${pos.id}')">
<i class="fa fa-sign-out"></i><fmt:message key="button.checkout"/></button>
</c:if>
<%-- </c:if>--%>
</display:column>
</security:authorize>
<c:if test="${limitCheckOut}">
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!