From 4eb9ad189564af3c05e55e61f9ad559c796f0833 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: Sun, 9 Apr 2023 15:48:10 +0800
Subject: [PATCH] =?UTF-8?q?rfid=E6=89=AB=E6=8F=8F=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=88=90=E5=8A=9F=E7=9A=84=E5=86=99=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=20=E6=B3=A8=E6=8E=89code=E5=86=99?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zhehekeji/web/service/PlcService.java    |  4 ++--
 .../com/zhehekeji/web/service/RFID/RFIDSocket.java    | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

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 cfbeac5..9f1dd12 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -632,10 +632,10 @@ public class PlcService {
                 Thread.sleep(1000*configProperties.getRfid().getScanTime());
                 Set<String> tags = RFIDStop(plcCmdInfo);
                 if(tags!= null && tags.size()>0 && tags.contains(wmsTrayCode)){
-                    trayCode = "";
+                    trayCode = wmsTrayCode;
                     trayCheck = Boolean.TRUE;
                 }else {
-                    trayCode = "未识别";
+                    trayCode = "";
                     trayCheck = Boolean.FALSE;
                     log.warn("sick ocr error:{}",trayCode);
                 }
diff --git a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java b/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java
index d70b81e..ba2f0c7 100644
--- a/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java
+++ b/web/src/main/java/com/zhehekeji/web/service/RFID/RFIDSocket.java
@@ -1,5 +1,6 @@
 package com.zhehekeji.web.service.RFID;
 
+import com.baomidou.mybatisplus.extension.api.R;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,6 +47,7 @@ public class RFIDSocket {
         return tags;
     }
 
+
     public RFIDSocket(String ip,int port){
         socket = new Socket();
         os = null;
@@ -103,11 +105,13 @@ public class RFIDSocket {
                     while (buffer.size()> 0){
                         String code = readTag();
                         if(code != null){
-                            if(!tags.contains(code))
+                        // 写入log
+                            /*if(!tags.contains(code))
                             {
                                 fw.write(code+"\n");
                                 fw.flush();
-                            }
+                            }*/
+                            System.out.println(code);
                             tags.add(code);
                         }
                     }
@@ -236,7 +240,8 @@ public class RFIDSocket {
 
     public static void main(String[] args) throws IOException, InterruptedException {
         RFIDSocket rfid = new RFIDSocket("10.43.26.124",4001);
-        file = new File("F:\\Leaper\\Programs\\Java\\backend-duoji-monitor\\logs\\code.txt");
+        file = new File("D:\\code.txt");
+        file.createNewFile();
         fw = new FileWriter(file, true);
         fw.write("\n");
         rfid.startCheck();