Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

11111

Browse Source
This commit is contained in:
xiaowei.song
2024-06-20 11:52:05 +08:00
parent b5412117a7
commit 7e99683678
9 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ZR.Service/mes/ql/PLRawMaterialService.cs
View File

@@ -68,20 +68,17 @@ namespace ZR.Service.mes.ql
/// 查询数据记录，要改成分页查询
/// </summary>
/// <returns></returns>
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, int pageNum, int pageSize)
public (List<PLRawMaterial>, int) GetRawMaterialTable(DateTime starttime, DateTime endTime, string pci, string colorCode, int pageNum, int pageSize)
{
//starttime = starttime.ToLocalTime();
//endTime = endTime.ToLocalTime();
//int totalNum = 0;
//var predicate = Expressionable.Create<QcQualityStatisticsAgain>()
// //XXX:修改查询日期查询的字段
// .AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime >= starttime.ToLocalTime())
// .AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.StartTime <= endTime.ToLocalTime())
// .AndIF(!string.IsNullOrEmpty(workorderid), it => it.WorkorderId.Contains(workorderid))
// .AndIF(!string.IsNullOrEmpty(partnumber), it => it.FinishedPartNumber.Contains(partnumber))
// .AndIF(!string.IsNullOrEmpty(team), it => it.Team.Equals(team))
// .AndIF(!string.IsNullOrEmpty(product_description), it => it.ProductDescription.Contains(product_description))
// .ToExpression();
starttime = starttime.ToLocalTime();
endTime = endTime.ToLocalTime();
int totalNum = 0;
var predicate = Expressionable.Create<PLRawMaterial>()
.AndIF(starttime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime >= starttime.ToLocalTime())
.AndIF(endTime > new DateTime(2023, 1, 1, 0, 0, 0), it => it.CreatedTime <= endTime.ToLocalTime())
.AndIF(!string.IsNullOrEmpty(pci), it => it.Pci.Contains(pci))
.AndIF(!string.IsNullOrEmpty(colorCode), it => it.Pci.Contains(colorCode))
.ToExpression();
//List<QcQualityStatisticsAgain> data = Context.Queryable<QcQualityStatisticsAgain>().Where(predicate).OrderBy(it => it.WorkorderId).OrderBy(it => it.Remark2).ToPageList(pageNum, pageSize, ref totalNum);
@@ -100,9 +97,9 @@ namespace ZR.Service.mes.ql
//return (data, totalNum);
int totalNum = 0;
List<PLRawMaterial> data = Context.Queryable<PLRawMaterial>()
.Where(it => it.CreatedTime > starttime.ToLocalTime() && it.CreatedTime<= endTime.ToLocalTime())
.Where(predicate)
.OrderByDescending(it => it.IdGroup)
.OrderBy(it => it.Id)
.ToPageList(pageNum, pageSize, ref totalNum);
return (data, totalNum);