From 265c3cc8aa2f4e2e8c09a60c490f249b04c1e32f Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 3 Jul 2024 19:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs | 1 + DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs | 3 ++- DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs | 3 ++- DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs index 3956e86..943d5dd 100644 --- a/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs +++ b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs @@ -11,6 +11,7 @@ namespace DOAN.Model.MES.dev.Dto public int? Status { get; set; } public DateTime? Starttime { get; set; } public DateTime? Endtime { get; set; } + public int? InnerType { get; set; } } /// diff --git a/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs index d9e5f4a..d09f75d 100644 --- a/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs @@ -11,7 +11,8 @@ namespace DOAN.Model.MES.dev.Dto public DateTime? LifeCycleStart { get; set; } public DateTime? LifeCycleEnd { get; set; } - public int? Type { get; set; } + public int? ExcuteCycleType { get; set; } + public int? InnerType { get; set; } } /// diff --git a/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs b/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs index fa09e2c..5b22143 100644 --- a/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/DevicePointInspectionPlanService.cs @@ -30,7 +30,8 @@ namespace DOAN.Service.MES.dev .AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name)) .AndIF(parm.Status > 0, it => it.Status == parm.Status) .AndIF(parm.Starttime != null, it => it.CreatedTime >= parm.Starttime) - .AndIF(parm.Endtime != null, it => it.CreatedTime <= parm.Endtime); + .AndIF(parm.Endtime != null, it => it.CreatedTime <= parm.Endtime) + .AndIF(parm.InnerType > 0, it => it.InnerType == parm.InnerType); var response = Queryable() diff --git a/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs index d6c00a4..2fd9a3a 100644 --- a/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs +++ b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs @@ -31,7 +31,8 @@ namespace DOAN.Service.MES.dev predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name)) .AndIF(parm.LifeCycleStart != null, it => it.LifeCycleStart >= parm.LifeCycleStart) .AndIF(parm.LifeCycleEnd != null, it => it.LifeCycleEnd <= parm.LifeCycleEnd) - .AndIF(parm.Type != 0, it => it.ExcuteCycleType == parm.Type); + .AndIF(parm.ExcuteCycleType > 0, it => it.ExcuteCycleType == parm.ExcuteCycleType) + .AndIF(parm.InnerType>0, it => it.InnerType == parm.InnerType); var response = Queryable() .Where(predicate.ToExpression())