From 2af3d5b8ea07ca83fd17d7f572f9b3e912d58165 Mon Sep 17 00:00:00 2001
From: quowingwang <guoqingwang.ruizhiao>
Date: Fri, 5 Dec 2025 17:31:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E6=96=B9=E5=8F=82=E6=95=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs   |  2 ++
 DOAN.Service/MES/recipe/PfRecipeParametersService.cs | 12 +++++++++++-
 DOAN.Service/MES/recipe/PfRecipeVersionService.cs    |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs b/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs
index 0c587a2..5450b61 100644
--- a/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs
+++ b/DOAN.Model/MES/recipe/Dto/PfRecipeParametersDto.cs
@@ -8,6 +8,8 @@ namespace DOAN.Model.MES.recipe.Dto
     /// </summary>
     public class PfRecipeParametersQueryDto : PagerInfo 
     {
+        public string RecipeCode { get; set; }
+        public string Version { get; set; }
     }
 
     /// <summary>
diff --git a/DOAN.Service/MES/recipe/PfRecipeParametersService.cs b/DOAN.Service/MES/recipe/PfRecipeParametersService.cs
index 3d7eaf8..40b871a 100644
--- a/DOAN.Service/MES/recipe/PfRecipeParametersService.cs
+++ b/DOAN.Service/MES/recipe/PfRecipeParametersService.cs
@@ -73,7 +73,17 @@ namespace DOAN.Service.MES.recipe
         private static Expressionable<PfRecipeParameters> QueryExp(PfRecipeParametersQueryDto parm)
         {
             var predicate = Expressionable.Create<PfRecipeParameters>();
-
+            if (parm != null)
+            {
+                if (!string.IsNullOrEmpty(parm.RecipeCode))
+                { 
+                    predicate = predicate.And(it => it.RecipeCode == parm.RecipeCode);
+                }
+                if (!string.IsNullOrEmpty(parm.Version))
+                {
+                    predicate = predicate.And(it => it.Version == parm.Version);
+                }
+            }
             return predicate;
         }
     }
diff --git a/DOAN.Service/MES/recipe/PfRecipeVersionService.cs b/DOAN.Service/MES/recipe/PfRecipeVersionService.cs
index 194112b..4336769 100644
--- a/DOAN.Service/MES/recipe/PfRecipeVersionService.cs
+++ b/DOAN.Service/MES/recipe/PfRecipeVersionService.cs
@@ -15,6 +15,7 @@ namespace DOAN.Service.MES.recipe
     public class PfRecipeVersionService : BaseService<PfRecipeVersion>, IPfRecipeVersionService
     {
         private readonly PfRefProductRecipeService pfRefProductRecipeService = new PfRefProductRecipeService();
+        private readonly PfRecipeParametersService pfRecipeParametersService = new PfRecipeParametersService();
         /// <summary>
         /// 查询配方版本控制表列表
         /// </summary>