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
///
/// 设备检查项
///
- [Verify]
[Route("mes/deviceManagement/DeviceInspect")]
+ [AllowAnonymous]
public class DeviceInspectController : BaseController
{
///
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
///
/// 巡检计划
///
- [Verify]
[Route("mes/deviceManagement/DeviceRouteInspectionPlan")]
+ [AllowAnonymous]
public class DeviceRouteInspectionPlanController : BaseController
{
///
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 @@
+
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; }
}
///
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(parm);