清理rfid接口修改

src/main/java/com/neotel/smfcore/core/shelf/rest/TaskShelfController.java

@@ -342,7 +342,10 @@ public class TaskShelfController {
     @ApiOperation("根据rfid清空料架信息")
     @RequestMapping(value = "/clearRfid")
     @AnonymousAccess
-    public ResultBean clearRfid(@RequestParam String orderNo,@RequestParam String rfid) {
+    public ResultBean clearRfid(HttpServletRequest request ) {
+         String orderNo =request.getParameter("orderNo");
+         String rfid=request.getParameter("rfid");
+
         if (ObjectUtil.isNotEmpty(orderNo)) {
             if (ObjectUtil.isNotEmpty(rfid)) {
                 ShelfInfo shelfInfo = TaskShelfUtil.findSameShelf(orderNo, rfid);
@@ -353,14 +356,29 @@ public class TaskShelfController {
                 boolean result = TaskShelfUtil.clearShelf(orderNo, rfid);
                 if (result) {
                     log.info("clearRfid orderNo[" + orderNo + "],rfid[" + rfid + "] OK" );
+                    return ResultBean.newOkResult("ok");
                 }
 
             } else {
                 boolean result = TaskShelfUtil.clearShelf(orderNo);
                 if (result) {
                     log.info("clearRfid orderNo[" + orderNo + "] OK ");
+                    return ResultBean.newOkResult("ok");
+                }
+            }
+        }
+        else if(ObjectUtil.isEmpty(rfid)){
+            ShelfInfo shelfInfo = TaskShelfUtil.findShelfByRealRfid(rfid);
+            if (shelfInfo == null) {
+                log.info("clearRfid rfid[" + rfid + "]");
+                return ResultBean.newErrorResult(99, "smfcore.taskShelf.notExist", "未找到rfid[" + rfid + "]", new String[]{rfid});
             }
+            boolean result = TaskShelfUtil.clearShelf(shelfInfo.getOrderNo(), rfid);
+            if (result) {
+                log.info("clearRfid orderNo[" + shelfInfo.getOrderNo() + "],rfid[" + rfid + "] OK");
+                return ResultBean.newOkResult("ok");
             }
+
         }
         return ResultBean.newOkResult("未找到可清除的料架");
     }

src/main/resources/messages.properties

@@ -351,6 +351,8 @@ smfcore.mesApi.inCheck.error=MES\u9A8C\u8BC1\u51FA\u9519\uFF1A{0}
 smfcore.mesApi.loginCheck.fail=MES\u767B\u9646\u9A8C\u8BC1\u5931\u8D25
 smfcore.mesApi.loginCheck.error=MES\u767B\u9646\u9A8C\u8BC1\u9519\u8BEF\uFF1A{0}
 smfcore.taskShelf.notExist=\u672A\u627E\u5230\u5DE5\u5355[{0}]\u7684rfid[{1}]
+smfcore.agvShelf.noLoc=\u672A\u627E\u5230\u6599\u67B6{0}\u76EE\u6807\u4F4D\u7F6E
+smfcore.codeLight=\u626B\u7801\u4EAE\u706F
 #smfclient.nlp.onlyOneTray=\u4E0D\u53EF\u540C\u65F6\u653E\u5165\u591A\u76D8\u7269\u6599:{0}
 #smfclient.nlp.cannotFindPos={0}\u672A\u627E\u5230\u5E93\u4F4D:{1}
 #smfclient.nlp.inputOk={0}\u5165\u5E93\u5230{1}\u6210\u529F

src/main/resources/messages_en_US.properties

@@ -349,3 +349,5 @@ smfcore.selfAudit.noPos=Self Audit{0}No depot number found
 smfcore.mesApi.inCheck.error=MES verification error\uFF1A{0}
 smfcore.mesApi.loginCheck.fail=MES Login fail
 smfcore.mesApi.loginCheck.error=MES Login error\uFF1A{0}
+smfcore.agvShelf.noLoc=Shelf {0} target location not found
+smfcore.codeLight=CODE LIGHT
\ No newline at end of file

src/main/resources/messages_ja_JP.properties

@@ -346,3 +346,5 @@ smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
 smfcore.mesApi.inCheck.error=MES\u9A8C\u8BC1\u51FA\u9519\uFF1A{0}
 smfcore.mesApi.loginCheck.fail=MES\u767B\u9646\u9A8C\u8BC1\u5931\u8D25
 smfcore.mesApi.loginCheck.error=MES\u767B\u9646\u9A8C\u8BC1\u9519\u8BEF\uFF1A{0}
+smfcore.agvShelf.noLoc=\u672A\u627E\u5230\u6599\u67B6{0}\u76EE\u6807\u4F4D\u7F6E
+smfcore.codeLight=\u626B\u7801\u4EAE\u706F
\ No newline at end of file

src/main/resources/messages_zh_CN.properties

@@ -346,3 +346,5 @@ smfcore.selfAudit.noPos=\u76D8\u70B9{0}\u672A\u627E\u5230\u5E93\u4F4D\u53F7
 smfcore.mesApi.inCheck.error=MES\u9A8C\u8BC1\u51FA\u9519\uFF1A{0}
 smfcore.mesApi.loginCheck.fail=MES\u767B\u9646\u9A8C\u8BC1\u5931\u8D25
 smfcore.mesApi.loginCheck.error=MES\u767B\u9646\u9A8C\u8BC1\u9519\u8BEF\uFF1A{0}
+smfcore.agvShelf.noLoc=\u672A\u627E\u5230\u6599\u67B6{0}\u76EE\u6807\u4F4D\u7F6E
+smfcore.codeLight=\u626B\u7801\u4EAE\u706F
\ No newline at end of file