lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hjgl): 增强焊口匹配与任务单打印

Browse Source 
焊口台账、材料匹配和任务单打印需要统一到焊口维度处理。
新增焊口查询、匹配保存和打印模板适配，便于按焊口追溯材料和任务。
This commit is contained in:
李鹏飞
2026-06-26 00:40:55 +08:00
parent bd9b5a6f4d
commit 02b524b895
14 changed files with 836 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
+6
View File
@@ -465,6 +465,8 @@ namespace BLL
baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
if (!string.IsNullOrEmpty(model.WeldJointCode))
baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
if (!string.IsNullOrEmpty(model.IsWeldOK))
baseQuery = baseQuery.Where(x => x.IsWeldOK == model.IsWeldOK);
//构建排序
baseQuery = baseQuery.OrderBy(x => x.PipelineId).ThenBy(x => x.WeldJointCode);
@@ -483,6 +485,8 @@ namespace BLL
baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
if (!string.IsNullOrEmpty(model.WeldJointCode))
baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
if (!string.IsNullOrEmpty(model.IsWeldOK))
baseQuery = baseQuery.Where(x => x.IsWeldOK == model.IsWeldOK);
return baseQuery.ToList();
}
@@ -502,6 +506,8 @@ namespace BLL
baseQuery = baseQuery.Where(x => x.PipelineCode.Contains(model.PipelineCode));
if (!string.IsNullOrEmpty(model.WeldJointCode))
baseQuery = baseQuery.Where(x => x.WeldJointCode.Contains(model.WeldJointCode));
if (!string.IsNullOrEmpty(model.IsWeldOK))
baseQuery = baseQuery.Where(x => x.IsWeldOK == model.IsWeldOK);
// 阶段三：排序与分页控制（索引优化关键）
var orderedQuery = baseQuery.OrderBy(x => x.PipelineId).ThenBy(x => x.WeldJointCode);