RIZO/Valeo_Line_MES_backend
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

工艺参数模糊查询

Browse Source
This commit is contained in:
quowingwang 2026-01-31 10:07:20 +08:00
parent 9cd4ce6672
commit 93f27b6bfd
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
RIZO.Admin.WebApi/PLC/Model/Dto/PlcProductionDataDto.cs
View File

@ -10,6 +10,15 @@ namespace RIZO.Admin.WebApi.PLC.Model.Dto
/// </summary>
public class PlcProductionDataQueryDto : PagerInfo
{
public string? ProductCode { get; set; }
public string? ProductName { get; set; }
public string? ProduceModel { get; set; }
public string? WorkstationCode { get; set; }
public string? ReworkFlag { get; set; }
public DateTime? startTime { get; set; }
public DateTime? endTime { get; set; }
}
/// <summary>

48
RIZO.Admin.WebApi/PLC/Service/PlcProductionDataService.cs
View File

@ -25,26 +25,34 @@ namespace RIZO.Admin.WebApi.PLC.Service
{
var predicate = QueryExp(parm);
#region
//if (!string.IsNullOrEmpty(parm.ProductName))
//{
// predicate = predicate.And(x => x.ProductName == parm.ProductName);
//}
//if (!string.IsNullOrEmpty(parm.ProductCode))
//{
// predicate = predicate.And(x => x.ProductCode == parm.ProductCode);
//}
//if (!string.IsNullOrEmpty(parm.ReworkFlag))
//{
// predicate = predicate.And(x => x.ReworkFlag == parm.ReworkFlag);
//}
//if (parm.startTime != null && parm.startTime > DateTime.MinValue)
//{
// predicate = predicate.And(x => x.CreatedTime >= parm.startTime);
//}
//if (parm.endTime != null && parm.endTime > DateTime.MinValue)
//{
// predicate = predicate.And(x => x.CreatedTime <= parm.endTime);
//}
if (!string.IsNullOrEmpty(parm.ProductName))
{
predicate = predicate.And(x => x.ProductName == parm.ProductName);
}
if (!string.IsNullOrEmpty(parm.ProductCode))
{
predicate = predicate.And(x => x.ProductCode == parm.ProductCode);
}
if (!string.IsNullOrEmpty(parm.ProduceModel))
{
predicate = predicate.And(x => x.ProduceModel == parm.ProduceModel);
}
if (!string.IsNullOrEmpty(parm.WorkstationCode))
{
predicate = predicate.And(x => x.WorkstationCode == parm.WorkstationCode);
}
if (!string.IsNullOrEmpty(parm.ReworkFlag))
{
predicate = predicate.And(x => x.ReworkFlag == parm.ReworkFlag);
}
if (parm.startTime != null && parm.startTime > DateTime.MinValue)
{
predicate = predicate.And(x => x.CreatedTime >= parm.startTime);
}
if (parm.endTime != null && parm.endTime > DateTime.MinValue)
{
predicate = predicate.And(x => x.CreatedTime <= parm.endTime);
}
#endregion
var response = Queryable()
.Where(predicate.ToExpression())