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

仓库，上料debug测试改动

Browse Source
This commit is contained in:
赵正易
2024-05-11 09:36:29 +08:00
parent a7b723982e
commit 0b3a8e1b20
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ZR.Service/mes/mm/MaterialInputService.cs
View File

@@ -96,7 +96,8 @@ namespace ZR.Service.mes.mm
.Where(it => it.Year == year) .Where(it => it.Year == year)
.Where(it => it.Week == week) .Where(it => it.Week == week)
.Where(it => it.Date == dayOfWeekNumber) .Where(it => it.Date == dayOfWeekNumber)
.Where(it => it.Remark3 == "是" || it.Remark1 == "调试").ToList(); .Where(it => it.Remark3 == "是" || it.Remark1 == "调试")
.ToList();
// .ToPageList(query.pageNum??1, query.pageSize??10, ref total); // .ToPageList(query.pageNum??1, query.pageSize??10, ref total);
foreach (ProWorkorder_v2 workorder in WorkorderList) foreach (ProWorkorder_v2 workorder in WorkorderList)
@@ -132,7 +133,11 @@ namespace ZR.Service.mes.mm
} }
WorkorderList.RemoveAll(num => num.PreviousNumber <= 0); WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
total= WorkorderList.Count; total= WorkorderList.Count;
var returndata= WorkorderList.Skip(query.pageNum ?? 1).Take(query.pageSize ?? 10).ToList(); var returndata= WorkorderList
.OrderBy(it => it.ClientWorkorder)
.Skip(query.pageNum ?? 1)
.Take(query.pageSize ?? 10)
.ToList();
return (returndata, total); return (returndata, total);
} }