This commit is contained in:
gcw_MV9p2JJN 2025-11-19 14:56:43 +08:00
parent a293df3710
commit 0338379eef
4 changed files with 73 additions and 2 deletions

View File

@ -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 控制策略字典查询
/// <summary>
/// 控制策略字典查询
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("search_controlstrategy_dict")]
public IActionResult SearchControlstrategyDict([FromQuery] ProcessControlStrategyDictQueryDto parm)
{
var response = _ProcessOperationService.SearchControlstrategyDict(parm);
return SUCCESS(response);
}
//TODO 工序流转字典
/// <summary>
/// 工序流转字典
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("search_OprerationTransitionDict")]
public IActionResult QueryProcessOprerationTransitionDict([FromQuery] ProcessOprerationTransitionDictQueryDto parm)
{
var response = _ProcessOperationService.QueryProcessOprerationTransitionDict(parm);
return SUCCESS(response);
}
}

View File

@ -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<ProcessControlStrategyDictDto> SearchControlstrategyDict(ProcessControlStrategyDictQueryDto parm);
List<ProcessOprerationTransitionDict> QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm);
}
}

View File

@ -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<ProcessControlStrategyDictDto> SearchControlstrategyDict(ProcessControlStrategyDictQueryDto parm)
{
var predicate = Expressionable.Create<ProcessControlStrategyDict>()
.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<ProcessControlStrategyDict>()
.Where(predicate.ToExpression())
.ToList()
.Adapt<List<ProcessControlStrategyDict>, List<ProcessControlStrategyDictDto>>();
return response;
}
public List<ProcessOprerationTransitionDict> QueryProcessOprerationTransitionDict(ProcessOprerationTransitionDictQueryDto parm)
{
var predicate = Expressionable.Create<ProcessOprerationTransitionDict>()
.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<ProcessOprerationTransitionDict>()
.Where(predicate.ToExpression())
.ToList();
return response;
}
}
}

View File

@ -28,8 +28,6 @@ namespace MDM.Services.Process
.AndIF(!string.IsNullOrEmpty(parm.ToOperationCode), m => m.ToOperationCode.Contains(parm.ToOperationCode))
;
var response = Queryable()