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

提交代码

This commit is contained in:
高飞 2023-12-06 15:22:27 +08:00
parent cdec29792f
commit 8fa05e0878
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
View File

@ -460,8 +460,12 @@ namespace BLL
string strSql = @"select line.PipelineId as ID
,line.PipelineId
,(select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId) as TotalSize
,(case when line.PipeArea='1' then (select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId and jot.JointAttribute='预制口')
else (select ISNULL(SUM(ISNULL(jot.Size,0)),0) FROM dbo.HJGL_WeldJoint jot WHERE jot.PipelineId=line.PipelineId) end) as TotalYZSize
,line.PipelineCode
,line.ProjectId
,mat.MaterialCode
,line.UnitWorkId
,line.UnitId
,line.SingleNumber
@ -494,6 +498,7 @@ namespace BLL
,unit.UnitWorkName
from HJGL_Pipeline line
left join WBS_UnitWork unit on line.UnitWorkId=unit.UnitWorkId
LEFT JOIN dbo.Base_Material AS mat ON mat.MaterialId=line.MaterialId
WHERE line.ProjectId= @ProjectId ";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", projectid));

BIN
SGGL/FineUIPro.Web/File/Excel/DataOut/WeldingPlanDataOut2.xlsx
View File

Binary file not shown.

12
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlanIn.aspx
View File

@ -64,6 +64,18 @@
DataField="FlowingSection" SortField="FlowingSection" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="总达因" ColumnID="TotalSize"
DataField="TotalSize" SortField="TotalSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="预制总达因" ColumnID="TotalYZSize"
DataField="TotalYZSize" SortField="TotalYZSize" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Center" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="材质" ColumnID="MaterialCode"
DataField="MaterialCode" SortField="MaterialCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="预制组件" ColumnID="PipelineComponentCode"
DataField="PipelineComponentCode" SortField="PipelineComponentCode" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="150px">