diff --git a/DOAN.Model/MES/Device/Dto/DeviceTaskExecuteDto.cs b/DOAN.Model/MES/Device/Dto/DeviceTaskExecuteDto.cs index 7c870f1..edb80c3 100644 --- a/DOAN.Model/MES/Device/Dto/DeviceTaskExecuteDto.cs +++ b/DOAN.Model/MES/Device/Dto/DeviceTaskExecuteDto.cs @@ -157,9 +157,6 @@ namespace DOAN.Model.MES.dev.Dto [ExcelColumnName("更新时间")] public DateTime? UpdatedTime { get; set; } - [ExcelColumn(Name = "保养或检查")] - [ExcelColumnName("保养或检查")] - public int InnerType { get; set; } } } diff --git a/DOAN.Service/MES/Device/DeviceTaskExecuteService.cs b/DOAN.Service/MES/Device/DeviceTaskExecuteService.cs index 0dc93d7..d4749ac 100644 --- a/DOAN.Service/MES/Device/DeviceTaskExecuteService.cs +++ b/DOAN.Service/MES/Device/DeviceTaskExecuteService.cs @@ -70,16 +70,7 @@ namespace DOAN.Service.MES.dev } int InnerType=0; - if (item.Type==1) - { - InnerType = Context.Queryable().Where(it => it.Id == item.PlanId) - .Select(it => it.InnerType??0).First(); - }else if (item.Type==2) - { - InnerType = Context.Queryable().Where(it => it.Id == item.PlanId) - .Select(it => it.InnerType ?? 0).First(); - } - item.InnerType = InnerType; + }