From 93f27b6bfdb1c510776ebeed02645bb785bfb02f Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Sat, 31 Jan 2026 10:07:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=8F=82=E6=95=B0=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PLC/Model/Dto/PlcProductionDataDto.cs     |  9 ++++
 .../PLC/Service/PlcProductionDataService.cs   | 48 +++++++++++--------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs b/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
index 74a975b..201fec8 100644
--- a/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
+++ b/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
@@ -10,6 +10,15 @@ namespace RIZO.Admin.WebApi.PLC.Model.Dto
     /// </summary>
     public class PlcProductionDataQueryDto : PagerInfo
     {
+        public string? ProductCode { get; set; }
+        public string? ProductName { get; set; }
+        public string? ProduceModel { get; set; }
+        public string? WorkstationCode { get; set; }
+        
+        public string? ReworkFlag { get; set; }
+        public DateTime? startTime { get; set; }
+        public DateTime? endTime { get; set; }
+
     }
 
     /// <summary>
diff --git a/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs b/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
index 1cb6566..b8fcb3c 100644
--- a/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
+++ b/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
@@ -25,26 +25,34 @@ namespace RIZO.Admin.WebApi.PLC.Service
         {
             var predicate = QueryExp(parm);
             #region
-            //if (!string.IsNullOrEmpty(parm.ProductName))
-            //{
-            //    predicate = predicate.And(x => x.ProductName == parm.ProductName);
-            //}
-            //if (!string.IsNullOrEmpty(parm.ProductCode))
-            //{
-            //    predicate = predicate.And(x => x.ProductCode == parm.ProductCode);
-            //}
-            //if (!string.IsNullOrEmpty(parm.ReworkFlag))
-            //{
-            //    predicate = predicate.And(x => x.ReworkFlag == parm.ReworkFlag);
-            //}
-            //if (parm.startTime != null && parm.startTime > DateTime.MinValue)
-            //{
-            //    predicate = predicate.And(x => x.CreatedTime >= parm.startTime);
-            //}
-            //if (parm.endTime != null && parm.endTime > DateTime.MinValue)
-            //{
-            //    predicate = predicate.And(x => x.CreatedTime <= parm.endTime);
-            //}
+            if (!string.IsNullOrEmpty(parm.ProductName))
+            {
+                predicate = predicate.And(x => x.ProductName == parm.ProductName);
+            }
+            if (!string.IsNullOrEmpty(parm.ProductCode))
+            {
+                predicate = predicate.And(x => x.ProductCode == parm.ProductCode);
+            }
+            if (!string.IsNullOrEmpty(parm.ProduceModel))
+            {
+                predicate = predicate.And(x => x.ProduceModel == parm.ProduceModel);
+            }
+            if (!string.IsNullOrEmpty(parm.WorkstationCode))
+            {
+                predicate = predicate.And(x => x.WorkstationCode == parm.WorkstationCode);
+            }
+            if (!string.IsNullOrEmpty(parm.ReworkFlag))
+            {
+                predicate = predicate.And(x => x.ReworkFlag == parm.ReworkFlag);
+            }
+            if (parm.startTime != null && parm.startTime > DateTime.MinValue)
+            {
+                predicate = predicate.And(x => x.CreatedTime >= parm.startTime);
+            }
+            if (parm.endTime != null && parm.endTime > DateTime.MinValue)
+            {
+                predicate = predicate.And(x => x.CreatedTime <= parm.endTime);
+            }
             #endregion
             var response = Queryable()
                 .Where(predicate.ToExpression())