看板增加流水线消息显示

src/main/java/com/neotel/smfcore/common/init/DataInitManager.java

@@ -72,11 +72,7 @@ public class DataInitManager {
                 log.info("开始创建默认菜单...");
                 Set<String> menuIdSet = MenuInitNew();
 
-//                Group group=new Group("未分组");
-//                group=groupManager.save(group);
-//                log.info("创建默认组：" + group.toString());
                 Set<String> groupIds = new HashSet<>();
-//                groupIds.add(group.getId());
 
                 Role role = new Role(menuIdSet, "admin", "管理员");
                 role = roleManager.save(role);
@@ -175,35 +171,6 @@ public class DataInitManager {
         return list;
     }
 
-//    private List<Menu> createSubPerMenus(Menu menu) {
-//        List<Menu> list = new ArrayList<>();
-//        //如果是list结尾的，默认前缀菜单
-//        Map<String, String[]> defaultMenus = new HashMap<>();
-//        defaultMenus.put("boxkanban",new String[]{"boxkanban:info","boxkanban:list"});
-//        defaultMenus.put("sensorShelf",new String[]{"sensorShelf:putIn"});
-//        defaultMenus.put("menu", new String[]{"menu:edit", "menu:del", "menu:add"});
-//        defaultMenus.put("user",new String[]{});
-//        defaultMenus.put("role",new String[]{});
-//
-//        String per = menu.getPermission().replace(":list", "");
-//        String menuName = menu.getTitle().replace("管理", "");
-//        if (!defaultMenus.containsKey(per)) {
-//            defaultMenus.put(per,new String[]{per});
-////            return list;
-//        }
-//        String[] subPers = defaultMenus.get(per);
-//        if (subPers.length <= 0) {
-////            subPers = new String[]{per + ":edit", per + ":del", per + ":add"};
-//            subPers = new String[]{per+":manager" };
-//        }
-//        for (String subPer :
-//                subPers) {
-//            String title="权限_"+menuName+"_"+subPer;
-//            Menu subperMenu = menuManager.save(Menu.CreatePerMenu(subPer, title, menu.getId()));
-//            list.add(subperMenu);
-//        }
-//        return list;
-//    }
 
 
     private Set<String> MenuInitNew() {

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -111,6 +111,7 @@ public class DeviceController {
 
         if (dataCahche.getCache(Constants.CACHE_StopOut)) {
             lineMsg = "系统更新中,暂停出入库";
+            DataCache.lineMsg=lineMsg;
             resultMap.put("result", "100");
             resultMap.put("msg", lineMsg);
             return resultMap;
@@ -241,8 +242,9 @@ public class DeviceController {
 
                         reelLocInfo = ReelLockPosUtil.addReelLockPosInfo(reelLocInfo, cidList);
                         if (reelLocInfo == null) {
-                            errorMsg = "库位已被锁定,暂停入库";
+                            errorMsg = "[" + barcode.getBarcode() + "]库位["+reelLocInfo.getLockPosName()+"]已被锁定,暂停入库";
                             lineMsg = errorMsg;
+                            DataCache.lineMsg=lineMsg;
                             resultMap.put("result", "99");
                             resultMap.put("msg", errorMsg);
                             return resultMap;
@@ -287,6 +289,7 @@ public class DeviceController {
             alarmInfo.setAlarmMsg(msg);
             alarmInfoDao.save(alarmInfo);
             lineMsg = errorMsg;
+            DataCache.lineMsg=errorMsg;
         } else {
             lineMsg = okMsg;
         }

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -71,6 +71,11 @@ public class DataCache {
      * 出库方式
      */
     private static Settings settings;
+    /**
+     * 流水线提示消息，只保存最后一条
+     */
+    public static String lineMsg="";
+
 
     @PostConstruct
     public void initialize() {

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

@@ -387,7 +387,8 @@ public class BoxKanbanController {
 
             allcount++;
         }
-        BoxKanbanDto kanbanDto = new BoxKanbanDto(allCount, normal, abnormal,waitCount, new ArrayList<>());
+//        DataCache.lineMsg="系统更新中,暂停出入库";
+        BoxKanbanDto kanbanDto = new BoxKanbanDto(allCount, normal, abnormal,waitCount, new ArrayList<>(),DataCache.lineMsg);
         return kanbanDto;
     }
 

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

@@ -20,4 +20,7 @@ public class BoxKanbanDto {
 
     @ApiModelProperty("组列表")
     private List<GroupStatusDto> groupList;
+
+    @ApiModelProperty("提示消息")
+    private String msg="";
 }