| | |
|---|
| | | public MesQaItemsDetect02 FindXJByOrderNo(OrderMachineDto query) |
|---|
| | | { |
|---|
| | | var list = Db.Queryable<MesQaItemsDetect02>() |
|---|
| | | .Where(s => |
|---|
| | | s.Ftype == "巡检" && s.Aufnr == query.orderNo && |
|---|
| | | s.FcheckDate != null) |
|---|
| | | .Select(s => new MesQaItemsDetect02 |
|---|
| | | .LeftJoin<MesStaff>((xj, staff) => xj.FcheckBy == staff.StaffNo) |
|---|
| | | .Where((xj, staff) => |
|---|
| | | xj.Ftype == "巡检" && xj.Aufnr == query.orderNo && |
|---|
| | | xj.FcheckDate != null) |
|---|
| | | .Select((xj, staff) => new MesQaItemsDetect02 |
|---|
| | | { |
|---|
| | | Id = s.Id, |
|---|
| | | FcheckDate = s.FcheckDate, |
|---|
| | | FcheckResu = s.FcheckResu, |
|---|
| | | FcheckBy = s.FcheckBy // 新增 |
|---|
| | | Id = xj.Id, |
|---|
| | | FcheckDate = xj.FcheckDate, |
|---|
| | | FcheckResu = xj.FcheckResu, |
|---|
| | | // FcheckBy与StaffName组合，如 "工号-姓名" |
|---|
| | | FcheckBy = xj.FcheckBy + (staff.StaffName != null ? "-" + staff.StaffName : "") |
|---|
| | | }) |
|---|
| | | .OrderBy(s => s.FcheckDate, OrderByType.Desc); |
|---|
| | | .OrderBy(xj => xj.FcheckDate, OrderByType.Desc); |
|---|
| | | |
|---|
| | | if (list == null || list.Count() == 0) |
|---|
| | | { |
|---|
