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-17 11:00:02 +08:00
parent fc23379f6c
commit 1741c0a2ac
8 changed files with 71 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MES_Model/Models/Material/Dto/MaterialTypeDto.cs
View File

@ -7,6 +7,13 @@ namespace MDM.Model.Material.Dto
/// </summary>
public class MaterialTypeQueryDto : PagerInfo
{
public string Name { get; set; }
public string Code { get; set; }
public string ParentCode { get; set; }
public int? Status { get; set; }
}
/// <summary>

9
MES_Model/Models/Plant/Dto/PlantProductlinebodyDto.cs
View File

@ -7,6 +7,15 @@ namespace MDM.Model.Plant.Dto
/// </summary>
public class PlantProductlinebodyQueryDto : PagerInfo
{
public string FkFactorySiteCode { get; set; }
public string FkWorkshopCode { get; set; }
public string LineCode { get; set; }
public string LineName { get; set; }
}
/// <summary>

9
MES_Model/Models/Plant/Dto/PlantWorkshopDto.cs
View File

@ -5,8 +5,15 @@ namespace MDM.Model.Plant.Dto
/// <summary>
/// 车间查询对象
/// </summary>
public class PlantWorkshopQueryDto : PagerInfo
public class PlantWorkshopQueryDto : PagerInfo
{
public string FkSiteCode { get; set; }
public string WorkshopCode { get; set; }
public string WorkshopName { get; set; }
public int? Status { get; set; }
}
/// <summary>

14
MES_Model/Models/Plant/Dto/PlantWorkstationDto.cs
View File

@ -7,6 +7,20 @@ namespace MDM.Model.Plant.Dto
/// </summary>
public class PlantWorkstationQueryDto : PagerInfo
{
public string FkFactorySiteCode { get; set; }
public string FkWorkshopCode { get; set; }
public string FkProductlinebody { get; set; }
public string WorkstationCode { get; set; }
public string WorkstationName { get; set; }
public string FunctionGroupCode { get; set; }
public string FunctionGroupName { get; set; }
}
/// <summary>

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

@ -22,7 +22,15 @@ namespace MDM.Services.Material
/// <returns></returns>
public PagedInfo<MaterialTypeDto> GetList(MaterialTypeQueryDto parm)
{
var predicate = Expressionable.Create<MaterialType>();
var predicate = Expressionable.Create<MaterialType>()
.AndIF(!string.IsNullOrEmpty(parm.Name),it=>it.Name.Contains(parm.Name))
.AndIF(!string.IsNullOrEmpty(parm.Code),it=>it.Code.Contains(parm.Code))
.AndIF(!string.IsNullOrEmpty(parm.ParentCode),it=>it.ParentCode.Contains(parm.ParentCode))
.AndIF(parm.Status!=null,it=>it.Status==parm.Status)
;
var response = Queryable()
.Where(predicate.ToExpression())

7
MES_Model/Services/Plant/PlantProductlinebodyService.cs
View File

@ -25,7 +25,12 @@ namespace MDM.Services.Plant
/// <returns></returns>
public PagedInfo<PlantProductlinebodyDto> GetList(PlantProductlinebodyQueryDto parm)
{
var predicate = Expressionable.Create<PlantProductlinebody>();
var predicate = Expressionable.Create<PlantProductlinebody>()
.AndIF(!string.IsNullOrEmpty(parm.FkFactorySiteCode),it=>it.FkFactorySiteCode.Contains(parm.FkFactorySiteCode))
.AndIF(!string.IsNullOrEmpty(parm.FkWorkshopCode),it=>it.FkWorkshopCode.Contains(parm.FkWorkshopCode))
.AndIF(!string.IsNullOrEmpty(parm.LineCode),it=>it.LineCode.Contains(parm.LineCode))
.AndIF(!string.IsNullOrEmpty(parm.LineName),it=>it.LineName.Contains(parm.LineName))
;
var response = Queryable()
.Where(predicate.ToExpression())

8
MES_Model/Services/Plant/PlantWorkshopService.cs
View File

@ -25,7 +25,13 @@ namespace MDM.Services.Plant
/// <returns></returns>
public PagedInfo<PlantWorkshopDto> GetList(PlantWorkshopQueryDto parm)
{
var predicate = Expressionable.Create<PlantWorkshop>();
var predicate = Expressionable.Create<PlantWorkshop>()
.AndIF(!string.IsNullOrEmpty(parm.FkSiteCode),it=>it.FkSiteCode.Contains(parm.FkSiteCode))
.AndIF(!string.IsNullOrEmpty(parm.WorkshopCode),it=>it.WorkshopCode.Contains(parm.WorkshopCode))
.AndIF(!string.IsNullOrEmpty(parm.WorkshopName),it=>it.WorkshopName.Contains(parm.WorkshopName))
.AndIF(parm.Status != null, it => it.Status == parm.Status)
;
var response = Queryable()
.Where(predicate.ToExpression())

12
MES_Model/Services/Plant/PlantWorkstationService.cs
View File

@ -25,7 +25,17 @@ namespace MDM.Services.Plant
/// <returns></returns>
public PagedInfo<PlantWorkstationDto> GetList(PlantWorkstationQueryDto parm)
{
var predicate = Expressionable.Create<PlantWorkstation>();
var predicate = Expressionable.Create<PlantWorkstation>()
.AndIF(!string.IsNullOrEmpty(parm.FkFactorySiteCode), it => it.FkFactorySiteCode == parm.FkFactorySiteCode)
.AndIF(!string.IsNullOrEmpty(parm.FkWorkshopCode), it => it.FkWorkshopCode == parm.FkWorkshopCode)
.AndIF(!string.IsNullOrEmpty(parm.FkProductlinebody), it => it.FkProductlinebody == parm.FkProductlinebody)
.AndIF(!string.IsNullOrEmpty(parm.WorkstationCode), it => it.WorkstationCode.Contains(parm.WorkstationCode))
.AndIF(!string.IsNullOrEmpty(parm.WorkstationName), it => it.WorkstationName.Contains(parm.WorkstationName))
.AndIF(!string.IsNullOrEmpty(parm.FunctionGroupCode), it => it.FunctionGroupCode.Contains(parm.FunctionGroupCode))
.AndIF(!string.IsNullOrEmpty(parm.FunctionGroupName), it => it.FunctionGroupName.Contains(parm.FunctionGroupName))
;
var response = Queryable()
.Where(predicate.ToExpression())