页面功能优化提交

src/main/java/com/neotel/smfcore/core/dashboard/bean/dto/first/ElecKanbanBoxStatusDto.java

 package com.neotel.smfcore.core.dashboard.bean.dto.first;
 package com.neotel.smfcore.core.dashboard.bean.dto.first;
 
 
+import com.neotel.smfcore.core.system.service.po.DataLog;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Data
 @Data
 public class ElecKanbanBoxStatusDto {
 public class ElecKanbanBoxStatusDto {
 
 
@@ -44,4 +48,7 @@ public class ElecKanbanBoxStatusDto {
      * 湿度
      * 湿度
      */
      */
     public String humidity = "";
     public String humidity = "";
+
+
+    private List<DataLog> taskList = new ArrayList<>();
 }
 }

src/main/java/com/neotel/smfcore/core/dashboard/mimo/SmdBoxMimoController.java

@@ -236,6 +236,12 @@ public class SmdBoxMimoController {
             dto.setTodayInCount(inCount);
             dto.setTodayInCount(inCount);
             dto.setTodayOutCount(outCount);
             dto.setTodayOutCount(outCount);
             dto.setName(storage.getName());
             dto.setName(storage.getName());
+            Collection<DataLog> queueTasks = taskService.getQueueTasks(cid);
+            if (queueTasks != null){
+                dto.setTaskList((List<DataLog>) queueTasks);
+            } else {
+                dto.setTaskList(new ArrayList<>());
+            }
             resultList.add(dto);
             resultList.add(dto);
         }
         }
         return resultList;
         return resultList;

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -99,6 +99,11 @@ public class TaskService {
         return task;
         return task;
     }
     }
 
 
+
+    public synchronized String checkout(Storage storage, StoragePos pos, boolean isSingleOut,boolean ngReel, String opUserName,String outType) throws ValidateException{
+        return checkout(storage,pos,isSingleOut,ngReel,opUserName,outType,"");
+    }
+
     /**
     /**
      * 库位出库
      * 库位出库
      *
      *
@@ -108,7 +113,7 @@ public class TaskService {
      * @return
      * @return
      * @throws ValidateException
      * @throws ValidateException
      */
      */
-    public synchronized String checkout(Storage storage, StoragePos pos, boolean isSingleOut,boolean ngReel, String opUserName,String outType) throws ValidateException {
+    public synchronized String checkout(Storage storage, StoragePos pos, boolean isSingleOut,boolean ngReel, String opUserName,String outType,String ngMsg) throws ValidateException {
         if (pos.getBarcode() == null) {
         if (pos.getBarcode() == null) {
             String msg = "库位[" + pos.getPosName() + "]中已无物料,忽略";
             String msg = "库位[" + pos.getPosName() + "]中已无物料,忽略";
             log.info(msg);
             log.info(msg);
@@ -123,6 +128,9 @@ public class TaskService {
         task.setSingleOut(isSingleOut);
         task.setSingleOut(isSingleOut);
         task.setNgReel(ngReel);
         task.setNgReel(ngReel);
         task.setOperator(opUserName);
         task.setOperator(opUserName);
+        if (StringUtils.isNotBlank(ngMsg)){
+            task.updateAppendData("ngMsg",ngMsg);
+        }
         addTaskToExecute(task);
         addTaskToExecute(task);
         return "";
         return "";
     }
     }
@@ -853,8 +861,8 @@ public class TaskService {
             //如果已在库位中,那么自动将该库位的物料出库
             //如果已在库位中,那么自动将该库位的物料出库
             log.info("出库已在库位中的物料[" + barcodeSave.getBarcode() + "]");
             log.info("出库已在库位中的物料[" + barcodeSave.getBarcode() + "]");
             Storage storage = dataCache.getStorageById(pos.getStorageId());
             Storage storage = dataCache.getStorageById(pos.getStorageId());
-            checkout(storage, pos, true, "");
-
+            //checkout(storage, pos, true, "");
+            checkout(storage,pos,true,true,"","",barcodeSave.getBarcode()+"已存在库位:"+pos.getPosName());
             throw new ValidateException("smfcore.error.barcode.exist", "[{0}}]已在{1}}[{2}}]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
             throw new ValidateException("smfcore.error.barcode.exist", "[{0}}]已在{1}}[{2}}]中", new String[]{barcodeSave.getBarcode(), storage.getName(), pos.getPosName()});
         }
         }