提交代码

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -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));