purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决进销存统计日期参数的bug

Browse Source
This commit is contained in:
jishenghua
2024-07-25 23:51:58 +08:00
parent 86c0d3cff5
commit 4381564ca9
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -492,6 +492,8 @@ public class DepotItemController {
if(categoryId != null){ if(categoryId != null){
categoryIdList = materialService.getListByParentId(categoryId); categoryIdList = materialService.getListByParentId(categoryId);
} }
beginTime = Tools.parseDayToTime(beginTime, BusinessConstants.DAY_FIRST_TIME);
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<Long> depotList = parseListByDepotIds(depotIds); List<Long> depotList = parseListByDepotIds(depotIds);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam), List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam),
categoryIdList, endTime,(currentPage-1)*pageSize, pageSize); categoryIdList, endTime,(currentPage-1)*pageSize, pageSize);
@@ -575,6 +577,7 @@ public class DepotItemController {
if(categoryId != null){ if(categoryId != null){
categoryIdList = materialService.getListByParentId(categoryId); categoryIdList = materialService.getListByParentId(categoryId);
} }
endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
List<Long> depotList = parseListByDepotIds(depotIds); List<Long> depotList = parseListByDepotIds(depotIds);
List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam), List<DepotItemVo4WithInfoEx> dataList = depotItemService.getInOutStock(StringUtil.toNull(materialParam),
categoryIdList, endTime, null, null); categoryIdList, endTime, null, null);