From d7e8792dcdea26c4f410633a37dd0432128f5f19 Mon Sep 17 00:00:00 2001
From: zhangxy <xuanyu9708>
Date: Fri, 18 Jul 2025 09:23:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E5=85=A8=E9=83=A8=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B0=E6=9F=A5=E8=AF=A2=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Interface/IWcsTaskApplication.cs  |  2 +-
 Application/WcsTaskApplication.cs             |  2 +-
 SlnMesnac.WCS/WCS/BearAgv.cs                  | 12 ++++++++++--
 SlnMesnac/Controllers/RecieveRcsController.cs | 12 ++++++------
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Application/Interface/IWcsTaskApplication.cs b/Application/Interface/IWcsTaskApplication.cs
index 09c6037..709f138 100644
--- a/Application/Interface/IWcsTaskApplication.cs
+++ b/Application/Interface/IWcsTaskApplication.cs
@@ -41,7 +41,7 @@ namespace Application.Interface
         /////pad获取所有机台库存列表信息
         ///// </summary>
         ///// <returns></returns>
-        //PadResponse GetAllMachineInfos();
+        PadResponse GetAllMachineInfos();
 
         ///// <summary>
         /////指定机台优先级接口:加急/不加急
diff --git a/Application/WcsTaskApplication.cs b/Application/WcsTaskApplication.cs
index 2f3ae35..3ba8a01 100644
--- a/Application/WcsTaskApplication.cs
+++ b/Application/WcsTaskApplication.cs
@@ -346,7 +346,7 @@ namespace Application
             PadResponse padResponse = new PadResponse();
             try
             {
-                List<WmsMachineInfo> list = sqlSugarClient.Queryable<WmsMachineInfo>().Where(x => !string.IsNullOrEmpty(x.MachineCode)).ToList();
+                List<WmsBaseLocation> list = sqlSugarClient.Queryable<WmsBaseLocation>().Where(x => !string.IsNullOrEmpty(x.AgvPositionCode)).ToList();
                 padResponse.code = "200";
                 padResponse.message = "成功";
                 padResponse.data = list;
diff --git a/SlnMesnac.WCS/WCS/BearAgv.cs b/SlnMesnac.WCS/WCS/BearAgv.cs
index a41a253..63b3e57 100644
--- a/SlnMesnac.WCS/WCS/BearAgv.cs
+++ b/SlnMesnac.WCS/WCS/BearAgv.cs
@@ -252,9 +252,17 @@ namespace SlnMesnac.WCS.WCS
                         //----------------------------------
                         if (string.IsNullOrEmpty(readEpc) || readEpc != task.PalletInfoCode)
                         {
+                            if (string.IsNullOrEmpty(readEpc)){
+                                workShop3Plc.writeBoolByAddress("DB100.DBX120.1", true);
+                                _logger.Error("入库校验RFID失败,当前库位RFID为空，未读取到,任务RFID:" + task.PalletInfoCode);
+                            }
+                            else
+                            {
+                                _logger.Error("入库校验RFID失败,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
+                                return;
+                            }
                             //workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#机台校验失败提示"), true);
-                            _logger.Error("入库校验RFID失败,当前库位RFID:" + readEpc + ",任务RFID:" + task.PalletInfoCode);
-                            return;
+                            
                         }
                         //workShop3Plc.writeBoolByAddress(StaticData.GetPlcAddress("3#机台校验失败提示"), false);
                         endLocation.LocationStatus = 0;
diff --git a/SlnMesnac/Controllers/RecieveRcsController.cs b/SlnMesnac/Controllers/RecieveRcsController.cs
index 8988d76..58da5ba 100644
--- a/SlnMesnac/Controllers/RecieveRcsController.cs
+++ b/SlnMesnac/Controllers/RecieveRcsController.cs
@@ -101,12 +101,12 @@ namespace SlnMesnac.Controllers
         ///// pad获取所有机台库存列表信息
         ///// </summary>
         ///// <returns></returns>
-        //[HttpPost("getAllMachineInfos")]
-        //public PadResponse GetAllMachineInfos()
-        //{
-        //    PadResponse response = _application.GetAllMachineInfos();
-        //    return response;
-        //}
+        [HttpPost("getAllMachineInfos")]
+        public PadResponse GetAllMachineInfos()
+        {
+            PadResponse response = _application.GetAllMachineInfos();
+            return response;
+        }
 
         ///// <summary>
         /////指定机台优先级接口:加急/不加急