From fc23379f6c91c700e3dfb7bf554c06dde867fd58 Mon Sep 17 00:00:00 2001
From: gcw_MV9p2JJN <gcw_MV9p2JJN@noreply.gitcode.com>
Date: Mon, 17 Nov 2025 08:47:28 +0800
Subject: [PATCH] 1

---
 MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs   | 6 ++++++
 MES_Model/Services/Plant/PlantFactorySiteService.cs | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs b/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs
index d9906d8..add3d34 100644
--- a/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs
+++ b/MES_Model/Models/Plant/Dto/PlantFactorySiteDto.cs
@@ -7,6 +7,12 @@ namespace MDM.Model.Plant.Dto
     /// </summary>
     public class PlantFactorySiteQueryDto : PagerInfo 
     {
+        public string SiteCode { get; set; }
+
+        public string SiteName { get; set; }
+
+        public string SiteType { get; set; }
+        public int? Status { get; set; }
     }
 
     /// <summary>
diff --git a/MES_Model/Services/Plant/PlantFactorySiteService.cs b/MES_Model/Services/Plant/PlantFactorySiteService.cs
index 9d780d0..301a654 100644
--- a/MES_Model/Services/Plant/PlantFactorySiteService.cs
+++ b/MES_Model/Services/Plant/PlantFactorySiteService.cs
@@ -25,7 +25,12 @@ namespace MDM.Services.Plant
         /// <returns></returns>
         public PagedInfo<PlantFactorySiteDto> GetList(PlantFactorySiteQueryDto parm)
         {
-            var predicate = Expressionable.Create<PlantFactorySite>();
+            var predicate = Expressionable.Create<PlantFactorySite>()
+                .AndIF(!string.IsNullOrEmpty(parm.SiteCode), it => it.SiteCode.Contains(parm.SiteCode))
+                .AndIF(!string.IsNullOrEmpty(parm.SiteName), it => it.SiteCode.Contains(parm.SiteName))
+                .AndIF(!string.IsNullOrEmpty(parm.SiteType), it => it.SiteType == parm.SiteType)
+                .AndIF(parm.Status != null, it => it.Status == parm.Status)
+                ;
 
             var response = Queryable()
                 .Where(predicate.ToExpression())