| | |
| | | .WhereIF( |
| | | StringUtil.IsNullOrEmpty(queryObj.fsubmit) || queryObj.fsubmit == "0", |
| | | (a, da, b) => a.Fsubmit == 0 || a.Fsubmit == null) |
| | | // 添加搜索条件 - 根据选择的搜索字段进行精确搜索 |
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "billNo", // 工单 |
| | | (a, da, b) => a.BillNo.Contains(queryObj.SearchValue)) |
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "releaseNo", // 检验单号 |
| | | (a, da, b) => a.ReleaseNo.Contains(queryObj.SearchValue)) |
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "daa015", // 产线 |
| | | (a, da, b) => da.Daa015.Contains(queryObj.SearchValue)) |
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemNo", // 物料编码 |
| | | (a, da, b) => a.ItemNo.Contains(queryObj.SearchValue)) |
| | | .WhereIF(!string.IsNullOrEmpty(queryObj.SearchValue) && !string.IsNullOrEmpty(queryObj.searchField) && queryObj.searchField == "itemName", // 物料名称 |
| | | (a, da, b) => b.ItemName.Contains(queryObj.SearchValue)) |
| | | // 为了兼容旧版本,如果没有传递 searchField,使用原来的查询逻辑 |
| | | .WhereIF(string.IsNullOrEmpty(queryObj.searchField) && !string.IsNullOrEmpty(queryObj.SearchValue), |
| | | (a, da, b) => |
| | | a.ItemNo.Contains(queryObj.SearchValue) || |
| | | b.ItemName.Contains(queryObj.SearchValue) || |
| | | a.BillNo.Contains(queryObj.SearchValue) || |
| | | a.ReleaseNo.Contains(queryObj.SearchValue) || |
| | | da.Daa015.Contains(queryObj.SearchValue)) |
| | | .Select((a, da, b) => new QsItemOqcReq |
| | | { |
| | | Id = a.Id, |