From aa3bf64bdd8c7d6ed00ae1c49ea8a227c754887d Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Tue, 20 Jan 2026 15:26:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=B7=A5=E8=89=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlcProductionDataController.cs            | 13 ++++
 .../PLC/Model/Dto/PlcProductionDataDto.cs     |  7 ++
 .../IService/IPlcProductionDataService.cs     |  2 +
 .../PLC/Service/PlcProductionDataService.cs   | 74 +++++++++++++++++++
 4 files changed, 96 insertions(+)

diff --git a/RIZO.Admin.WebApi/PLC/Controllers/PlcProductionDataController.cs b/RIZO.Admin.WebApi/PLC/Controllers/PlcProductionDataController.cs
index 319df6a..b05334d 100644
--- a/RIZO.Admin.WebApi/PLC/Controllers/PlcProductionDataController.cs
+++ b/RIZO.Admin.WebApi/PLC/Controllers/PlcProductionDataController.cs
@@ -95,5 +95,18 @@ namespace RIZO.Admin.WebApi.PLC.Controllers
             return ToResponse(_PlcProductionDataService.Delete(idArr));
         }
 
+        /// <summary>
+        /// 查询产线PLC生产工艺参数
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("getProcessParameter")]
+        [ActionPermissionFilter(Permission = "plcproductiondata:list")]
+        public IActionResult GetProcessParameter([FromQuery] PlcProductionDataQueryDto parm)
+        {
+            var response = _PlcProductionDataService.GetProcessParameter(parm);
+            return SUCCESS(response);
+        }
+
     }
 }
\ No newline at end of file
diff --git a/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs b/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
index f8e9813..6c3d387 100644
--- a/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
+++ b/RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
@@ -9,6 +9,13 @@ namespace RIZO.Admin.WebApi.PLC.Model.Dto
     /// </summary>
     public class PlcProductionDataQueryDto : PagerInfo 
     {
+        public DateTime? startTime { get; set; }
+        public DateTime? endTime { get; set; }
+        public string? ProductCode { get; set; }
+        public string? ProductName { get; set; }
+        public string? PartCode { get; set; }
+        public string? PartName { get; set; }
+        public string? ReworkFlag { get; set; }
     }
 
     /// <summary>
diff --git a/RIZO.Admin.WebApi/PLC/Service/IService/IPlcProductionDataService.cs b/RIZO.Admin.WebApi/PLC/Service/IService/IPlcProductionDataService.cs
index 42c2e2f..1f71b25 100644
--- a/RIZO.Admin.WebApi/PLC/Service/IService/IPlcProductionDataService.cs
+++ b/RIZO.Admin.WebApi/PLC/Service/IService/IPlcProductionDataService.cs
@@ -12,6 +12,8 @@ namespace RIZO.Admin.WebApi.PLC.Service.IService
     {
         PagedInfo<PlcProductionDataDto> GetList(PlcProductionDataQueryDto parm);
 
+        PagedInfo<PlcProductionDataDto> GetProcessParameter(PlcProductionDataQueryDto parm);
+
         PlcProductionData GetInfo(int Id);
 
 
diff --git a/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs b/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
index 4e60339..3026bf8 100644
--- a/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
+++ b/RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
@@ -24,7 +24,81 @@ namespace RIZO.Admin.WebApi.PLC.Service
         public PagedInfo<PlcProductionDataDto> GetList(PlcProductionDataQueryDto parm)
         {
             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.PartName))
+            {
+                predicate = predicate.And(x => x.PartName == parm.PartName);
+            }
+            if (!string.IsNullOrEmpty(parm.PartCode))
+            {
+                predicate = predicate.And(x => x.PartCode == parm.PartCode);
+            }
+            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())
+                .ToPage<PlcProductionData, PlcProductionDataDto>(parm);
 
+            return response;
+        }
+
+        /// <summary>
+        /// 查询产线PLC生产工艺参数
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<PlcProductionDataDto> GetProcessParameter(PlcProductionDataQueryDto parm)
+        {
+            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.PartName))
+            {
+                predicate = predicate.And(x => x.PartName == parm.PartName);
+            }
+            if (!string.IsNullOrEmpty(parm.PartCode))
+            {
+                predicate = predicate.And(x => x.PartCode == parm.PartCode);
+            }
+            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())
                 .ToPage<PlcProductionData, PlcProductionDataDto>(parm);