This commit is contained in:
qianhao.xu
2024-05-13 09:07:57 +08:00
parent 8b8de3e883
commit cc50aa458a
2 changed files with 21 additions and 3 deletions

View File

@@ -103,6 +103,10 @@ namespace ZR.Service.mes.mm
foreach (ProWorkorder_v2 workorder in WorkorderList)
{
if(string.IsNullOrEmpty(workorder.ClientWorkorder))
{
workorder.ClientWorkorder = "调试:" + workorder.Id;
}
// 配料任务
bool isExist = Context.Queryable<MmFkWorkorderIngredient>()
.Where(it => it.FkWorkorder == workorder.ClientWorkorder)
@@ -129,13 +133,11 @@ namespace ZR.Service.mes.mm
}
}
}
WorkorderList.RemoveAll(num => num.PreviousNumber <= 0);
total= WorkorderList.Count;
int skip = (query.pageNum ?? 1-1)*(query.pageSize ?? 10);
int skip = ((query.pageNum ?? 1)-1)*(query.pageSize ?? 10);
var returndata= WorkorderList
.OrderBy(it => it.ClientWorkorder)
.Skip(skip)