diff --git a/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs b/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs
index 46c3c17..9772ab4 100644
--- a/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs
+++ b/DOAN.Model/MES/dev/DevicePointInspectionPlan.cs
@@ -30,9 +30,10 @@ namespace DOAN.Model.MES.dev
public int? Status { get; set; }
///
- /// 类型(内部)
+ /// 类型(内部) 1是检查 2是保养
///
- public int? Type { get; set; }
+ [SugarColumn(ColumnName = "inner_type")]
+ public int? InnerType { get; set; }
///
/// 备注
diff --git a/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs b/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs
index 13f543f..676daa9 100644
--- a/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs
+++ b/DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs
@@ -26,9 +26,10 @@ namespace DOAN.Model.MES.dev
public int? Status { get; set; }
///
- /// 类型(内部)
+ /// 类型(内部) 1是检查 2是保养
///
- public int? Type { get; set; }
+ [SugarColumn(ColumnName = "inner_type")]
+ public int? InnerType { get; set; }
///
/// 生命周期开始
diff --git a/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs
index 23dbebe..3956e86 100644
--- a/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs
+++ b/DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs
@@ -27,7 +27,7 @@ namespace DOAN.Model.MES.dev.Dto
public int? Status { get; set; }
- public int? Type { get; set; }
+ public int? InnerType { get; set; }
public string Remark { get; set; }
diff --git a/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
index 22cb298..d9e5f4a 100644
--- a/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
+++ b/DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
@@ -28,7 +28,8 @@ namespace DOAN.Model.MES.dev.Dto
public int? Status { get; set; }
- public int? Type { get; set; }
+
+ public int? InnerType { get; set; }
public DateTime? LifeCycleStart { get; set; }
diff --git a/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs
index a549407..d6c00a4 100644
--- a/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs
+++ b/DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs
@@ -31,7 +31,7 @@ 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.Type == parm.Type);
+ .AndIF(parm.Type != 0, it => it.ExcuteCycleType == parm.Type);
var response = Queryable()
.Where(predicate.ToExpression())
@@ -115,7 +115,7 @@ namespace DOAN.Service.MES.dev
{
Name = model.Name,
Status = model.Status,
- Type = model.Type,
+ InnerType = model.InnerType,
LifeCycleStart = model.LifeCycleStart,
LifeCycleEnd = model.LifeCycleEnd,
ExcuteCycleType = model.ExcuteCycleType,