| | |
|---|
| | | //根据工单号查首检 |
|---|
| | | public MesQaItemsDetect02 FindSJByOrderNo(OrderMachineDto query) |
|---|
| | | { |
|---|
| | | return Db.Queryable<MesQaItemsDetect02>() |
|---|
| | | .Where(s => s.Ftype == "首检" && s.Aufnr == query.orderNo) |
|---|
| | | .Select(s => new MesQaItemsDetect02 |
|---|
| | | var entity = Db.Queryable<MesQaItemsDetect02>() |
|---|
| | | .LeftJoin<MesStaff>((sj, staff) => sj.FcheckBy == staff.StaffNo) |
|---|
| | | .Where((sj, staff) => sj.Ftype == "首检" && sj.Aufnr == query.orderNo) |
|---|
| | | .Select((sj, staff) => new MesQaItemsDetect02 |
|---|
| | | { |
|---|
| | | Id = s.Id, |
|---|
| | | FcheckDate = s.FcheckDate, |
|---|
| | | FcheckResu = s.FcheckResu |
|---|
| | | Id = sj.Id, |
|---|
| | | FcheckDate = sj.FcheckDate, |
|---|
| | | FcheckResu = sj.FcheckResu, |
|---|
| | | // FcheckBy与StaffName组合，如 "工号-姓名" |
|---|
| | | FcheckBy = sj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "") |
|---|
| | | }) |
|---|
| | | .OrderBy(s => s.FcheckDate, OrderByType.Desc) |
|---|
| | | .OrderBy(sj => sj.FcheckDate, OrderByType.Desc) |
|---|
| | | .First(); |
|---|
| | | |
|---|
| | | return entity; |
|---|
| | | } |
|---|
| | | |
|---|
| | | //根据工单号查巡检 |
|---|
