diff --git a/ZR.Model/MES/dev/DeviceInspect.cs b/ZR.Model/MES/dev/DeviceInspect.cs
index 3276c95..1d998e4 100644
--- a/ZR.Model/MES/dev/DeviceInspect.cs
+++ b/ZR.Model/MES/dev/DeviceInspect.cs
@@ -20,10 +20,6 @@ namespace ZR.Model.MES.dev
///
public string Image { get; set; }
- ///
- /// 检查顺序
- ///
- public int? Sort { get; set; }
///
/// 检查项类型(重点)
@@ -38,7 +34,7 @@ namespace ZR.Model.MES.dev
///
/// 检查项状态
///
- public string Status { get; set; }
+ public int Status { get; set; }
///
/// 描述
diff --git a/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs b/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs
index 925c051..bce6aa1 100644
--- a/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs
+++ b/ZR.Model/MES/dev/Dto/DeviceInspectDto.cs
@@ -7,6 +7,10 @@ namespace ZR.Model.MES.dev
///
public class DeviceInspectQueryDto : PagerInfo
{
+
+ public string Name { get; set; }
+
+ public int Status { get; set; }
}
///
@@ -16,18 +20,13 @@ namespace ZR.Model.MES.dev
{
[Required(ErrorMessage = "id不能为空")]
public int Id { get; set; }
-
-
-
public string Image { get; set; }
- public int? Sort { get; set; }
-
public string Type { get; set; }
public string Remark { get; set; }
- public string Status { get; set; }
+ public int Status { get; set; }
public string Descride { get; set; }
diff --git a/ZR.Service/MES/dev/DeviceInspectService.cs b/ZR.Service/MES/dev/DeviceInspectService.cs
index 651c0d6..48706cc 100644
--- a/ZR.Service/MES/dev/DeviceInspectService.cs
+++ b/ZR.Service/MES/dev/DeviceInspectService.cs
@@ -28,6 +28,9 @@ namespace ZR.Service.MES.dev
{
var predicate = Expressionable.Create();
+ predicate.AndIF(!string.IsNullOrEmpty(parm.Name), it => it.Name.Contains(parm.Name))
+ .AndIF(parm.Status >= 0, it => it.Status == parm.Status);
+
var response = Queryable()
.Where(predicate.ToExpression())
.ToPage(parm);