From 15fce0eb33e82ba3fc59bb88953b2956a9781ef4 Mon Sep 17 00:00:00 2001
From: zhangxy <xuanyu9708>
Date: Thu, 28 Aug 2025 14:18:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB=E5=8F=96RFID=E7=9A=84=E4=BF=9D=E5=BA=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WCS/WCS/BearAgv.cs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/SlnMesnac.WCS/WCS/BearAgv.cs b/SlnMesnac.WCS/WCS/BearAgv.cs
index e5b443c..419c895 100644
--- a/SlnMesnac.WCS/WCS/BearAgv.cs
+++ b/SlnMesnac.WCS/WCS/BearAgv.cs
@@ -253,39 +253,41 @@ namespace SlnMesnac.WCS.WCS
                         if (string.IsNullOrEmpty(readEpc) || readEpc != task.PalletInfoCode)
                         {
                             int RFIDretrytime;
-                            for (RFIDretrytime = 0; RFIDretrytime < 3; RFIDretrytime++)
+                            for (RFIDretrytime = 0; RFIDretrytime < 5; RFIDretrytime++)
                             {
                                 readEpc = ReadEpcStrByRfidKey(endLocation.EquipKey);
-                                if (string.IsNullOrEmpty(readEpc)){
+                                if (string.IsNullOrEmpty(readEpc) || readEpc != task.PalletInfoCode)
+                                {
                                 
                                     _logger.Error("入库校验RFID失败,当前库位RFID为空，未读取到,正在重试读取，任务RFID:" + task.PalletInfoCode);
                                     Thread.Sleep(500);
                                 }
                                 else
                                 {
-                                    _logger.Error("入库校验RFID失败,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
-                                    return;
+                                    _logger.Error("入库校验RFID成功,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
+                                    break;
                                 }
                             }
                             RFIDretrytime = 0;
-                            if (string.IsNullOrEmpty(readEpc))
+                            if (string.IsNullOrEmpty(readEpc) || readEpc != task.PalletInfoCode)
                             {
 
                                 workShop3Plc.writeBoolByAddress("DB100.DBX120.1", true);
-                                _logger.Error("入库校验RFID失败,当前库位RFID为空，未读取到,重试多次读取到，已锁库，任务RFID:" + task.PalletInfoCode);
+                                _logger.Error("入库校验RFID失败,当前库位RFID为空，未读取到,重试多次读取，已锁库，任务RFID:" + task.PalletInfoCode);
                                 endLocation.LocationStatus = 1;
                                 sqlSugarClient.Updateable(endLocation).ExecuteCommand();
                                 Thread.Sleep(500);
+                                return;
                             }
                             else
                             {
-                                _logger.Error("入库校验RFID失败,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
-                                return;
+                                _logger.Error("入库校验RFID成功,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
                             }
                             //workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#机台校验失败提示"), true);
 
                         }
                         //workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#机台校验失败提示"), false);
+                        workShop3Plc.writeBoolByAddress("DB100.DBX120.1", false);
                         endLocation.LocationStatus = 0;
                         endLocation.ContainerCode = task.PalletInfoCode;