1053bug修改：1.SBDH页面出入库记录根据时间排序。2.看板消息去掉A=。3.获取库位号增加返回：100=系统更新中,暂停出入库

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -535,9 +535,11 @@ public class StatusBean {
         //从收到数据中查找
         //从收到数据中查找
         String lan = locale.toLanguageTag();
         String lan = locale.toLanguageTag();
         if (lan.equals(MessageUtils.JA_JP) && ObjectUtil.isNotEmpty(getMsgJp())) {
         if (lan.equals(MessageUtils.JA_JP) && ObjectUtil.isNotEmpty(getMsgJp())) {
-            return getMsgJp();
+            String resultMsg= getMsgJp().replace("A=","").replace("I=","").replace("W=","");
+            return resultMsg;
         } else if (lan.equals(MessageUtils.EN_US) && ObjectUtil.isNotEmpty(getMsgEn())) {
         } else if (lan.equals(MessageUtils.EN_US) && ObjectUtil.isNotEmpty(getMsgEn())) {
-            return getMsgEn();
+            String resultMsg= getMsgEn().replace("A=","").replace("I=","").replace("W=","");
+            return resultMsg;
         }
         }
         //提示信息国际化
         //提示信息国际化
         if (ObjectUtil.isEmpty(getMsgCode())) {
         if (ObjectUtil.isEmpty(getMsgCode())) {

src/main/java/com/neotel/smfcore/core/device/handler/impl/RobotBoxHandler.java

@@ -271,6 +271,7 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         //返回：97=已有入库任务,需继续执行入库动作
         //返回：97=已有入库任务,需继续执行入库动作
         //返回：98=已有出库任务,需继续执行出库动作
         //返回：98=已有出库任务,需继续执行出库动作
         //返回：99=所在料仓有出库任务,暂停入库
         //返回：99=所在料仓有出库任务,暂停入库
+        //返回：100=系统更新中,暂停出入库
         //返回：104=未找到可用的仓位
         //返回：104=未找到可用的仓位
         //返回 105=查找空库位失败
         //返回 105=查找空库位失败
         //返回 106=唯一码已有入库任务
         //返回 106=唯一码已有入库任务
@@ -282,11 +283,19 @@ public class RobotBoxHandler extends BaseDeviceHandler {
         String lastPosId = "";
         String lastPosId = "";
         String lineMsg = "";
         String lineMsg = "";
         log.info("流水线[" + cids + "]获取[" + code + "]的入库库位");
         log.info("流水线[" + cids + "]获取[" + code + "]的入库库位");
+        Map<String, Object> resultMap = Maps.newHashMap();
+        if (dataCache.getCache(Constants.CACHE_StopOut)) {
+//            lineMsg = "系统更新中,暂停出入库";
+            lineMsg="System update in progress, suspend the inlet and outlet";
+            DeviceMessageUtil.updateLineMsg(lineMsg,code,cids,"" ,"smfcore.linemsg.update",null);
+            resultMap.put("result", "100");
+            resultMap.put("msg", lineMsg);
+            return resultMap;
+        }
         if(ObjectUtil.isEmpty(cids)){
         if(ObjectUtil.isEmpty(cids)){
             cids="";
             cids="";
         }
         }
         String[] cidArray= cids.split(",");
         String[] cidArray= cids.split(",");
-        Map<String, Object> resultMap = Maps.newHashMap();
         String okMsg = "";
         String okMsg = "";
         String errorMsg = "";
         String errorMsg = "";
         List<Storage> storageList = Lists.newArrayList();
         List<Storage> storageList = Lists.newArrayList();

src/main/java/com/neotel/smfcore/core/report/bean/ChartItem.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 import java.io.Serializable;
 
 
 @Data
 @Data
-public class ChartItem implements Serializable {
+public class ChartItem implements Serializable , Comparable<ChartItem> {
     /**
     /**
      * label为时间标签 value 为入库量,value2为出库量,value3为报警次数,value4为报警持续时间
      * label为时间标签 value 为入库量,value2为出库量,value3为报警次数,value4为报警持续时间
      */
      */
@@ -17,6 +17,13 @@ public class ChartItem implements Serializable {
 
 
     private int value;
     private int value;
 
 
+    private Integer dayOfYear;
+
+    @Override
+    public int compareTo(ChartItem o) {
+        return this.getDayOfYear().compareTo(o.getDayOfYear());
+    }
+
 //    private int value3;
 //    private int value3;
 //
 //
 //    private int value4;
 //    private int value4;

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StorageManagerImpl.java

@@ -100,6 +100,7 @@ public class StorageManagerImpl implements IStorageManager {
 
 
             ChartItem item = new ChartItem();
             ChartItem item = new ChartItem();
             item.setLabel(dayStr);
             item.setLabel(dayStr);
+            item.setDayOfYear(dayOfYear);
             inOutDataMap.put(String.valueOf(dayOfYear), item);
             inOutDataMap.put(String.valueOf(dayOfYear), item);
             c.add(Calendar.DAY_OF_YEAR,1);
             c.add(Calendar.DAY_OF_YEAR,1);
         }while (c.getTimeInMillis() <= endTime);
         }while (c.getTimeInMillis() <= endTime);

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

@@ -292,9 +292,10 @@ public class MicronStatusController {
         }
         }
         dto.setTotalCount(totalCount);
         dto.setTotalCount(totalCount);
         dto.setUsedCount(useCount);
         dto.setUsedCount(useCount);
-        dto.setChartItems(chartItemMap.values().stream().collect(Collectors.toList()));
+        List<ChartItem> chartItemList=chartItemMap.values().stream().collect(Collectors.toList());
+        Collections.sort(chartItemList);
+        dto.setChartItems(chartItemList);
         dto.setTodayCounts(todayCounts);
         dto.setTodayCounts(todayCounts);
-
         Integer caWarn=dataCache.getCache(Constants.CACHE_CapacityWarn);
         Integer caWarn=dataCache.getCache(Constants.CACHE_CapacityWarn);
         dto.setCapacityWarn(caWarn);
         dto.setCapacityWarn(caWarn);
         return dto;
         return dto;