From ce83292f2a919cb20af647b7bf3621eb7a2e0028 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 3 Dec 2024 19:00:05 +0800
Subject: [PATCH 1/3] =?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

---
 .../Transfer/Chart/Systemstatus.aspx.cs        |  8 ++++----
 .../Transfer/Chart/SystemstatusChart.aspx.cs   | 18 +++++++++---------
 SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
index f3e0c40a..af38dc5f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
@@ -28,13 +28,13 @@ namespace FineUIPro.Web.Transfer.Chart
             {
                 var systemCode = Funs.DB.Transfer_LHCSystemList
                     .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                    .GroupBy(p => new { p.Commissioningsystemcode })
-                    .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
+                    .GroupBy(p => new { p.SubCommissioningsystem })
+                    .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
                 int indexRow = 1;
                 ddlSubSysNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
                 foreach (var t in systemCode)
                 {
-                    ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
+                    ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem));
                     indexRow++;
                 }
 
@@ -86,7 +86,7 @@ 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 Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId
+SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId
 ) f
 left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
 --piping
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
index 8bca2f21..479c5b07 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
@@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart
             if (!IsPostBack) {
                 var systemCode = Funs.DB.Transfer_LHCSystemList
                     .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                    .GroupBy(p => new { p.Commissioningsystemcode })
-                    .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
+                    .GroupBy(p => new { p.SubCommissioningsystem })
+                    .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
                 int indexRow = 1;
                 ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
                 foreach (var t in systemCode)
                 {
-                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
+                    ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem));
                     indexRow++;
                 }
 
@@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart
             #region 统计所有
             var systemCode = Funs.DB.Transfer_LHCSystemList
                    .Where(x => x.ProjectId == CurrUser.LoginProjectId)
-                   .GroupBy(p => new { p.Commissioningsystemcode })
-                   .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
+                   .GroupBy(p => new { p.SubCommissioningsystem })
+                   .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
 
             if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
             {
                 systemCode= Funs.DB.Transfer_LHCSystemList
-                   .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Commissioningsystemcode == ddlSystemNo.SelectedValue)
-                   .GroupBy(p => new { p.Commissioningsystemcode })
-                   .Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
+                   .Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SubCommissioningsystem == ddlSystemNo.SelectedValue)
+                   .GroupBy(p => new { p.SubCommissioningsystem })
+                   .Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
             }
             #region 九个表的数据
             var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList();
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.Transfer.Chart
             dt.Columns.Add("进行中数量", typeof(string));
             dt.Columns.Add("未完成数量", typeof(string));
             foreach (var t in systemCode) {
-                var scode = t.Commissioningsystemcode;
+                var scode = t.SubCommissioningsystem;
                 AllSystemNo += "'" + scode + "',";
                 DataRow dr = dt.NewRow();
                 dr["系统编号"] = scode;
diff --git a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
index ebdf02d7..eea03c21 100644
--- a/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
@@ -81,7 +81,7 @@
 
                         <f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem"
                             FieldType="String" HeaderText="Sub-system No" TextAlign="Center"
-                            HeaderTextAlign="Center" MinWidth="120px">
+                            HeaderTextAlign="Center" MinWidth="180px">
                         </f:RenderField>
 
                         <f:RenderField ColumnID="PlanStartofTestingDate" DataField="PlanStartofTestingDate" FieldType="Date" Renderer="Date"

From c22447b0de7d0ed7c87557e9aae37bf033de2a75 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 3 Dec 2024 19:06:14 +0800
Subject: [PATCH 2/3] =?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/FineUIPro.Web.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 7209e7e3..11c97548 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19321,7 +19321,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

From 20cb5d9fefc9c71f4ccaf15e448e430248a10a14 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Tue, 3 Dec 2024 19:20:00 +0800
Subject: [PATCH 3/3] 1

---
 .../Transfer/Chart/SystemstatusEdit.aspx      | 27 +++++++++----------
 .../Chart/SystemstatusEdit.aspx.designer.cs   | 18 ++++++-------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
index e48fce87..51864717 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx
@@ -74,24 +74,23 @@
                             <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
                             <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
                         </f:DropDownList>
-
-                        <f:TextBox ID="txtTurnoverDescription" runat="server" Label="Turnover Description" LabelAlign="Right">
-                        </f:TextBox>
+                        <f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" >
+                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <f:ListItem Value="N" Text="N"></f:ListItem>
+                        </f:DropDownList>
+                        <f:DropDownList ID="ddlInsulation" runat="server" Label="保温/冷" >
+                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
+                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
+                            <f:ListItem Value="N" Text="N"></f:ListItem>
+                        </f:DropDownList>
                     </Items>
                 </f:FormRow>
-                
+
                 <f:FormRow>
                     <Items>
-                        <f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" LabelWidth="180px">
-                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
-                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
-                            <f:ListItem Value="N" Text="N"></f:ListItem>
-                        </f:DropDownList>
-                        <f:DropDownList ID="ddlInsulation" runat="server" Label="保温/冷" LabelWidth="180px">
-                            <f:ListItem Value="NA" Text="NA"></f:ListItem>
-                            <f:ListItem Value="Y" Text="Y"></f:ListItem>
-                            <f:ListItem Value="N" Text="N"></f:ListItem>
-                        </f:DropDownList>
+                        <f:TextBox ID="txtTurnoverDescription" runat="server" Label="Turnover Description"  LabelWidth="200px" LabelAlign="Right">
+                        </f:TextBox>
                     </Items>
                 </f:FormRow>
 
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
index f213fe79..df23916f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusEdit.aspx.designer.cs
@@ -140,15 +140,6 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlSystemStatus;
 
-        /// <summary>
-        /// txtTurnoverDescription 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtTurnoverDescription;
-
         /// <summary>
         /// ddlElectricHeatTracing 控件。
         /// </summary>
@@ -167,6 +158,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlInsulation;
 
+        /// <summary>
+        /// txtTurnoverDescription 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTurnoverDescription;
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>