1.出入库统计增加今日出库今日入库字段

2.菜单增加电子看板

src/main/java/com/neotel/smfcore/common/init/MenuInit.java

@@ -115,6 +115,7 @@ public class MenuInit {
 
         //设备看板
         addDefaultFunctionMenu(1,null,"设备看板","lockMaterial", "lockMaterial/material/index","kanban",DEFAULT_SHOW_MENU);
+        addDefaultFunctionMenu(1,null,"电子看板","eleckanban", "eleckanban/index","kanban",DEFAULT_SHOW_MENU);
         //设备互联
         addDefaultFunctionMenu(2,null,"设备互联","equipmentView", "neolight/equipmentView/index","sKanban");
 

src/main/java/com/neotel/smfcore/core/elecKanban/bean/dto/InOutDataDto.java

@@ -16,6 +16,12 @@ public class InOutDataDto {
     @ApiModelProperty("出库数据集合")
     private List<Integer> outDataList;
 
+    @ApiModelProperty("今日入库总数")
+    private Integer todayInDataCount = 0;
+
+    @ApiModelProperty("今日出库总数")
+    private Integer todayOutDataCount = 0;
+
     @ApiModelProperty("入库总数")
     private Integer inDataCount = 0;
 

src/main/java/com/neotel/smfcore/core/report/ReportController.java

@@ -206,6 +206,14 @@ public class ReportController {
         dto.setInDataCount(inDataCount);
         int outDataCount = outDataList.stream().reduce(Integer::sum).orElse(0);
         dto.setOutDataCount(outDataCount);
+
+        //今日出入库总数
+        Date todayDate = DateUtil.parse(currentDateStr, "yyyy-MM-dd");
+        List<InOutData> todayInOutDataList = inOutDataList.stream().filter(item -> (item.getCreateDate().getTime() >= todayDate.getTime() && todayDate.getTime() <= item.getCreateDate().getTime())).collect(Collectors.toList());
+        int todayInDataCount = todayInOutDataList.stream().mapToInt(InOutData::getInCount).sum();
+        dto.setTodayInDataCount(todayInDataCount);
+        int todayOutDataCount = todayInOutDataList.stream().mapToInt(InOutData::getOutCount).sum();
+        dto.setTodayOutDataCount(todayOutDataCount);
         return dto;
     }
 }