feat(clgl): 增加入库申请编辑与明细导入

支持入库申请信息维护、入库明细批量导入及模板下载,
完善材料入库业务流程,减少人工录入和明细维护成本。
增加焊口流转区段信息,并统一相关单位工程列表排序
This commit is contained in:
2026-07-13 09:17:00 +08:00
parent 1da7910305
commit 3185461755
73 changed files with 1774 additions and 145 deletions
@@ -119,7 +119,8 @@ namespace BLL
TwoJointType = weldJoint.TwoJointType,
CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId,
WeldJointPoint = weldJoint.WeldJointPoint
WeldJointPoint = weldJoint.WeldJointPoint,
FlowingSection = weldJoint.FlowingSection
};
if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
{
@@ -191,6 +192,7 @@ namespace BLL
newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
newWeldJoint.WeldJointPoint = weldJoint.WeldJointPoint;
newWeldJoint.FlowingSection= weldJoint.FlowingSection;
db.SubmitChanges();
}
}
@@ -510,7 +512,7 @@ namespace BLL
baseQuery = baseQuery.Where(x => x.IsWeldOK == model.IsWeldOK);
// 阶段三:排序与分页控制(索引优化关键)
var orderedQuery = baseQuery.OrderBy(x => x.PipelineId).ThenBy(x => x.WeldJointCode);
var orderedQuery = baseQuery.OrderBy(x => x.PipelineCode).ThenBy(x => x.WeldJointCode);
// 阶段四:分页执行(数据库层面分页)
var pagedData = orderedQuery