This commit is contained in:
DESKTOP-H2PAFLR\Administrator
2023-09-08 13:10:26 +08:00
parent 76452f970f
commit 50c0a7a016
17 changed files with 129 additions and 640 deletions

View File

@@ -33,15 +33,19 @@ namespace ZR.Service.mes.md
.AndIF(!string.IsNullOrEmpty(StationCode), it => it.StationCode.Contains(StationCode))
.AndIF(!string.IsNullOrEmpty(StationName), it => it.StationName.Contains(StationName))
.ToExpression();
List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
List<MdWorkstation> data = Context.Queryable<MdWorkstation>().Includes(x => x.Workline).Where(predicate).ToPageList(pageNum, pageSize, ref totalNum);
return (totalNum, data);
}
public int UpdateWorkshop(MdWorkstation workshop)
{
return Update(workshop, true);
}
public List<MdWorkline> GetworkLineList()
{
return Context.Queryable<MdWorkline>().ToList();
}
}
}