RIZO/shgx_tz_mom
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

设备管理BUG修复

Browse Source
This commit is contained in:
quowingwang 2025-12-12 10:08:26 +08:00
parent d4228b34cd
commit 9f620c70c1
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/Device/DeviceInspectController.cs
View File

@ -16,8 +16,8 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 设备检查项 /// 设备检查项
/// </summary> /// </summary>
[Verify]
[Route("mes/deviceManagement/DeviceInspect")] [Route("mes/deviceManagement/DeviceInspect")]
[AllowAnonymous]
public class DeviceInspectController : BaseController public class DeviceInspectController : BaseController
{ {
/// <summary> /// <summary>

2
ZR.Admin.WebApi/Controllers/mes/Device/DeviceRouteInspectionPlanController.cs
View File

@ -12,8 +12,8 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 巡检计划 /// 巡检计划
/// </summary> /// </summary>
[Verify]
[Route("mes/deviceManagement/DeviceRouteInspectionPlan")] [Route("mes/deviceManagement/DeviceRouteInspectionPlan")]
[AllowAnonymous]
public class DeviceRouteInspectionPlanController : BaseController public class DeviceRouteInspectionPlanController : BaseController
{ {
/// <summary> /// <summary>

1
ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
View File

@ -52,6 +52,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Controllers\mes\andon\" /> <Folder Include="Controllers\mes\andon\" />
<Folder Include="Properties\PublishProfiles\" /> <Folder Include="Properties\PublishProfiles\" />
<Folder Include="wwwroot\2025\1212\" />
<Folder Include="wwwroot\export\" /> <Folder Include="wwwroot\export\" />
<Folder Include="wwwroot\Generatecode\" /> <Folder Include="wwwroot\Generatecode\" />
<Folder Include="wwwroot\workorder\" /> <Folder Include="wwwroot\workorder\" />

2
ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs
View File

@ -14,6 +14,8 @@ namespace ZR.Model.MES.dev.Dto
public DateTime? LifeCycleEnd { get; set; } public DateTime? LifeCycleEnd { get; set; }
public int? ExcuteCycleType { get; set; } public int? ExcuteCycleType { get; set; }
public int? InnerType { get; set; } public int? InnerType { get; set; }
public int? Status { get; set; }
} }
/// <summary> /// <summary>

4
ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs
View File

@ -32,8 +32,8 @@ namespace ZR.Service.MES.dev
.AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart) .AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart)
.AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd) .AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd)
.AndIF(parm.ExcuteCycleType > 0, it => it.ExcuteCycleType == parm.ExcuteCycleType) .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() var response = Queryable()
.Where(predicate.ToExpression()) .Where(predicate.ToExpression())
.ToPage<DeviceRouteInspectionPlan, DeviceRouteInspectionPlanDto>(parm); .ToPage<DeviceRouteInspectionPlan, DeviceRouteInspectionPlanDto>(parm);