1.电子看板库容不准,信息提交

2.入库/备料趋势图,没有别名也展示

src/main/java/com/neotel/smfcore/hikvision/HikvisionKanBanController.java

@@ -79,7 +79,7 @@ public class HikvisionKanBanController {
     @AnonymousAccess
     @AnonymousAccess
     public ResultBean<InOutDetailInfo> inOutDetail(@RequestParam(value = "date") String date, @RequestParam(value = "type") String type) {
     public ResultBean<InOutDetailInfo> inOutDetail(@RequestParam(value = "date") String date, @RequestParam(value = "type") String type) {
         InOutDetailInfo info = new InOutDetailInfo();
         InOutDetailInfo info = new InOutDetailInfo();
-        List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(DateUtil.parse(date, "yyyy-MM-dd"));
+        List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(DateUtil.parse(date, "yyyy-MM-dd"),true);
         if (taskCountList != null && !taskCountList.isEmpty()) {
         if (taskCountList != null && !taskCountList.isEmpty()) {
             for (TaskCount taskCount : taskCountList) {
             for (TaskCount taskCount : taskCountList) {
                 if (ShiftUtil.SHIFT_A.equals(taskCount.getShift())) {
                 if (ShiftUtil.SHIFT_A.equals(taskCount.getShift())) {
@@ -133,7 +133,7 @@ public class HikvisionKanBanController {
         }
         }
 
 
         //获取具体详情
         //获取具体详情
-        List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(startDate);
+        List<TaskCount> taskCountList = hikTaskCountManager.findTaskCountByDate(startDate,false);
 
 
         //开始处理信息
         //开始处理信息
         for (int i = 0; i < timeList.size(); i++) {
         for (int i = 0; i < timeList.size(); i++) {

src/main/java/com/neotel/smfcore/hikvision/bean/StorageInventoryInfo.java

@@ -9,29 +9,29 @@ import lombok.Data;
 public class StorageInventoryInfo {
 public class StorageInventoryInfo {
 
 
     @ApiModelProperty(value = "总量")
     @ApiModelProperty(value = "总量")
-    private int totalCount = 11;
+    private int totalCount = 0;
 
 
     @ApiModelProperty(value = "总的使用量")
     @ApiModelProperty(value = "总的使用量")
-    private int totalUsedCount= 11;
+    private int totalUsedCount= 0;
 
 
     @ApiModelProperty(value = "总的未使用量")
     @ApiModelProperty(value = "总的未使用量")
-    private int totalNoUsedCount= 11;
+    private int totalNoUsedCount= 0;
 
 
     @ApiModelProperty(value = "大盘总量")
     @ApiModelProperty(value = "大盘总量")
-    private int bigReelTotalCount= 11;
+    private int bigReelTotalCount= 0;
 
 
     @ApiModelProperty(value = "大盘使用量")
     @ApiModelProperty(value = "大盘使用量")
-    private int bigReelUsedCount= 11;
+    private int bigReelUsedCount= 0;
 
 
     @ApiModelProperty(value = "大盘未使用未使用量")
     @ApiModelProperty(value = "大盘未使用未使用量")
-    private int bigReelNoUsedCount= 11;
+    private int bigReelNoUsedCount= 0;
 
 
     @ApiModelProperty(value = "小盘总量")
     @ApiModelProperty(value = "小盘总量")
-    private int smallReelTotalCount= 11;
+    private int smallReelTotalCount= 0;
 
 
     @ApiModelProperty(value = "小盘使用量")
     @ApiModelProperty(value = "小盘使用量")
-    private int smallReelUsedCount= 11;
+    private int smallReelUsedCount= 0;
 
 
     @ApiModelProperty(value = "小盘未使用量")
     @ApiModelProperty(value = "小盘未使用量")
-    private int smallReelNoUsedCount= 11;
+    private int smallReelNoUsedCount= 0;
 }
 }

src/main/java/com/neotel/smfcore/hikvision/service/manager/IHikTaskCountManager.java

@@ -12,5 +12,5 @@ public interface IHikTaskCountManager {
 
 
     void updateInOutCount(DataLog task);
     void updateInOutCount(DataLog task);
 
 
-    List<TaskCount> findTaskCountByDate(Date date);
+    List<TaskCount> findTaskCountByDate(Date date,boolean hasOtherName);
 }
 }

src/main/java/com/neotel/smfcore/hikvision/service/manager/impl/HikTaskCountManagerImpl.java

@@ -61,15 +61,19 @@ public class HikTaskCountManagerImpl implements IHikTaskCountManager {
     }
     }
 
 
     @Override
     @Override
-    public List<TaskCount> findTaskCountByDate(Date date) {
+    public List<TaskCount> findTaskCountByDate(Date date,boolean hasOtherName) {
         List<TaskCount> resultList = new ArrayList<>();
         List<TaskCount> resultList = new ArrayList<>();
         List<TaskCount> taskCountList = hikTaskCountDao.findTaskCountByDate(date);
         List<TaskCount> taskCountList = hikTaskCountDao.findTaskCountByDate(date);
         if (taskCountList != null && !taskCountList.isEmpty()) {
         if (taskCountList != null && !taskCountList.isEmpty()) {
             for (TaskCount taskCount : taskCountList) {
             for (TaskCount taskCount : taskCountList) {
-                String name = taskCount.getName();
-                User user = userManager.findByUserName(name);
-                if (user != null && StringUtils.isNotBlank(user.getOtherName())) {
-                    taskCount.setName(user.getOtherName());
+                if (hasOtherName) {
+                    String name = taskCount.getName();
+                    User user = userManager.findByUserName(name);
+                    if (user != null && StringUtils.isNotBlank(user.getOtherName())) {
+                        taskCount.setName(user.getOtherName());
+                        resultList.add(taskCount);
+                    }
+                } else {
                     resultList.add(taskCount);
                     resultList.add(taskCount);
                 }
                 }
             }
             }