diff --git a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceTaskExecuteController.cs b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceTaskExecuteController.cs index 67a6c8e3..3cd9cc3d 100644 --- a/ZR.Admin.WebApi/Controllers/mes/Device/DeviceTaskExecuteController.cs +++ b/ZR.Admin.WebApi/Controllers/mes/Device/DeviceTaskExecuteController.cs @@ -16,7 +16,7 @@ namespace ZR.Admin.WebApi.Controllers /// /// 任务执行 /// - [Verify] + [AllowAnonymous] [Route("mes/deviceManagement/DeviceTaskExecute")] public class DeviceTaskExecuteController : BaseController { diff --git a/ZR.Admin.WebApi/wwwroot/2025/1213/683ED166240E0376.doc b/ZR.Admin.WebApi/wwwroot/2025/1213/683ED166240E0376.doc new file mode 100644 index 00000000..414e5216 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/2025/1213/683ED166240E0376.doc differ diff --git a/ZR.Admin.WebApi/wwwroot/2025/1213/713970FA2C5FC047.png b/ZR.Admin.WebApi/wwwroot/2025/1213/713970FA2C5FC047.png new file mode 100644 index 00000000..cbe77cde Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/2025/1213/713970FA2C5FC047.png differ diff --git a/ZR.Admin.WebApi/wwwroot/2025/1213/C3C0CAB9E344117A.png b/ZR.Admin.WebApi/wwwroot/2025/1213/C3C0CAB9E344117A.png new file mode 100644 index 00000000..cbe77cde Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/2025/1213/C3C0CAB9E344117A.png differ diff --git a/ZR.Admin.WebApi/wwwroot/2025/1213/CA0C45FE7B22B855.png b/ZR.Admin.WebApi/wwwroot/2025/1213/CA0C45FE7B22B855.png new file mode 100644 index 00000000..cbe77cde Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/2025/1213/CA0C45FE7B22B855.png differ diff --git a/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-132951.xlsx b/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-132951.xlsx new file mode 100644 index 00000000..04f63e7d Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-132951.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-133005.xlsx b/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-133005.xlsx new file mode 100644 index 00000000..bf67c744 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/任务执行12-13-133005.xlsx differ diff --git a/ZR.Model/MES/Device/Dto/DeviceInspectDto.cs b/ZR.Model/MES/Device/Dto/DeviceInspectDto.cs index 1e89ea1c..61c009cf 100644 --- a/ZR.Model/MES/Device/Dto/DeviceInspectDto.cs +++ b/ZR.Model/MES/Device/Dto/DeviceInspectDto.cs @@ -48,7 +48,7 @@ namespace ZR.Model.MES.dev.Dto public class DeviceInspectDto { // [Required(ErrorMessage = "id不能为空")] - public int Id { get; set; } + public int? Id { get; set; } public string Image { get; set; } public int? Type { get; set; } diff --git a/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs b/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs index cd21bd07..0688da9d 100644 --- a/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs +++ b/ZR.Service/mes/Device/DeviceRouteInspectionPlanService.cs @@ -33,7 +33,7 @@ namespace ZR.Service.MES.dev .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.Status != null, it => it.Status == parm.Status); + .AndIF((parm.Status != null && parm.Status >= 0), it => it.Status == parm.Status); var response = Queryable() .Where(predicate.ToExpression()) .ToPage(parm);