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

设备管理

Browse Source
This commit is contained in:
quowingwang 2025-12-13 14:06:58 +08:00
parent 069498dbe4
commit 0bf0e4d0b6
9 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary> /// <summary>
/// 任务执行 /// 任务执行
/// </summary> /// </summary>
[Verify] [AllowAnonymous]
[Route("mes/deviceManagement/DeviceTaskExecute")] [Route("mes/deviceManagement/DeviceTaskExecute")]
public class DeviceTaskExecuteController : BaseController public class DeviceTaskExecuteController : BaseController
{ {

BIN
ZR.Admin.WebApi/wwwroot/2025/1213/683ED166240E0376.doc Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/2025/1213/713970FA2C5FC047.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 KiB

BIN
ZR.Admin.WebApi/wwwroot/2025/1213/C3C0CAB9E344117A.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 KiB

BIN
ZR.Admin.WebApi/wwwroot/2025/1213/CA0C45FE7B22B855.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 190 KiB

BIN
ZR.Admin.WebApi/wwwroot/export/任务执行12-13-132951.xlsx Normal file
View File

Binary file not shown.

BIN
ZR.Admin.WebApi/wwwroot/export/任务执行12-13-133005.xlsx Normal file
View File

Binary file not shown.

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

@ -48,7 +48,7 @@ namespace ZR.Model.MES.dev.Dto
public class DeviceInspectDto public class DeviceInspectDto
{ {
// [Required(ErrorMessage = "id不能为空")] // [Required(ErrorMessage = "id不能为空")]
public int Id { get; set; } public int? Id { get; set; }
public string Image { get; set; } public string Image { get; set; }
public int? Type { get; set; } public int? Type { get; set; }

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

@ -33,7 +33,7 @@ namespace ZR.Service.MES.dev
.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); .AndIF((parm.Status != null && parm.Status >= 0), 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);