From 9f620c70c1750590f7042d44eafe4c162f292eff Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Fri, 12 Dec 2025 10:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86BUG?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/mes/Device/DeviceInspectController.cs         | 2 +-
 .../mes/Device/DeviceRouteInspectionPlanController.cs         | 2 +-
 ZR.Admin.WebApi/ZR.Admin.WebApi.csproj                        | 1 +
 ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs       | 2 ++
 ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs     | 4 ++--
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceInspectController.cs b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceInspectController.cs
index 117869ef..32a7e1b2 100644
--- a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceInspectController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceInspectController.cs
@@ -16,8 +16,8 @@ namespace ZR.Admin.WebApi.Controllers
     /// <summary>
     /// 设备检查项
     /// </summary>
-    [Verify]
     [Route("mes/deviceManagement/DeviceInspect")]
+    [AllowAnonymous]
     public class DeviceInspectController : BaseController
     {
         /// <summary>
diff --git a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceRouteInspectionPlanController.cs b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceRouteInspectionPlanController.cs
index 61a29df5..9bdec992 100644
--- a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceRouteInspectionPlanController.cs
+++ b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceRouteInspectionPlanController.cs
@@ -12,8 +12,8 @@ namespace ZR.Admin.WebApi.Controllers
     /// <summary>
     /// 巡检计划
     /// </summary>
-    [Verify]
     [Route("mes/deviceManagement/DeviceRouteInspectionPlan")]
+    [AllowAnonymous]
     public class DeviceRouteInspectionPlanController : BaseController
     {
         /// <summary>
diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index 7b7017cd..d11bc583 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -52,6 +52,7 @@
 	<ItemGroup>
 		<Folder Include="Controllers\mes\andon\" />
 		<Folder Include="Properties\PublishProfiles\" />
+		<Folder Include="wwwroot\2025\1212\" />
 		<Folder Include="wwwroot\export\" />
 		<Folder Include="wwwroot\Generatecode\" />
 		<Folder Include="wwwroot\workorder\" />
diff --git a/ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs b/ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs
index f8516cd3..43cb4b1d 100644
--- a/ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs
+++ b/ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs
@@ -14,6 +14,8 @@ namespace ZR.Model.MES.dev.Dto
         public DateTime? LifeCycleEnd { get; set; }
         public int? ExcuteCycleType { get; set; }
         public int? InnerType { get; set; }
+
+        public int? Status { get; set; }
     }
 
     /// <summary>
diff --git a/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs b/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs
index 1152e15f..cd21bd07 100644
--- a/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs
+++ b/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs
@@ -32,8 +32,8 @@ namespace ZR.Service.MES.dev
            .AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart)
            .AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd)
            .AndIF(parm.ExcuteCycleType > 0, it => it.ExcuteCycleType == parm.ExcuteCycleType)
-           .AndIF(parm.InnerType>-1, it => it.InnerType == parm.InnerType);
-
+           .AndIF(parm.InnerType>-1, it => it.InnerType == parm.InnerType)
+           .AndIF(parm.Status != null, it => it.Status == parm.Status);
             var response = Queryable()
                 .Where(predicate.ToExpression())
                 .ToPage<DeviceRouteInspectionPlan, DeviceRouteInspectionPlanDto>(parm);