1

src/main/java/com/neotel/smfcore/core/equipment/rest/EquipViewController.java

@@ -135,10 +135,13 @@ public class EquipViewController {
         }
         }
 
 
         Map<String,String> data=EquipStatusUtil.getData(equip.getCid());
         Map<String,String> data=EquipStatusUtil.getData(equip.getCid());
-        if(data!=null){
+        if(data==null||data.size()<=0){
+            data=new HashMap<>();
+//            data.put("RI","RI9793003");
+//            data.put("PN","STX8374");
+//            data.put("QTY","9870");
             dto.setPrintData(data);
             dto.setPrintData(data);
         }else {
         }else {
-            data=new HashMap<>();
             dto.setPrintData(data);
             dto.setPrintData(data);
         }
         }
 //        if(dto.getShowLogs().size()<=0){
 //        if(dto.getShowLogs().size()<=0){

src/main/java/com/neotel/smfcore/core/kanban/rest/bean/dto/BoxStatusDto.java

@@ -77,6 +77,7 @@ public class BoxStatusDto {
     //取出出库料盘:takeOutReel
     //取出出库料盘:takeOutReel
     //关闭仓门:confirmReelOut
     //关闭仓门:confirmReelOut
 //      状态显示：  disable:不可用，enable：可用，点击按钮后发送 doit
 //      状态显示：  disable:不可用，enable：可用，点击按钮后发送 doit
+    //mixingSpeed !=0表示工作中
     private Map<String, String> data = new HashMap<>();
     private Map<String, String> data = new HashMap<>();
 
 
     @ApiModelProperty("当前绑定的入库单名称")
     @ApiModelProperty("当前绑定的入库单名称")

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

@@ -112,16 +112,16 @@ public class EquipStatusUtil {
     }
     }
 
 
     public static Map<String,String> getData(String cid) {
     public static Map<String,String> getData(String cid) {
-        Map<String,String> data = dataMap.getOrDefault(cid, new HashMap<>());
+        Map<String, String> data = dataMap.getOrDefault(cid, new HashMap<>());
 
 
-        if (data==null||data.size() > 0) {
+        if (data == null || data.size() <= 0) {
             //默认查找cid_1的视频
             //默认查找cid_1的视频
-            String nCid=cid+"_2";
+            String nCid = cid + "_2";
             data = dataMap.getOrDefault(cid, new HashMap<>());
             data = dataMap.getOrDefault(cid, new HashMap<>());
         }
         }
-        if (data==null||data.size() > 0) {
+        if (data == null || data.size() <= 0) {
             //默认查找cid_1的视频
             //默认查找cid_1的视频
-            String nCid=cid+"_1";
+            String nCid = cid + "_1";
             data = dataMap.getOrDefault(cid, new HashMap<>());
             data = dataMap.getOrDefault(cid, new HashMap<>());
         }
         }
         return data;
         return data;