diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs index fc0f5f2..587bcd0 100644 --- a/MDM/Controllers/Process/ProcessOperationController.cs +++ b/MDM/Controllers/Process/ProcessOperationController.cs @@ -182,9 +182,9 @@ namespace MDM.Controllers.Process //TODO 工序修改流程 [HttpPost("operation_update_flow")] - public IActionResult OperationUpdateFlow([FromBody] ProcessOperationCollectParameter parm) + public IActionResult OperationUpdateFlow([FromBody] ProcessOperationFlowDto2 model) { - var response = _ProcessOperationService.OperationUpdateFlow(parm); + var response = _ProcessOperationService.OperationUpdateFlow(model); return ToResponse(response); } diff --git a/MDM/Models/Process/Dto/ProcessOperationCollectParameterDto.cs b/MDM/Models/Process/Dto/ProcessOperationCollectParameterDto.cs index 53b967e..c85c3b7 100644 --- a/MDM/Models/Process/Dto/ProcessOperationCollectParameterDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationCollectParameterDto.cs @@ -19,6 +19,7 @@ namespace MDM.Model.Process.Dto public string ParameterName { get; set; } } + /// /// 工艺参数表(如温度、压力、时间等,关联工艺路线与工序)输入输出对象 /// @@ -96,13 +97,13 @@ namespace MDM.Model.Process.Dto /// 是否为控制参数:1=是(如PID控制),0=否(仅采集) /// - public int IsControlled { get; set; } + public int IsControlled { get; set; } /// /// 是否为监控参数(是否采集/显示):1=是,0=否 /// - public int IsMonitored { get; set; } + public int IsMonitored { get; set; } /// /// 控制类型(如PID、ON/OFF、手动设定等,可选) @@ -119,7 +120,7 @@ namespace MDM.Model.Process.Dto /// /// 是否必填/必采:1=是,0=否 /// - public int IsRequired { get; set; } + public int IsRequired { get; set; } /// /// 参数排序(用于UI展示顺序) diff --git a/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs b/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs index 3214a0e..c7b98b1 100644 --- a/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs +++ b/MDM/Models/Process/Dto/ProcessOperationFlowDto.cs @@ -9,21 +9,36 @@ namespace MDM.Models.Process.Dto /// /// 工序管理流程Dto /// - public class ProcessOperationFlowDto + public class ProcessOperationFlowDto { - - + + public string FkRoutingCode { get; set; } - + public string FkOperationCode { get; set; } public string FlowCode { get; set; } - + public string FlowTypeCode { get; set; } public string FlowTypeName { get; set; } } + + public class ProcessOperationFlowDto2 + { + + public int id { get; set; } + + /// + /// 流程code + /// + public string FlowCode { get; set; } + + + public string FlowTypeCode { get; set; } + public string FlowTypeName { get; set; } + } } diff --git a/MDM/Services/Process/IService/IProcessOperationService.cs b/MDM/Services/Process/IService/IProcessOperationService.cs index 7a67be2..3348ce8 100644 --- a/MDM/Services/Process/IService/IProcessOperationService.cs +++ b/MDM/Services/Process/IService/IProcessOperationService.cs @@ -46,7 +46,7 @@ namespace MDM.Services.IProcessService List GetOperationFlowList(string routing_code, string operation_code); int OperationAddDatacollection(ProcessOperationCollectParameterDto parm); - int OperationUpdateFlow(ProcessOperationCollectParameter model); + int OperationUpdateFlow(ProcessOperationFlowDto2 model); diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 620dfc8..db915e0 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -253,11 +253,21 @@ namespace MDM.Services.Process return response; } - public int OperationUpdateFlow(ProcessOperationCollectParameter model) + public int OperationUpdateFlow(ProcessOperationFlowDto2 model) { - - model.UpdatedTime = DateTime.Now; - var response = Context.Updateable(model).ExecuteCommand(); + + var response = Context.Updateable() + .SetColumns(it=>new ProcessOperationFlow + { + + FlowCode = model.FlowCode, + FlowTypeCode=model.FlowTypeCode, + FlowTypeName=model.FlowTypeName, + UpdatedTime = DateTime.Now, + + } ) + .Where(it => it.id == model.id) + .ExecuteCommand(); return response; }