RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
gcw_MV9p2JJN 2025-11-18 14:49:40 +08:00
parent 8a0f6571d7
commit ac7f8802ba
14 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MES_Model/Models/Process/Dto/ProcessControlStrategyDictDto.cs
View File

@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto
/// </summary>
public class ProcessControlStrategyDictQueryDto : PagerInfo
{
public string StrategyCode { get; set; }
public string StrategyName { get; set; }
}
/// <summary>

7
MES_Model/Models/Process/Dto/ProcessOperationDto.cs
View File

@ -7,6 +7,13 @@ namespace MDM.Model.Process.Dto
/// </summary>
public class ProcessOperationQueryDto : PagerInfo
{
public string FkRoutingCode { get; set; }
public string OperationCode { get; set; }
public string OperationName { get; set; }
public string ParallelGroupCode { get; set; }
}
/// <summary>

3
MES_Model/Models/Process/Dto/ProcessOperationReworkRuleDto.cs
View File

@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto
/// </summary>
public class ProcessOperationReworkRuleQueryDto : PagerInfo
{
public string FkRoutingCode { get; set; }
public string FkOperationCode { get; set; }
}
/// <summary>

5
MES_Model/Models/Process/Dto/ProcessOperationTransitionDto.cs
View File

@ -7,6 +7,11 @@ namespace MDM.Model.Process.Dto
/// </summary>
public class ProcessOperationTransitionQueryDto : PagerInfo
{
public string FkRoutingCode { get; set; }
public string FromOperationCode { get; set; }
public string ToOperationCode { get; set; }
}
/// <summary>

3
MES_Model/Models/Process/Dto/ProcessOprerationTransitionDictDto.cs
View File

@ -7,6 +7,9 @@ namespace MDM.Model.Process.Dto
/// </summary>
public class ProcessOprerationTransitionDictQueryDto : PagerInfo
{
public string TransitionCode { get; set; }
public string TranstionName { get; set; }
}
/// <summary>

8
MES_Model/Models/Process/Dto/ProcessRoutingDto.cs
View File

@ -7,6 +7,14 @@ namespace MDM.Model.Process.Dto
/// </summary>
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; }
}
/// <summary>

2
MES_Model/Services/Material/MaterialBomService.cs
View File

@ -15,7 +15,7 @@ using NPOI.XSSF.UserModel;
using System.Linq.Expressions;
namespace MES_Model.Services.Material
namespace MDM.Services.Material
{
/// <summary>
/// Service业务层处理

3
MES_Model/Services/Material/MaterialTypeService.cs
View File

@ -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

5
MES_Model/Services/Process/ProcessControlStrategyDictService.cs
View File

@ -23,7 +23,10 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessControlStrategyDictDto> GetList(ProcessControlStrategyDictQueryDto parm)
{
var predicate = Expressionable.Create<ProcessControlStrategyDict>();
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 = Queryable()
.Where(predicate.ToExpression())

5
MES_Model/Services/Process/ProcessOperationReworkRuleService.cs
View File

@ -22,7 +22,10 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessOperationReworkRuleDto> GetList(ProcessOperationReworkRuleQueryDto parm)
{
var predicate = Expressionable.Create<ProcessOperationReworkRule>();
var predicate = Expressionable.Create<ProcessOperationReworkRule>()
.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())

8
MES_Model/Services/Process/ProcessOperationService.cs
View File

@ -23,7 +23,13 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessOperationDto> GetList(ProcessOperationQueryDto parm)
{
var predicate = Expressionable.Create<ProcessOperation>();
var predicate = Expressionable.Create<ProcessOperation>()
.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())

10
MES_Model/Services/Process/ProcessOperationTransitionService.cs
View File

@ -22,7 +22,15 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessOperationTransitionDto> GetList(ProcessOperationTransitionQueryDto parm)
{
var predicate = Expressionable.Create<ProcessOperationTransition>();
var predicate = Expressionable.Create<ProcessOperationTransition>()
.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())

5
MES_Model/Services/Process/ProcessOprerationTransitionDictService.cs
View File

@ -22,7 +22,10 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessOprerationTransitionDictDto> GetList(ProcessOprerationTransitionDictQueryDto parm)
{
var predicate = Expressionable.Create<ProcessOprerationTransitionDict>();
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 = Queryable()
.Where(predicate.ToExpression())

8
MES_Model/Services/Process/ProcessRoutingService.cs
View File

@ -21,7 +21,13 @@ namespace MDM.Services.Process
/// <returns></returns>
public PagedInfo<ProcessRoutingDto> GetList(ProcessRoutingQueryDto parm)
{
var predicate = Expressionable.Create<ProcessRouting>();
var predicate = Expressionable.Create<ProcessRouting>()
.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())