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

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

Browse Source 
支持入库申请信息维护、入库明细批量导入及模板下载，
完善材料入库业务流程，减少人工录入和明细维护成本。
增加焊口流转区段信息，并统一相关单位工程列表排序
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+25 -9
View File
@@ -1025,8 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
PCMedium = x.PCMedium,
MaterialId = x.MaterialId,
PaintId = x.PaintId,
Remark = x.Remark,
FlowingSection = x.FlowingSection
Remark = x.Remark,
}).DistinctBy(temp => new
{
temp.PipelineId,
@@ -1052,8 +1051,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
temp.PCMedium,
temp.MaterialId,
temp.PaintId,
temp.Remark,
temp.FlowingSection
temp.Remark
}).ToList();
for (int i = 0; i < pipelines.Count(); i++)
{
@@ -1082,7 +1080,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
pipeline.MaterialId = pipelines[i].MaterialId;
pipeline.PaintId = pipelines[i].PaintId;
pipeline.Remark = pipelines[i].Remark;
pipeline.FlowingSection = pipelines[i].FlowingSection;
var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
if (isExistPipelineCode != null) // 更新管线
@@ -1127,6 +1124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
ProjectId = this.CurrUser.LoginProjectId,
IsHotProess = x.IsHotProess,
WeldJointPoint = x.WeldJointPoint,
FlowingSection=x.FlowingSection
}).DistinctBy(temp => new
{
temp.WeldJointCode,
@@ -1143,7 +1141,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
temp.JointAttribute,
temp.ProjectId,
temp.IsHotProess,
temp.WeldJointPoint
temp.WeldJointPoint,
temp.FlowingSection
}).ToList();
var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
@@ -1166,12 +1165,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
weldJoint.ProjectId = weldJoints[i].ProjectId;
weldJoint.IsHotProess = weldJoints[i].IsHotProess;
weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;
weldJoint.FlowingSection = weldJoints[i].FlowingSection;
var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
if (isExistJot != null) // 更新焊口
{
weldJoint.WeldJointId = isExistJot.WeldJointId;
BLL.WeldJointService.UpdateWeldJoint(weldJoint);
{
isExistJot.PipelineId = getpipelines.Where(x => x.PipelineCode == weldJoints[i].PipelineCode).FirstOrDefault().PipelineId;
isExistJot.WeldJointCode = weldJoints[i].WeldJointCode;
isExistJot.PipelineCode = weldJoints[i].PipelineCode;
isExistJot.Material1Id = weldJoints[i].Material1Id;
isExistJot.Material2Id = weldJoints[i].Material2Id;
isExistJot.Dia = weldJoints[i].Dia;
isExistJot.DNDia = weldJoints[i].DNDia;
isExistJot.Size = weldJoints[i].Size;
isExistJot.Thickness = weldJoints[i].Thickness;
isExistJot.Specification = weldJoints[i].Specification;
isExistJot.WeldTypeId = weldJoints[i].WeldTypeId;
isExistJot.DetectionTypeId = weldJoints[i].DetectionTypeId;
isExistJot.JointAttribute = weldJoints[i].JointAttribute;
isExistJot.ProjectId = weldJoints[i].ProjectId;
isExistJot.IsHotProess = weldJoints[i].IsHotProess;
isExistJot.WeldJointPoint = weldJoints[i].WeldJointPoint;
isExistJot.FlowingSection = weldJoints[i].FlowingSection;
BLL.WeldJointService.UpdateWeldJoint(isExistJot);
}
else // 增加焊口
{