bug修改

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

@@ -276,6 +276,8 @@ public class BoxKanbanController {
         for (String cid :
                 cids) {
             List<List<String>> objects = DevicesStatusUtil.getDeviceData(cid);
+//            List<String> hasReelPosErrorList =new ArrayList<>();
+//            List<String> noReelPosErrorList =new ArrayList<>();
             List<String> hasReelPosErrorList =Arrays.asList(new String[]{"4D1112AA0014","4D0603BB0012","4D0303AA0015"});
             List<String> noReelPosErrorList =Arrays.asList(new String[]{"4D0601AA0002","4D0601BB0001","4D0601BB0003"});
             if(objects!=null&&objects.size()==2){

src/main/java/com/neotel/smfcore/core/storage/enums/DeviceType.java

@@ -95,6 +95,11 @@ public enum DeviceType {
     SMD_XLC("storage.type.smdXlc"),
 
     /**
+     * 15 放料盘的方仓
+     */
+    SMD_XLR("storage.type.smdXlr"),
+
+    /**
      * 15 (默认料仓)
      */
     DEFAULT("storage.type.default")

src/main/java/com/neotel/smfcore/hella/handler/HellaServiceHandler.java

@@ -127,8 +127,8 @@ public class HellaServiceHandler extends IoHandlerAdapter implements ITaskListen
 
         commandMap.put(command.getEventId(),command);
         log.info("发送检查物料条码请求:" + command.toReqMsg());
-//        ResultBean resultBean = HellaTcpClient.sendMsg(command.toReqMsg());
-        ResultBean resultBean = testCheckOK(command);
+        ResultBean resultBean = HellaTcpClient.sendMsg(command.toReqMsg());
+//        ResultBean resultBean = testCheckOK(command);
         resultBean.setMsg("Check Material result:"+resultBean.getMsg());
         return resultBean;
     }

src/main/resources/messages.properties

@@ -121,6 +121,7 @@ smfcode.materialBox.noReel=\u6599\u76D2\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u726
 smfcode.materialBox.boxNoReel=\u6599\u76D2\u4E2D\u65E0\u7269\u6599
 smfcode.materialBox.inPos=\u7269\u6599\u5DF2\u5728\u5E93\u4F4D{0}\u4E2D
 smfcode.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
+smfcore.materialBox=\u6599\u76D2\u64CD\u4F5C
 
 
 

src/main/resources/messages_en_US.properties

@@ -121,3 +121,4 @@ smfcode.materialBox.noReel=The corresponding material is not found in the materi
 smfcode.materialBox.boxNoReel=No material in the cassette
 smfcode.materialBox.inPos=The material is already in the storage space {0}
 smfcode.materialBox.inOtherBox=The material is already in the cassette {0}
+smfcore.materialBox=Cassette operation

src/main/resources/messages_ja_JP.properties

@@ -120,4 +120,5 @@ smfcode.materialBox.invalid=\u96D1\u8A8C\u306E\u60C5\u5831\u306F\u898B\u3064\u30
 smfcode.materialBox.noReel=\u30AB\u30BB\u30C3\u30C8\u5185\u306B\u8A72\u5F53\u3059\u308B\u7D20\u6750\u304C\u898B\u3064\u304B\u3089\u306A\u3044
 smfcode.materialBox.boxNoReel=\u30AB\u30BB\u30C3\u30C8\u306B\u7D20\u6750\u304C\u306A\u3044
 smfcode.materialBox.inPos=\u3059\u3067\u306B\u5728\u5EAB\u306E\u3042\u308B\u7D20\u6750 {0}
-smfcode.materialBox.inOtherBox=\u30AB\u30BB\u30C3\u30C8\u306B\u65E2\u306B\u5165\u3063\u3066\u3044\u308B\u7D20\u6750 {0}
\ No newline at end of file
+smfcode.materialBox.inOtherBox=\u30AB\u30BB\u30C3\u30C8\u306B\u65E2\u306B\u5165\u3063\u3066\u3044\u308B\u7D20\u6750 {0}
+smfcore.materialBox=\u30AB\u30BB\u30C3\u30C8\u64CD\u4F5C
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -120,4 +120,5 @@ smfcode.materialBox.invalid=\u672A\u627E\u5230\u6599\u76D2\u4FE1\u606F{0}
 smfcode.materialBox.noReel=\u6599\u76D2\u4E2D\u672A\u627E\u5230\u5BF9\u5E94\u7269\u6599
 smfcode.materialBox.boxNoReel=\u6599\u76D2\u4E2D\u65E0\u7269\u6599
 smfcode.materialBox.inPos=\u7269\u6599\u5DF2\u5728\u5E93\u4F4D{0}\u4E2D
-smfcode.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
\ No newline at end of file
+smfcode.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
+smfcore.materialBox=\u6599\u76D2\u64CD\u4F5C
\ No newline at end of file

src/main/resources/messages_zh_TW.properties

@@ -120,4 +120,5 @@ smfcode.materialBox.invalid=\u672A\u627E\u5230\u6599\u76D2\u4FE1\u606F{0}
 smfcode.materialBox.noReel=\u6599\u76D2\u4E2D\u672A\u627E\u5230\u5C0D\u61C9\u7269\u6599
 smfcode.materialBox.boxNoReel=\u6599\u76D2\u4E2D\u7121\u7269\u6599
 smfcode.materialBox.inPos=\u7269\u6599\u5DF2\u5728\u5EAB\u4F4D{0}\u4E2D
-smfcode.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
\ No newline at end of file
+smfcode.materialBox.inOtherBox=\u7269\u6599\u5DF2\u5728\u6599\u76D2{0}\u4E2D
+smfcore.materialBox=\u6599\u76D2\u64CD\u4F5C
\ No newline at end of file