diff --git a/MDM/Controllers/Process/ProcessOperationController.cs b/MDM/Controllers/Process/ProcessOperationController.cs index 4873057..6add7bc 100644 --- a/MDM/Controllers/Process/ProcessOperationController.cs +++ b/MDM/Controllers/Process/ProcessOperationController.cs @@ -12,6 +12,7 @@ using Infrastructure.Model; using MDM.Services.IProcessService; using MDM.Model.Process.Dto; using MDM.Model.Process; +using MDM.Services.Process; //创建时间:2025-11-15 @@ -112,6 +113,40 @@ namespace MDM.Controllers.Process } + //TODO 控制策略字典查询 + + + /// + /// 控制策略字典查询 + /// + /// + /// + [HttpGet("search_controlstrategy_dict")] + public IActionResult SearchControlstrategyDict([FromQuery] ProcessControlStrategyDictQueryDto parm) + { + var response = _ProcessOperationService.SearchControlstrategyDict(parm); + return SUCCESS(response); + } + + //TODO 工序流转字典 + + /// + /// 工序流转字典 + /// + /// + /// + [HttpGet("search_OprerationTransitionDict")] + + public IActionResult QueryProcessOprerationTransitionDict([FromQuery] ProcessOprerationTransitionDictQueryDto parm) + { + var response = _ProcessOperationService.QueryProcessOprerationTransitionDict(parm); + return SUCCESS(response); + } + + + + + } diff --git a/MDM/Services/Process/IService/IProcessOperationService.cs b/MDM/Services/Process/IService/IProcessOperationService.cs index 93ae357..4fb013c 100644 --- a/MDM/Services/Process/IService/IProcessOperationService.cs +++ b/MDM/Services/Process/IService/IProcessOperationService.cs @@ -1,9 +1,11 @@ +using Aliyun.OSS; using MDM.Model; using MDM.Model.Process; using MDM.Model.Process.Dto; using MDM.Service; +using Microsoft.AspNetCore.Mvc; namespace MDM.Services.IProcessService { @@ -20,5 +22,11 @@ namespace MDM.Services.IProcessService int UpdateProcessOperation(ProcessOperation parm); + List SearchControlstrategyDict(ProcessControlStrategyDictQueryDto parm); + + + List QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm); + + } } diff --git a/MDM/Services/Process/ProcessOperationService.cs b/MDM/Services/Process/ProcessOperationService.cs index 95a599f..4102fd2 100644 --- a/MDM/Services/Process/ProcessOperationService.cs +++ b/MDM/Services/Process/ProcessOperationService.cs @@ -1,5 +1,7 @@ +using Aliyun.OSS; using Infrastructure.Attribute; +using Mapster; using MDM.Model; using MDM.Model.Process; using MDM.Model.Process.Dto; @@ -94,5 +96,33 @@ namespace MDM.Services.Process return Update(model, true); } + public List SearchControlstrategyDict(ProcessControlStrategyDictQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.StrategyName), m => m.StrategyName.Contains(parm.StrategyName)) + .AndIF(!string.IsNullOrEmpty(parm.StrategyCode), m => m.StrategyCode.Contains(parm.StrategyCode)) + ; + var response = Context.Queryable() + .Where(predicate.ToExpression()) + .ToList() + .Adapt, List>(); + + + return response; + } + + public List QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm) + { + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.TranstionName), m => m.TranstionName.Contains(parm.TranstionName)) + .AndIF(!string.IsNullOrEmpty(parm.TransitionCode), m => m.TransitionCode.Contains(parm.TransitionCode)) + ; + var response = Context.Queryable() + .Where(predicate.ToExpression()) + .ToList(); + + return response; + } + } } \ No newline at end of file diff --git a/MDM/Services/Process/ProcessOperationTransitionService.cs b/MDM/Services/Process/ProcessOperationTransitionService.cs index d430482..ca2ef24 100644 --- a/MDM/Services/Process/ProcessOperationTransitionService.cs +++ b/MDM/Services/Process/ProcessOperationTransitionService.cs @@ -28,8 +28,6 @@ namespace MDM.Services.Process .AndIF(!string.IsNullOrEmpty(parm.ToOperationCode), m => m.ToOperationCode.Contains(parm.ToOperationCode)) - - ; var response = Queryable()