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; }
+
+ ///
+ /// 所属流程code
+ ///
+ [SugarColumn(ColumnName = "fk_flow_code")]
+ public string FkFlowCode { get; set; }
+
+
///
/// 参数名称,如:温度、压力、时间
///
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();
+
model.CreatedTime = DateTime.Now;
var response = Context.Insertable(model).ExecuteCommand();
return response;