RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正巡检类型

Browse Source
This commit is contained in:
qianhao.xu 2024-07-03 19:12:05 +08:00
parent e364c12d53
commit e8beffd320
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DOAN.Model/MES/dev/DevicePointInspectionPlan.cs
View File

@ -30,9 +30,10 @@ namespace DOAN.Model.MES.dev
public int? Status { get; set; }
/// <summary>
/// 类型(内部)
/// 类型(内部) 1是检查 2是保养
/// </summary>
public int? Type { get; set; }
[SugarColumn(ColumnName = "inner_type")]
public int? InnerType { get; set; }
/// <summary>
/// 备注

5
DOAN.Model/MES/dev/DeviceRouteInspectionPlan.cs
View File

@ -26,9 +26,10 @@ namespace DOAN.Model.MES.dev
public int? Status { get; set; }
/// <summary>
/// 类型(内部)
/// 类型(内部) 1是检查 2是保养
/// </summary>
public int? Type { get; set; }
[SugarColumn(ColumnName = "inner_type")]
public int? InnerType { get; set; }
/// <summary>
/// 生命周期开始

2
DOAN.Model/MES/dev/Dto/DevicePointInspectionPlanDto.cs
View File

@ -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; }

3
DOAN.Model/MES/dev/Dto/DeviceRouteInspectionPlanDto.cs
View File

@ -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; }

4
DOAN.Service/MES/dev/DeviceRouteInspectionPlanService.cs
View File

@ -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,