From 03c4443c03a1e3b90e9d4416701a6da080e46f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Thu, 30 Nov 2023 16:08:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/controller/VideoccController.java | 5 ++++-
 web/src/main/java/com/zhehekeji/web/service/PlcService.java  | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/controller/VideoccController.java b/web/src/main/java/com/zhehekeji/web/controller/VideoccController.java
index be1c38d..c1b2b2a 100644
--- a/web/src/main/java/com/zhehekeji/web/controller/VideoccController.java
+++ b/web/src/main/java/com/zhehekeji/web/controller/VideoccController.java
@@ -10,6 +10,7 @@ import com.zhehekeji.web.service.PlcService;
 import com.zhehekeji.web.service.interfaces.RfidLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +22,7 @@ import java.util.*;
 @Api(tags = "对外接口")
 @RequestMapping("/videocc")
 @RestController
+@Slf4j
 public class VideoccController {
     @Resource
     private RfidLogService rfidLogService;
@@ -38,9 +40,10 @@ public class VideoccController {
         if(videocc.getDetails()!=null && videocc.getDetails().size()>0){
             for(String detail:videocc.getDetails().keySet()){
                 list.add(detail);
-               list.addAll(videocc.getDetails().get(detail));
+                list.addAll(videocc.getDetails().get(detail));
             }
         }
+        log.info("rfid推送信息:"+list);
         plcService.wmsTrayCodeMapByTask.put(orderNum,list);
         VideoccResponse videoccResponse = new VideoccResponse();
         videoccResponse.setMsg("成功");
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index 43e6a87..22f1ab4 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -716,7 +716,8 @@ public class PlcService {
         }
         if (tags != null && tags.size() > 0) {
 
-            if (tags.containsAll(wmsTrayCodeMapByTask.get(plcCmdInfo.getOrderNum()))) {
+            if (wmsTrayCodeMapByTask.get(plcCmdInfo.getOrderNum()) !=null
+                    && tags.containsAll(wmsTrayCodeMapByTask.get(plcCmdInfo.getOrderNum()))) {
 
 
                 trayRFIDCheck = Boolean.TRUE;
@@ -725,6 +726,7 @@ public class PlcService {
                     trayCode = "RFID扫描失败";
                 }else
                     trayCode += ";RFID扫描失败";
+                wmsTrayCodeMapByTask.get(plcCmdInfo.getOrderNum()).removeAll(tags);
                 trayRFIDCheck = Boolean.FALSE;
             }
             wmsTrayCodeMapByTask.remove(plcCmdInfo.getOrderNum());