1.更改全部机台查询表格

Application/Interface/IWcsTaskApplication.cs

@@ -41,7 +41,7 @@ namespace Application.Interface
         /////pad获取所有机台库存列表信息
         ///// </summary>
         ///// <returns></returns>
-        //PadResponse GetAllMachineInfos();
+        PadResponse GetAllMachineInfos();
 
         ///// <summary>
         /////指定机台优先级接口:加急/不加急

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;

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;

SlnMesnac/Controllers/RecieveRcsController.cs

@@ -101,12 +101,12 @@ namespace SlnMesnac.Controllers
         ///// pad获取所有机台库存列表信息
         ///// </summary>
         ///// <returns></returns>
-        //[HttpPost("getAllMachineInfos")]
+        [HttpPost("getAllMachineInfos")]
-        //public PadResponse GetAllMachineInfos()
+        public PadResponse GetAllMachineInfos()
-        //{
+        {
-        //    PadResponse response = _application.GetAllMachineInfos();
+            PadResponse response = _application.GetAllMachineInfos();
-        //    return response;
+            return response;
-        //}
+        }
 
         ///// <summary>
         /////指定机台优先级接口:加急/不加急