SJ,XJ,RKJ优化

xwt

2025-09-25 8e5e2fb892df6cc8c61d7c03baa2412522ad11c4

 StandardInterface/MES.Service/service/QC/RKJService.cs

@@ -309,11 +309,8 @@
                QsCode = a.QsCode,
                QsName = a.QsName,
                isCheck = SqlFunc.AggregateCount(b.Id),
                Result = a.IsPass == 1 &&
                         a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "合格"
                    : a.IsPass == 0 &&
                      a.LevelNum == SqlFunc.AggregateCount(b.Id) ? "不合格"
                    : "未完成"
                Result = SqlFunc.AggregateCount(b.Id) == 0 ? "未完成" :
                         a.IsPass == 1 ? "合格" : "不合格"
            }).OrderBy("result desc").ToList();
    }

@@ -635,6 +632,25 @@
            .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,