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/JotTwoDesign.aspx.cs
+1
View File
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
+2 -1
View File
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
@@ -627,4 +628,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
#endregion
}
}
}
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 // 增加焊口
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
+2 -1
View File
@@ -53,6 +53,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
@@ -766,4 +767,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
#endregion
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+5 -5
View File
@@ -224,11 +224,7 @@
<f:RenderField Width="100px" ColumnID="PaintCode" DataField="PaintCode" SortField="PaintCode"
FieldType="String" HeaderText="防腐等级" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark" SortField="Remark"
FieldType="String" HeaderText="备注" HeaderTextAlign="Center"
TextAlign="Left">
@@ -263,6 +259,10 @@
<f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
FieldType="String" HeaderText="流水段" HeaderTextAlign="Center"
TextAlign="Left">
</f:RenderField>
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+2 -1
View File
@@ -72,6 +72,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
@@ -329,7 +330,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint,FlowingSection
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
List<SqlParameter> listStr = new List<SqlParameter> { };
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+1
View File
@@ -140,6 +140,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+1
View File
@@ -59,6 +59,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+1
View File
@@ -108,6 +108,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+4 -1
View File
@@ -99,7 +99,7 @@
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口信息"
EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldJointId" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="WeldJointId"
AllowSorting="true" SortField="WeldJointCode" SortDirection="ASC" OnSort="Grid1_Sort"
AllowSorting="true" SortField="PipelineCode,WeldJointCodeInt" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" EnableRowDoubleClickEvent="true"
OnRowDoubleClick="Grid1_RowDoubleClick" OnRowDataBound="Grid1_RowDataBound">
@@ -108,6 +108,9 @@
Width="60px" HeaderTextAlign="Center" TextAlign="Center" ColumnID="tfNumber" />
<f:GroupField HeaderText="设计基础数据" TextAlign="Center">
<Columns>
<f:renderfield headertext="管线号" columnid="PipelineCode" datafield="PipelineCode" sortfield="PipelineCode" fieldtype="String" headertextalign="Center"
textalign="Left" width="160px">
</f:renderfield>
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="160px">
</f:RenderField>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+4 -3
View File
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;
@@ -265,7 +266,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,CAST(WeldJointCode as int) as WeldJointCodeInt
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
List<SqlParameter> listStr = new List<SqlParameter> { };
@@ -305,7 +306,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
strSql += " AND JointAttribute =@JointAttribute";
listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
}
}
SqlParameter[] parameter = listStr.ToArray();
System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -602,4 +603,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+1
View File
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
orderby x.UnitWorkCode
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;