From 339695dad044db043d7364cd3f476a09ca836233 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Tue, 21 May 2024 19:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=A3=80=E6=9F=A5=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Model/MES/dev/DeviceInspect.cs          |  6 +-----
 ZR.Model/MES/dev/Dto/DeviceInspectDto.cs   | 11 +++++------
 ZR.Service/MES/dev/DeviceInspectService.cs |  3 +++
 3 files changed, 9 insertions(+), 11 deletions(-)

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
         /// </summary>
         public string Image { get; set; }
 
-        /// <summary>
-        /// 检查顺序 
-        /// </summary>
-        public int? Sort { get; set; }
 
         /// <summary>
         /// 检查项类型（重点） 
@@ -38,7 +34,7 @@ namespace ZR.Model.MES.dev
         /// <summary>
         /// 检查项状态 
         /// </summary>
-        public string Status { get; set; }
+        public int Status { get; set; }
 
         /// <summary>
         /// 描述 
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
     /// </summary>
     public class DeviceInspectQueryDto : PagerInfo 
     {
+
+        public string Name { get; set; }
+
+        public int Status { get; set; }
     }
 
     /// <summary>
@@ -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<DeviceInspect>();
 
+            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<DeviceInspect, DeviceInspectDto>(parm);