From ac7f8802ba364e9e2b53874cca785416c28b341d Mon Sep 17 00:00:00 2001 From: gcw_MV9p2JJN Date: Tue, 18 Nov 2025 14:49:40 +0800 Subject: [PATCH] 1 --- .../Process/Dto/ProcessControlStrategyDictDto.cs | 3 +++ MES_Model/Models/Process/Dto/ProcessOperationDto.cs | 7 +++++++ .../Process/Dto/ProcessOperationReworkRuleDto.cs | 3 +++ .../Process/Dto/ProcessOperationTransitionDto.cs | 5 +++++ .../Process/Dto/ProcessOprerationTransitionDictDto.cs | 3 +++ MES_Model/Models/Process/Dto/ProcessRoutingDto.cs | 8 ++++++++ MES_Model/Services/Material/MaterialBomService.cs | 2 +- MES_Model/Services/Material/MaterialTypeService.cs | 3 --- .../Process/ProcessControlStrategyDictService.cs | 5 ++++- .../Process/ProcessOperationReworkRuleService.cs | 5 ++++- MES_Model/Services/Process/ProcessOperationService.cs | 8 +++++++- .../Process/ProcessOperationTransitionService.cs | 10 +++++++++- .../Process/ProcessOprerationTransitionDictService.cs | 5 ++++- MES_Model/Services/Process/ProcessRoutingService.cs | 8 +++++++- 14 files changed, 65 insertions(+), 10 deletions(-) diff --git a/MES_Model/Models/Process/Dto/ProcessControlStrategyDictDto.cs b/MES_Model/Models/Process/Dto/ProcessControlStrategyDictDto.cs index 4cb3083..44189c8 100644 --- a/MES_Model/Models/Process/Dto/ProcessControlStrategyDictDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessControlStrategyDictDto.cs @@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto /// public class ProcessControlStrategyDictQueryDto : PagerInfo { + public string StrategyCode { get; set; } + + public string StrategyName { get; set; } } /// diff --git a/MES_Model/Models/Process/Dto/ProcessOperationDto.cs b/MES_Model/Models/Process/Dto/ProcessOperationDto.cs index 2fcfeae..1a493cc 100644 --- a/MES_Model/Models/Process/Dto/ProcessOperationDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessOperationDto.cs @@ -7,6 +7,13 @@ namespace MDM.Model.Process.Dto /// public class ProcessOperationQueryDto : PagerInfo { + public string FkRoutingCode { get; set; } + public string OperationCode { get; set; } + + public string OperationName { get; set; } + + public string ParallelGroupCode { get; set; } + } /// diff --git a/MES_Model/Models/Process/Dto/ProcessOperationReworkRuleDto.cs b/MES_Model/Models/Process/Dto/ProcessOperationReworkRuleDto.cs index f82db8a..22ac8fc 100644 --- a/MES_Model/Models/Process/Dto/ProcessOperationReworkRuleDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessOperationReworkRuleDto.cs @@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto /// public class ProcessOperationReworkRuleQueryDto : PagerInfo { + public string FkRoutingCode { get; set; } + + public string FkOperationCode { get; set; } } /// diff --git a/MES_Model/Models/Process/Dto/ProcessOperationTransitionDto.cs b/MES_Model/Models/Process/Dto/ProcessOperationTransitionDto.cs index 27b799b..405ffa3 100644 --- a/MES_Model/Models/Process/Dto/ProcessOperationTransitionDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessOperationTransitionDto.cs @@ -7,6 +7,11 @@ namespace MDM.Model.Process.Dto /// public class ProcessOperationTransitionQueryDto : PagerInfo { + public string FkRoutingCode { get; set; } + + public string FromOperationCode { get; set; } + + public string ToOperationCode { get; set; } } /// diff --git a/MES_Model/Models/Process/Dto/ProcessOprerationTransitionDictDto.cs b/MES_Model/Models/Process/Dto/ProcessOprerationTransitionDictDto.cs index ec80dc3..2f26e42 100644 --- a/MES_Model/Models/Process/Dto/ProcessOprerationTransitionDictDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessOprerationTransitionDictDto.cs @@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto /// public class ProcessOprerationTransitionDictQueryDto : PagerInfo { + public string TransitionCode { get; set; } + + public string TranstionName { get; set; } } /// diff --git a/MES_Model/Models/Process/Dto/ProcessRoutingDto.cs b/MES_Model/Models/Process/Dto/ProcessRoutingDto.cs index 886d220..01f8103 100644 --- a/MES_Model/Models/Process/Dto/ProcessRoutingDto.cs +++ b/MES_Model/Models/Process/Dto/ProcessRoutingDto.cs @@ -7,6 +7,14 @@ namespace MDM.Model.Process.Dto /// public class ProcessRoutingQueryDto : PagerInfo { + public string FkProductMaterialCode { get; set; } + public string RoutingCode { get; set; } + + public string RoutingName { get; set; } + + public int? Version { get; set; } + + public int? Status { get; set; } } /// diff --git a/MES_Model/Services/Material/MaterialBomService.cs b/MES_Model/Services/Material/MaterialBomService.cs index fc2d2f1..8160659 100644 --- a/MES_Model/Services/Material/MaterialBomService.cs +++ b/MES_Model/Services/Material/MaterialBomService.cs @@ -15,7 +15,7 @@ using NPOI.XSSF.UserModel; using System.Linq.Expressions; -namespace MES_Model.Services.Material +namespace MDM.Services.Material { /// /// Service业务层处理 diff --git a/MES_Model/Services/Material/MaterialTypeService.cs b/MES_Model/Services/Material/MaterialTypeService.cs index 91152a0..adde963 100644 --- a/MES_Model/Services/Material/MaterialTypeService.cs +++ b/MES_Model/Services/Material/MaterialTypeService.cs @@ -7,11 +7,8 @@ using MDM.Model.Material.Dto; using MDM.Service; using MDM.Model; using MDM.Repository; -using DOAN.Model.MES.product; using Infrastructure; using Microsoft.AspNetCore.Http; -using Microsoft.VisualBasic; -using System.Collections.Generic; using NPOI.SS.UserModel; using NPOI.XSSF.UserModel; namespace MDM.Services.Material diff --git a/MES_Model/Services/Process/ProcessControlStrategyDictService.cs b/MES_Model/Services/Process/ProcessControlStrategyDictService.cs index c43ff2d..d96baa9 100644 --- a/MES_Model/Services/Process/ProcessControlStrategyDictService.cs +++ b/MES_Model/Services/Process/ProcessControlStrategyDictService.cs @@ -23,7 +23,10 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessControlStrategyDictQueryDto parm) { - var predicate = Expressionable.Create(); + 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 = Queryable() .Where(predicate.ToExpression()) diff --git a/MES_Model/Services/Process/ProcessOperationReworkRuleService.cs b/MES_Model/Services/Process/ProcessOperationReworkRuleService.cs index 4e1cc38..3c35217 100644 --- a/MES_Model/Services/Process/ProcessOperationReworkRuleService.cs +++ b/MES_Model/Services/Process/ProcessOperationReworkRuleService.cs @@ -22,7 +22,10 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessOperationReworkRuleQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.FkRoutingCode), m => m.FkRoutingCode.Contains(parm.FkRoutingCode)) + .AndIF(!string.IsNullOrEmpty(parm.FkOperationCode), m => m.FkOperationCode.Contains(parm.FkOperationCode)) + ; var response = Queryable() .Where(predicate.ToExpression()) diff --git a/MES_Model/Services/Process/ProcessOperationService.cs b/MES_Model/Services/Process/ProcessOperationService.cs index 0dca9d8..95a599f 100644 --- a/MES_Model/Services/Process/ProcessOperationService.cs +++ b/MES_Model/Services/Process/ProcessOperationService.cs @@ -23,7 +23,13 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessOperationQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.FkRoutingCode), m => m.FkRoutingCode.Contains(parm.FkRoutingCode)) + .AndIF(!string.IsNullOrEmpty(parm.OperationCode), m => m.OperationCode.Contains(parm.OperationCode)) + .AndIF(!string.IsNullOrEmpty(parm.OperationName), m => m.OperationName.Contains(parm.OperationName)) + .AndIF(!string.IsNullOrEmpty(parm.ParallelGroupCode), m => m.ParallelGroupCode.Contains(parm.ParallelGroupCode)) + + ; var response = Queryable() .Where(predicate.ToExpression()) diff --git a/MES_Model/Services/Process/ProcessOperationTransitionService.cs b/MES_Model/Services/Process/ProcessOperationTransitionService.cs index f4f53d9..d430482 100644 --- a/MES_Model/Services/Process/ProcessOperationTransitionService.cs +++ b/MES_Model/Services/Process/ProcessOperationTransitionService.cs @@ -22,7 +22,15 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessOperationTransitionQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.FkRoutingCode), m => m.FkRoutingCode.Contains(parm.FkRoutingCode)) + .AndIF(!string.IsNullOrEmpty(parm.FromOperationCode), m => m.FromOperationCode.Contains(parm.FromOperationCode)) + .AndIF(!string.IsNullOrEmpty(parm.ToOperationCode), m => m.ToOperationCode.Contains(parm.ToOperationCode)) + + + + + ; var response = Queryable() .Where(predicate.ToExpression()) diff --git a/MES_Model/Services/Process/ProcessOprerationTransitionDictService.cs b/MES_Model/Services/Process/ProcessOprerationTransitionDictService.cs index 02013a6..17f2197 100644 --- a/MES_Model/Services/Process/ProcessOprerationTransitionDictService.cs +++ b/MES_Model/Services/Process/ProcessOprerationTransitionDictService.cs @@ -22,7 +22,10 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessOprerationTransitionDictQueryDto parm) { - var predicate = Expressionable.Create(); + 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 = Queryable() .Where(predicate.ToExpression()) diff --git a/MES_Model/Services/Process/ProcessRoutingService.cs b/MES_Model/Services/Process/ProcessRoutingService.cs index 20246d5..ad807ea 100644 --- a/MES_Model/Services/Process/ProcessRoutingService.cs +++ b/MES_Model/Services/Process/ProcessRoutingService.cs @@ -21,7 +21,13 @@ namespace MDM.Services.Process /// public PagedInfo GetList(ProcessRoutingQueryDto parm) { - var predicate = Expressionable.Create(); + var predicate = Expressionable.Create() + .AndIF(!string.IsNullOrEmpty(parm.RoutingName), it => it.RoutingName.Contains(parm.RoutingName)) + .AndIF(!string.IsNullOrEmpty(parm.RoutingCode), it => it.RoutingCode.Contains(parm.RoutingCode)) + .AndIF(!string.IsNullOrEmpty(parm.FkProductMaterialCode), it => it.FkProductMaterialCode.Contains(parm.FkProductMaterialCode)) + .AndIF(parm.Version != null, it => it.Version == parm.Version) + .AndIF(parm.Status != null, it => it.Status == parm.Status) + ; var response = Queryable() .Where(predicate.ToExpression())