看板展示msg修改,增加料仓和条码

src/main/java/com/neotel/smfcore/core/kanban/rest/BoxKanbanController.java

@@ -17,6 +17,8 @@ import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.kanban.rest.bean.dto.*;
 import com.neotel.smfcore.core.kanban.rest.bean.mapstruct.BoxTaskMapper;
 import com.neotel.smfcore.core.kanban.rest.bean.query.BoxTaskQueryCriter;
+import com.neotel.smfcore.core.message.service.bean.DataContent;
+import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.po.Storage;
@@ -412,8 +414,15 @@ public class BoxKanbanController {
         }
 //        DataCache.lineMsg="系统更新中,暂停出入库";
         String lineMsg=null;
-        if(DeviceMessageUtil.lastLineMsg!=null){
-            lineMsg=DeviceMessageUtil.lastLineMsg.getShowMsg(local);
+        Message lastLineMsg = DeviceMessageUtil.lastLineMsg;
+        if(lastLineMsg!=null){
+            lineMsg=lastLineMsg.getShowMsg(local);
+            List<DataContent> dataList = lastLineMsg.getDataList();
+            for (DataContent content : dataList) {
+                String key = content.getKey();
+                String value = content.getValue();
+                lineMsg = lineMsg + " " +key+":"+value;
+            }
         }
         BoxKanbanDto kanbanDto = new BoxKanbanDto(allCount, normal, abnormal,waitCount, new ArrayList<>(), lineMsg);
         return kanbanDto;