From 3c07442a4e9796471b68f3eeac4d6e0a7b1560b4 Mon Sep 17 00:00:00 2001
From: gcw_MV9p2JJN <gcw_MV9p2JJN@noreply.gitcode.com>
Date: Wed, 31 Dec 2025 20:26:36 +0800
Subject: [PATCH] 1

---
 .../Process/ProcessOperationController.cs     |  2 +-
 .../Process/ProcessOperationService.cs        |  8 ++---
 ...ocessOperationWorkstationMappingService.cs | 32 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs
index 7f3bc71..34eb69c 100644
--- a/MDM/Controllers/Process/ProcessOperationController.cs
+++ b/MDM/Controllers/Process/ProcessOperationController.cs
@@ -253,7 +253,7 @@ namespace MDM.Controllers.Process
 
 
         //TODO 分页查询配方参数
-
+        [HttpPost("operation_search_recipe")]
         public IActionResult QueryProcessOperationRecipe([FromQuery] ProcessOperationQuery2Dto query)
         {
             var response = _ProcessOperationService.QueryProcessOperationRecipe(query);
diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs
index bde9762..4be54df 100644
--- a/MDM/Services/Process/ProcessOperationService.cs
+++ b/MDM/Services/Process/ProcessOperationService.cs
@@ -121,15 +121,15 @@ namespace MDM.Services.Process
                   //    StandardValue = param.StandardValue,
                   //    Remark = param.Remark
                   //}),
+                
                   ////绑定的采集参数
-                  ProcessOperationCollectParameters= SqlFunc.Subqueryable<ProcessOperationCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
+                  ProcessOperationCollectParameters = SqlFunc.Subqueryable<ProcessOperationCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
 
                   // 绑定的物料参数
-                  ProcessOperationFlowMaterialParamters= SqlFunc.Subqueryable<ProcessOperationFlowMaterialParamter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
+                  ProcessOperationFlowMaterialParamters = SqlFunc.Subqueryable<ProcessOperationFlowMaterialParamter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.OperationCode).ToList(),
 
 
-              })
-                .First();
+              }).First();
           
 
             return response;
diff --git a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs
index 5daff3a..5e397bf 100644
--- a/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs
+++ b/MDM/Services/Process/ProcessOperationWorkstationMappingService.cs
@@ -72,22 +72,22 @@ namespace MDM.Services.Process
                  OperationFlows = SqlFunc.Subqueryable<ProcessOperationFlow>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode).ToList(),
 
                  ////绑定的配方参数信息
-                 OperationRecipeParameters = SqlFunc.Subqueryable<PfRefProductRecipe>()
-                 .LeftJoin<PfRecipeVersion>((refpr, ver) => refpr.RecipeCode == ver.RecipeCode)
-                 .LeftJoin<PfRecipeParameters>((refpr, ver, param) => ver.RecipeCode == param.RecipeCode && ver.Version == param.Version)
-                 .Where((refpr, ver, param) => refpr.FkRoutingCode == it.FkRoutingCode && refpr.FkOperationCode == it.FkOperationCode)
-                 .ToList((refpr, ver, param) => new PfRecipeParametersDto
-                 {
-                     Id = param.Id,
-                     RecipeCode = param.RecipeCode,
-                     Version = param.Version,
-                     ParamName = param.ParamName,
-                     Unit = param.Unit,
-                     UpperLimit = param.UpperLimit,
-                     LowerLimit = param.LowerLimit,
-                     StandardValue = param.StandardValue,
-                     Remark = param.Remark
-                 }),
+                 //OperationRecipeParameters = SqlFunc.Subqueryable<PfRefProductRecipe>()
+                 //.LeftJoin<PfRecipeVersion>((refpr, ver) => refpr.RecipeCode == ver.RecipeCode)
+                 //.LeftJoin<PfRecipeParameters>((refpr, ver, param) => ver.RecipeCode == param.RecipeCode && ver.Version == param.Version)
+                 //.Where((refpr, ver, param) => refpr.FkRoutingCode == it.FkRoutingCode && refpr.FkOperationCode == it.FkOperationCode)
+                 //.ToList((refpr, ver, param) => new PfRecipeParametersDto
+                 //{
+                 //    Id = param.Id,
+                 //    RecipeCode = param.RecipeCode,
+                 //    Version = param.Version,
+                 //    ParamName = param.ParamName,
+                 //    Unit = param.Unit,
+                 //    UpperLimit = param.UpperLimit,
+                 //    LowerLimit = param.LowerLimit,
+                 //    StandardValue = param.StandardValue,
+                 //    Remark = param.Remark
+                 //}),
                  ////绑定的工序工位采集参数
                  ProcessOperationWorkstationCollectParameters = SqlFunc.Subqueryable<ProcessOperationWorkstationFlowCollectParameter>().Where(s => s.FkRoutingCode == it.FkRoutingCode && s.FkOperationCode == it.FkOperationCode&&s.FkProductlinebodyCode==it.FkProductlinebodyCode&&s.FkWorkstationCode==it.FkWorkstationCode).ToList(),