diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java index 10055c62..fd773d0c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java @@ -492,6 +492,8 @@ public class DepotItemController { if(categoryId != null){ categoryIdList = materialService.getListByParentId(categoryId); } + beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME); + endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); List depotList = parseListByDepotIds(depotIds); List dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam), categoryIdList, endTime,(currentPage-1)*pageSize, pageSize); @@ -575,6 +577,7 @@ public class DepotItemController { if(categoryId != null){ categoryIdList = materialService.getListByParentId(categoryId); } + endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); List depotList = parseListByDepotIds(depotIds); List dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam), categoryIdList, endTime, null, null);