1053 显示bug修改

src/main/java/com/neotel/smfcore/core/message/rest/MessageController.java

@@ -126,8 +126,8 @@ public class MessageController {
             @Override
             public List<List<String>> getHeader() {
                 List<List<String>> header = new ArrayList<>();
-                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.msgReportCount.msg",locale,"错误类型")));
-                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.msgReportCount.count",locale,"数量")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.errorReport.type",locale,"错误类型")));
+                header.add(Lists.newArrayList(MessageUtils.getSmfClientMsg("smfclient.errorReport.num",locale,"数量")));
                 return header;
             }
 

src/main/java/com/neotel/smfcore/custom/hotayi20057/HotayiController.java

@@ -198,15 +198,15 @@ public class HotayiController {
             return hotayiBean;
         }
 
-        //判断是否在出库中
-        try {
-
-        } catch (ValidateException ex) {
-            String msg = MessageUtils.getText(ex.getMsgKey(), locale, ex.getDefaultMsg());
-            hotayiBean.setM90(72, msg);
-            log.info("M7返回M90，数据为:"+JsonUtil.toJsonStr(hotayiBean));
-            return hotayiBean;
-        }
+//        //判断是否在出库中
+//        try {
+//
+//        } catch (ValidateException ex) {
+//            String msg = MessageUtils.getText(ex.getMsgKey(), locale, ex.getDefaultMsg());
+//            hotayiBean.setM90(72, msg);
+//            log.info("M7返回M90，数据为:"+JsonUtil.toJsonStr(hotayiBean));
+//            return hotayiBean;
+//        }
         Storage storage=dataCache.getStorageById(pos.getStorageId());
         String result = taskService.checkout(pos,true,null,false);
         if (ObjectUtil.isNotEmpty(result)) {

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronStatusController.java

@@ -198,7 +198,7 @@ public class MicronStatusController {
                 if(cid.endsWith("-1")){
                     cid= cid.replace("-1","-B");
                 }else if(cid.endsWith("-2")){
-                    cid= cid.replace("-1","-A");
+                    cid= cid.replace("-2","-A");
                 }
 
                 if (s.getStatus() == 2||s.getStatus()==3) {
@@ -420,13 +420,23 @@ public class MicronStatusController {
                         allStorages.values()) {
                     StatusBean statusBean = DevicesStatusUtil.getStatusBean(storage.getCid());
                     if (statusBean != null && (!statusBean.timeOut())) {
-                        String msg = statusBean.getErrorMsg(servletRequest.getLocale());
-                        if (ObjectUtil.isNotEmpty(msg)) {
+//                        String msg = statusBean.getErrorMsg(servletRequest.getLocale());
+//                        if (ObjectUtil.isNotEmpty(msg)) {
+//                            count += 1;
+//                        }
+                        Map<String, String> msgMap = statusBean.getMsgMap();
+                        if (msgMap != null && msgMap.size() > 0) {
+                            for (String msg :
+                                    msgMap.keySet()) {
+                                String type = msgMap.getOrDefault(msg, "");
+                                if (type.toUpperCase().equals("ERROR")) {
                                     count += 1;
                                 }
                             }
                         }
                     }
+                }
+            }
 
         } catch (Exception ex) {
             log.error("alarmMsgCount 出错：" + ex.toString());