From 646ee1e7eab7604d4884e7c19259b72d4202db88 Mon Sep 17 00:00:00 2001
From: gcw_MV9p2JJN <gcw_MV9p2JJN@noreply.gitcode.com>
Date: Wed, 31 Dec 2025 15:16:17 +0800
Subject: [PATCH] 1

---
 MDM/Controllers/Process/ProcessOperationController.cs  | 7 ++++++-
 MDM/Models/Process/Dto/ProcessOperationFlowDto.cs      | 7 +++++--
 MDM/Models/Process/ProcessOperationCollectParameter.cs | 8 ++++++++
 MDM/Models/Process/ProcessOperationFlow.cs             | 5 +++--
 MDM/Services/Process/ProcessOperationService.cs        | 1 +
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs
index 29b7beb..51f4e32 100644
--- a/MDM/Controllers/Process/ProcessOperationController.cs
+++ b/MDM/Controllers/Process/ProcessOperationController.cs
@@ -172,13 +172,18 @@ namespace MDM.Controllers.Process
         }
 
         //TODO 工序删除流程
-        [HttpDelete("operation_delete_flow")]
+        [HttpDelete("operation_delete_flow/{operation_flow_id}")]
         public IActionResult OperationDeleteFlow(int operation_flow_id)
         {
             var response = _ProcessOperationService.OperationDeleteFlow(operation_flow_id);
             return ToResponse(response);
         }
 
+        //TODO 新增工艺参数数采
+        //[HttpPost("operation_add_datacollection")]
+        //public IActionResult Operation
+
+
 
     }
 }
\ No newline at end of file
diff --git a/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs b/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs
index ad3a519..6002d3a 100644
--- a/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs
+++ b/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs
@@ -18,10 +18,13 @@ namespace MDM.Models.Process.Dto
         public string FkOperationCode { get; set; }
 
         public string FlowCode { get; set; }
-   
+
+     
+
+
         public string FlowName { get; set; }
 
-
+        public int FlowId { get; set; }
 
     }
 }
diff --git a/MDM/Models/Process/ProcessOperationCollectParameter.cs b/MDM/Models/Process/ProcessOperationCollectParameter.cs
index 671cfdd..408a70b 100644
--- a/MDM/Models/Process/ProcessOperationCollectParameter.cs
+++ b/MDM/Models/Process/ProcessOperationCollectParameter.cs
@@ -25,6 +25,14 @@ namespace MDM.Model.Process
         [SugarColumn(ColumnName = "fk_operation_code")]
         public string FkOperationCode { get; set; }
 
+
+        /// <summary>
+        /// 所属流程code 
+        /// </summary>
+        [SugarColumn(ColumnName = "fk_flow_code")]
+        public string FkFlowCode { get; set; }
+        
+
         /// <summary>
         /// 参数名称，如：温度、压力、时间 
         /// </summary>
diff --git a/MDM/Models/Process/ProcessOperationFlow.cs b/MDM/Models/Process/ProcessOperationFlow.cs
index 0d60e3a..1b99bae 100644
--- a/MDM/Models/Process/ProcessOperationFlow.cs
+++ b/MDM/Models/Process/ProcessOperationFlow.cs
@@ -15,8 +15,7 @@ namespace MDM.Models.Process
         [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnName = "id")]
         public int id { get; set; }
 
-       
-        
+          
         [SugarColumn(ColumnName = "fk_routing_code")]
         public string FkRoutingCode { get; set; }
 
@@ -38,6 +37,8 @@ namespace MDM.Models.Process
         public string FlowName { get; set; }
 
 
+        [SugarColumn(ColumnName = "flow_id") ]
+        public int FlowId { get; set; }
 
 
         [SugarColumn(ColumnName = "created_time")]
diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs
index c7c8c1a..e8aaaf4 100644
--- a/MDM/Services/Process/ProcessOperationService.cs
+++ b/MDM/Services/Process/ProcessOperationService.cs
@@ -248,6 +248,7 @@ namespace MDM.Services.Process
         public int OperationAddFlow(ProcessOperationFlowDto parm)
         {
             var model = parm.Adapt<ProcessOperationFlowDto, ProcessOperationFlow>();
+           
             model.CreatedTime = DateTime.Now;
             var response = Context.Insertable<ProcessOperationFlow>(model).ExecuteCommand();
             return response;