From f31a3fe9fa958570a7a33e09d32ab195b1685bc2 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Fri, 6 Dec 2024 09:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx    | 8 ++++++--
 SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs | 9 +++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
index c90e8341..dff2da4e 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
@@ -26,7 +26,7 @@
                                 </f:DropDownList>
                                 <f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right"
                                     LabelWidth="80px">
-                                    <f:ListItem Value="" Text="" />
+                                    <f:ListItem Value="" Text="ALL" />
                                     <f:ListItem Value="0" Text="工艺系统清单" />
                                     <f:ListItem Value="1" Text="非工艺系统清单" />
                                 </f:DropDownList>
@@ -50,11 +50,15 @@
                         <%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="50px">
                         </f:RenderField>--%>
-
+                        
                         <f:RenderField ColumnID="SubSysNo" DataField="SubSysNo"
                             FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
                             HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true">
                         </f:RenderField>
+                        <f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
+                            FieldType="String" HeaderText="Commissioning Code<br/>Description" TextAlign="Center"
+                            HeaderTextAlign="Center" MinWidth="300px" EnableLock="true" Locked="true">
+                        </f:RenderField>
 
                         <f:RenderField MinWidth="100px" ColumnID="PlanPWD" DataField="PlanPWD"
                             HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index 3459f9a5..63804ce7 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -45,7 +45,7 @@ namespace FineUIPro.Web.Transfer.Chart
 
         public DataTable DataSql()
         {
-            string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
+            string strSql = @"select f.SubSysNo,lhcs.CommissioningCodeDescription,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
 case ISNULL(tpi3.TotalFactor,0) when 0 then 0
 else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0)))  end CompleteProportion,
 
@@ -86,8 +86,9 @@ else  CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0)))  end
 ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
 
 from(
-SELECT SubCommissioningsystem as SubSysNo,SN,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,SN,Type,ProjectId
+SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,ProjectId
 ) f
+left join Transfer_LHCSystemList lhcs on f.ProjectId=lhcs.ProjectId and f.SubSysNo=lhcs.SubCommissioningsystem
 left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
 --piping
 
@@ -171,12 +172,12 @@ where f.ProjectId = @ProjectId ";
             }
             if (!string.IsNullOrEmpty(drpType.SelectedValue))
             {
-                strSql += " AND f.Type='" + drpType.SelectedValue + "' ";
+                strSql += " AND lhcs.Type='" + drpType.SelectedValue + "' ";
             }
 
             //strSql += " order by f.Type ";
             //strSql += " order by f.SubSysNo ";
-            strSql += " order by f.Type,f.SN ";
+            strSql += " order by lhcs.Type,lhcs.SN ";
             SqlParameter[] parameter = listStr.ToArray();
             return SQLHelper.GetDataTableRunText(strSql, parameter);
         }