From f6ac1cc5615fe352c11571559787c6e049bc832e Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Fri, 26 Jan 2024 17:13:51 +0800
Subject: [PATCH 01/31] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 551cf92d..363c2786 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -24,7 +24,7 @@
                                 
                                 <f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px"  LabelAlign="Right"></f:TextBox>
 
-                                <f:DatePicker runat="server" Label="PUNCH_ITEM_FINISH_DATE" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                <f:DatePicker runat="server" Label="PUNCH_ITEM_FINISH_DATE" ID="txtStarTime" LabelAlign="Right" LabelWidth="200px"
                                      Width="280px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">

From 36fdd9cfa6a87950084f48166c8b387f3bfdb3fe Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:15:34 +0800
Subject: [PATCH 02/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2024-01-26-gaofei.sql  |  46 ++
 SGGL/BLL/BLL.csproj                           |   2 +
 SGGL/BLL/Transfer/RotatingEquipmentService.cs |  79 +++
 SGGL/BLL/Transfer/StaticEquipmentService.cs   |  79 +++
 .../File/Excel/DataIn/Piping导入模板.xls      | Bin 0 -> 22016 bytes
 .../DataIn/RotatingEquipment导入模板.xls      | Bin 0 -> 21504 bytes
 .../Excel/DataIn/StaticEquipment导入模板.xls  | Bin 0 -> 21504 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  40 ++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 SGGL/FineUIPro.Web/Transfer/Piping.aspx       |  44 +-
 SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs    |  25 +-
 .../Transfer/Piping.aspx.designer.cs          |  54 ++
 SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx |  68 +++
 .../Transfer/PipingDataIn.aspx.cs             | 421 ++++++++++++++
 .../Transfer/PipingDataIn.aspx.designer.cs    | 123 ++++
 .../Transfer/RotatingEquipment.aspx           | 135 +++++
 .../Transfer/RotatingEquipment.aspx.cs        | 223 ++++++++
 .../RotatingEquipment.aspx.designer.cs        | 222 ++++++++
 .../Transfer/RotatingEquipmentDataIn.aspx     |  68 +++
 .../Transfer/RotatingEquipmentDataIn.aspx.cs  | 417 ++++++++++++++
 .../RotatingEquipmentDataIn.aspx.designer.cs  | 123 ++++
 .../Transfer/StaticEquipment.aspx             | 135 +++++
 .../Transfer/StaticEquipment.aspx.cs          | 223 ++++++++
 .../Transfer/StaticEquipment.aspx.designer.cs | 222 ++++++++
 .../Transfer/StaticEquipmentDataIn.aspx       |  68 +++
 .../Transfer/StaticEquipmentDataIn.aspx.cs    | 417 ++++++++++++++
 .../StaticEquipmentDataIn.aspx.designer.cs    | 123 ++++
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 SGGL/Model/Model.cs                           | 530 ++++++++++++++++++
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 30 files changed, 3871 insertions(+), 22 deletions(-)
 create mode 100644 SGGL/BLL/Transfer/RotatingEquipmentService.cs
 create mode 100644 SGGL/BLL/Transfer/StaticEquipmentService.cs
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-26-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-26-gaofei.sql
index 8bb9d8be..cadd0a7f 100644
--- a/DataBase/版本日志/SGGLDB_WH_2024-01-26-gaofei.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-26-gaofei.sql
@@ -53,6 +53,52 @@ GO
 
 
 
+CREATE TABLE [dbo].[Transfer_StaticEquipment](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[StaticEquipment] [nvarchar](50) NULL,
+	[SYSTEM] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[TestPackage] [nvarchar](50) NULL,
+	[TestPackageSTART] [datetime] NULL,
+	[TestPackageFINISH] [datetime] NULL,
+	[MechanicalFINALStatus] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_StaticEquipment] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'StaticEquipment' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Transfer_StaticEquipment'
+GO
+
+
+
+CREATE TABLE [dbo].[Transfer_RotatingEquipment](
+	[Id] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[RotatingEquipment] [nvarchar](50) NULL,
+	[SYSTEM] [nvarchar](50) NULL,
+	[Subsystem] [nvarchar](50) NULL,
+	[TestPackage] [nvarchar](50) NULL,
+	[TestPackageSTART] [datetime] NULL,
+	[TestPackageFINISH] [datetime] NULL,
+	[MechanicalFINALStatus] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Transfer_RotatingEquipment] PRIMARY KEY CLUSTERED 
+(
+	[Id] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'RotatingEquipment' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Transfer_RotatingEquipment'
+GO
+
+
+
 
 
 CREATE TABLE [dbo].[Transfer_Instrumentation](
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 541c99ef..3a175126 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -769,6 +769,8 @@
     <Compile Include="BoSheng\BOSHENGMonitorService.cs" />
     <Compile Include="Transfer\PipingService.cs" />
     <Compile Include="Transfer\ProjectSetupService.cs" />
+    <Compile Include="Transfer\RotatingEquipmentService.cs" />
+    <Compile Include="Transfer\StaticEquipmentService.cs" />
     <Compile Include="WebService\MCSWebService.cs" />
     <Compile Include="WebService\CNCECHSSEWebService.cs" />
     <Compile Include="WebService\CNCECHSSEMonitorService.cs" />
diff --git a/SGGL/BLL/Transfer/RotatingEquipmentService.cs b/SGGL/BLL/Transfer/RotatingEquipmentService.cs
new file mode 100644
index 00000000..b20f390b
--- /dev/null
+++ b/SGGL/BLL/Transfer/RotatingEquipmentService.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class RotatingEquipmentService
+    {
+        /// <summary>
+        /// 根据主键获取设备材料报验信息
+        /// </summary>
+        /// <param name="RotatingEquipmentId"></param>
+        /// <returns></returns>
+        public static Model.Transfer_RotatingEquipment GetRotatingEquipmentById(string Id)
+        {
+            return Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == Id);
+        }
+
+        /// <summary>
+        /// 添加设备材料报验
+        /// </summary>
+        /// <param name="RotatingEquipment"></param>
+        public static void AddRotatingEquipment(Model.Transfer_RotatingEquipment RotatingEquipment)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_RotatingEquipment newRotatingEquipment = new Model.Transfer_RotatingEquipment();
+            newRotatingEquipment.Id = RotatingEquipment.Id;
+            newRotatingEquipment.ProjectId = RotatingEquipment.ProjectId;
+            newRotatingEquipment.RotatingEquipment = RotatingEquipment.RotatingEquipment;
+            newRotatingEquipment.SYSTEM = RotatingEquipment.SYSTEM;
+            newRotatingEquipment.Subsystem = RotatingEquipment.Subsystem;
+            newRotatingEquipment.TestPackage = RotatingEquipment.TestPackage;
+            newRotatingEquipment.TestPackageSTART = RotatingEquipment.TestPackageSTART;
+            newRotatingEquipment.TestPackageFINISH = RotatingEquipment.TestPackageFINISH;
+            newRotatingEquipment.MechanicalFINALStatus = RotatingEquipment.MechanicalFINALStatus;
+            db.Transfer_RotatingEquipment.InsertOnSubmit(newRotatingEquipment);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改设备材料报验
+        /// </summary>
+        /// <param name="RotatingEquipment"></param>
+        public static void UpdateRotatingEquipment(Model.Transfer_RotatingEquipment RotatingEquipment)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_RotatingEquipment newRotatingEquipment = db.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == RotatingEquipment.Id);
+            if (newRotatingEquipment != null)
+            {
+                newRotatingEquipment.ProjectId = RotatingEquipment.ProjectId;
+                newRotatingEquipment.RotatingEquipment = RotatingEquipment.RotatingEquipment;
+                newRotatingEquipment.SYSTEM = RotatingEquipment.SYSTEM;
+                newRotatingEquipment.Subsystem = RotatingEquipment.Subsystem;
+                newRotatingEquipment.TestPackage = RotatingEquipment.TestPackage;
+                newRotatingEquipment.TestPackageSTART = RotatingEquipment.TestPackageSTART;
+                newRotatingEquipment.TestPackageFINISH = RotatingEquipment.TestPackageFINISH;
+                newRotatingEquipment.MechanicalFINALStatus = RotatingEquipment.MechanicalFINALStatus;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除设备材料报验
+        /// </summary>
+        /// <param name="Id"></param>
+        public static void DeleteRotatingEquipment(string Id)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_RotatingEquipment RotatingEquipment = db.Transfer_RotatingEquipment.FirstOrDefault(e => e.Id == Id);
+            if (RotatingEquipment != null)
+            {
+                db.Transfer_RotatingEquipment.DeleteOnSubmit(RotatingEquipment);
+                db.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/BLL/Transfer/StaticEquipmentService.cs b/SGGL/BLL/Transfer/StaticEquipmentService.cs
new file mode 100644
index 00000000..bdeed534
--- /dev/null
+++ b/SGGL/BLL/Transfer/StaticEquipmentService.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class StaticEquipmentService
+    {
+        /// <summary>
+        /// 根据主键获取设备材料报验信息
+        /// </summary>
+        /// <param name="StaticEquipmentId"></param>
+        /// <returns></returns>
+        public static Model.Transfer_StaticEquipment GetStaticEquipmentById(string Id)
+        {
+            return Funs.DB.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == Id);
+        }
+
+        /// <summary>
+        /// 添加设备材料报验
+        /// </summary>
+        /// <param name="StaticEquipment"></param>
+        public static void AddStaticEquipment(Model.Transfer_StaticEquipment StaticEquipment)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_StaticEquipment newStaticEquipment = new Model.Transfer_StaticEquipment();
+            newStaticEquipment.Id = StaticEquipment.Id;
+            newStaticEquipment.ProjectId = StaticEquipment.ProjectId;
+            newStaticEquipment.StaticEquipment = StaticEquipment.StaticEquipment;
+            newStaticEquipment.SYSTEM = StaticEquipment.SYSTEM;
+            newStaticEquipment.Subsystem = StaticEquipment.Subsystem;
+            newStaticEquipment.TestPackage = StaticEquipment.TestPackage;
+            newStaticEquipment.TestPackageSTART = StaticEquipment.TestPackageSTART;
+            newStaticEquipment.TestPackageFINISH = StaticEquipment.TestPackageFINISH;
+            newStaticEquipment.MechanicalFINALStatus = StaticEquipment.MechanicalFINALStatus;
+            db.Transfer_StaticEquipment.InsertOnSubmit(newStaticEquipment);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改设备材料报验
+        /// </summary>
+        /// <param name="StaticEquipment"></param>
+        public static void UpdateStaticEquipment(Model.Transfer_StaticEquipment StaticEquipment)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_StaticEquipment newStaticEquipment = db.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == StaticEquipment.Id);
+            if (newStaticEquipment != null)
+            {
+                newStaticEquipment.ProjectId = StaticEquipment.ProjectId;
+                newStaticEquipment.StaticEquipment = StaticEquipment.StaticEquipment;
+                newStaticEquipment.SYSTEM = StaticEquipment.SYSTEM;
+                newStaticEquipment.Subsystem = StaticEquipment.Subsystem;
+                newStaticEquipment.TestPackage = StaticEquipment.TestPackage;
+                newStaticEquipment.TestPackageSTART = StaticEquipment.TestPackageSTART;
+                newStaticEquipment.TestPackageFINISH = StaticEquipment.TestPackageFINISH;
+                newStaticEquipment.MechanicalFINALStatus = StaticEquipment.MechanicalFINALStatus;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除设备材料报验
+        /// </summary>
+        /// <param name="Id"></param>
+        public static void DeleteStaticEquipment(string Id)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Transfer_StaticEquipment StaticEquipment = db.Transfer_StaticEquipment.FirstOrDefault(e => e.Id == Id);
+            if (StaticEquipment != null)
+            {
+                db.Transfer_StaticEquipment.DeleteOnSubmit(StaticEquipment);
+                db.SubmitChanges();
+            }
+        }
+    }
+}
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
new file mode 100644
index 0000000000000000000000000000000000000000..26f8263cd3aeef16c15e11395d5dbac067b61c56
GIT binary patch
literal 22016
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

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
new file mode 100644
index 0000000000000000000000000000000000000000..251118300589667a055036939787b9bc0e77d4f4
GIT binary patch
literal 21504
zcmeG^2Urxz(!I+9i;92*kswQuBsqu~5HXSj3@8SKMNkw)^ibi%!09QTDCXllBj$WY
z^voiP9xBS2!JN}6hEw*hn%OWrJG(#Ld*A!--uL%@Ju_WhT~%FOU0vNfyA{6~Rj=G(
zQA1d%Bheyt5<Q~Bfb-xPGnEVp;ll%#>m(8h4I~5}|3CeMH1Gvvb&`&u0PfC^am;lg
z3nA-4ZUDI<<VKM7AvcC>02xex7(s3V*%-13WK+mykefm_hujRZ1!POeR*<bBH-~Hk
zSp?Y@vK?f5$PSQOKz4+THYLmdAa(xZM2#lt@X3U+2qmN7o<Syn_UoU_h_-yrqdyP{
z@k+=M>PoucZQJ>P;Q>+Ccq@8%O~Jbsz;d-|gucK%gNz_UDLF>az^}MAA$%T^k}1AE
zO%Z=|2#py^Vxi|*(DTkD0j>%4A;7>f0scHFW1mn4MwQ0L{<NAvdog4j83~^RO84Di
z6p|^OAS9Ed!t*E%l$?P-^2NDZU;a3s%cV3?b`%BWM;fRb_WZ|r$ejOJ=9>Qq$N7)<
z|4;u64d@9C2~UR@EaP8BmrwcpKMgwa9d}#Bbw!H;134nK>i_f|<&gy()$j=X>rfO*
z4m4a$(t9;LB3yQ7!=YNa9bKmAVO=#{#zz{D`(9^5!)13_JC(9jPMN&2y9{4;m$j4K
zW$^!_yJEbnrTwSxpDD+t&^weVyHIyW4^zK{iqYXqogt$M4r_JZ&u>0PrWkITCnPPM
zc3t%XSP^7h$XFi)8GTka$QY}{LdIAm2{Ohi*^n__nF$%=lLe5G(|T}r7=vJ2O!$oL
z!^ES~$EVX}jBUbG6Eo7srYC2LLbDRZX%s)Q)XL|;(-K|~)RX>Z^7Rahe<i8wKg!9!
zeC~3QhoxcRV(7oy$E}?Krp<zxgCZ&cj&U05BnmS6=6;Yd218w-?@oh^eaeK4x<K7v
zoQCtC=xCD-Hs^H9a(P4tlu`p)+AcUs>FN&P#FNnk)&yETqW?_lM9GlALp>aUj&%Sh
z#RHfYSO6b-(u|T0R)45Brmov4+=JA$17!z<4DDO)&>ApMH~siQ6y6-_YDZlg!<9$&
zQf;nL5O0WLUje>kasjH7d<X06>;W;62)_YkA^F$g>gfN%$=3q-@<5)0lu3XE@PZ*y
zNQLMiji6NAtyt3Xm3yHl>jeXz0&z@hLUAGAG2m`$-~u&pl$MJQYR`m&?+uuTjVL%z
zi7(<CapLn}6jbFzzJ6-pdYo`R%n<2lGWv^r8>oT%se!lWg!4!sCtpH3a^ef5`eEw9
zf|!GzrTyg-zVhf>5F7>dwbfw5(y?Z>Z7wi}SPwjb-C8?)H+y@pcJL7IPCYgkSi^jW
z-J85_K(sh%AQPcEIAPe@$q+oenC+p|Two7kfn#N2u&7XI0mPN~5HeT<h^``v{a{f$
zX;CVV0$}HEM-_qwi<%2Ohzoq6DYKoch}p<hq|_pixRJKX%s>bQd1+H67!U{yR4{Et
zTEeVTFqPrT`6>XcmKI=b5FN)m(4BN?7w;^6j(2G;umOF;K3P#qDN6}O1R95Jv=jyT
zFlay#$+Q3>A{LG^B`Kml*$x9lMtUZBPMFXxs2WTU(>n>YmZu{kgyYikP6ErsTUo`w
z7mif9=>Ipvc{ob)MC%i`UK;g}o*t9HMtNN1aCbFuS2b`CHE>Hca8EUGH#Kl;HSmUN
z;OgX2N8gvCgTW?cKXN@ZR|BWzQN^d_QH49Gq2sLv?nlAt`69xRk|x>s>e1u-K^czW
z8JGQI2ur~$si+Qi9yA>cX&G>6PQ&q7P6`*nBSe8LIBWi5m`LHv^+wwd%yb&g!pEaN
zWqjJMFyxl<O@O6ME~hqlTgskU{nZAS&jrV@l%li1$Y^oH#SMwTjMArx9G;wf*ygYe
z5d=_hJZhluS#n}n%LT`9SSsfbcm!`N8<&;<7ZIW&rwb=s)lNF9v4;j~;BC~vzt-OT
zDLSxF)BTc<V@nE-N3Sw{(t4xyiN~=rIIU-TUgHrhm)>Z<1XfXGWMtOR493NRqEBEU
zr2Lp{A0^eNF3{njdb8|ALGUqTz$vwVP=;Fp{unK=qAWW*3ZGAp3mz4Z)&jmCl;OBt
z<HAS2G=07bUs@g`L$*9LT%?4LeA)D~g(f5$_lWWoMsz+oNpghlBu5Dj5f^ME^kLnE
zT_)&(5NgGRD5Wt3Tzu6AbXflt4Uq0valrA>*dUnI2b}3z>id9ksumF^BV7p9AQ%&g
za)fLm=oach1g%Rw5%dZ5Ac7~B>WQEOsRt3XAN54g+th;y+Jbr_=$h(51XmFCM9`1@
zuSCkjG>;BCjd~E#JUZxM>On;F=%72Q2NBJqgTAXCL^O{MI-+_I(L6fnJrqQspgjNS
zx#Q!jd34al)q{xU(Se1yK14K+j;MY_G>?vL{fKBD9lQDwQ63$(ceV#28eJi~K?|h@
z=z5v%oTuvc9F@dmH{c7U3xnqIcd8E&NuXvT&h;U}wnTRSU4V!}VJh8G?Z2y>D=utB
zL`T9@7$5B)D<q}oB?=eE=Gs!u6>;&KEhQqVT-^YPo-kB{1ftwP#`V-oCfDAqWzQXm
z2-Giox*S8t98OpTsgxs}$0F<ngmo#xDBY(VHPXF#^G2={WQNF-Cr_5h2qQB#OpgHr
zbSgFAfT;=vrx;S9a8xlV=~$++wQJX^2o)F@s3H^-CKC!_G-*6iqlIU}RD&Tn3X+<e
ztfNXosW$LcY5?4n2VT`u{GfrtQdGu5rejGiPu^`+A^~zDYITPdn&)Th`VrCW<lEGb
zh-N3>wthr3JNb6?Bcj>Kx33=&Whc*$JUhsVpb-^`SvDcFY{}Ci#t^gTY)5FSn6qfL
zN|q=i!Zl}^Q$c1=Oj!M=2V1B>mQdrlg_4vnmG|u5??~9rItYZKmk3mMF3D9EDo2>b
za)-fyrVW!rx)Mmr<qc%Q?%cUkLZrQrX^?_R-Jwi_Oqk5U$YH=GN9fGr9STq$r;k^~
z?eZ14U6pX5Aor%KbbBh{GPj6@{KoLz7Ff5Jo0oorh+zE&g?wB17NjxZ`4BI7IZ8y_
zA-5f@l|Mt=cR<mSjHx2nh0hm8LPn-^;t85d8pE-=`WEN|dGNK1u0Wi8{r+o-Ha?>y
z;6Pj8J{9>k(ahI}gRh-NzUbYhe6_{NZ*Jb;=4-5(uP+B*M~!@Ok&yD$5hp)+eUqE7
ziDtfj9DH3h@}<`rO3%9D<ongnxcQoD=IhVF*Fz&;e?@<VFupJT;O1+lnQto&zCIfH
zwo>rb6DNOpe3hGTQ{?NX!8%p#*#`J(Y9SwAL3!A|@_XET%{BAovS)jZe3|xK9`<1W
zK5o9vH1p-MXD5w(nf6>BR(0<nH(v|Qe7WqorAEF?doB+vKXQ$mucc<bT=wj#kuTGp
z%ft5Ee8kPyN;6+Bd-m1Hmub)CVV^Jm!p+wj`L_Bhdlms-O)V7m?Bly|R~5|{W*5Fx
zCil<HHS^`NX9taZnfC1Cdv)<bZoW2}`EuE_vqrv5d-m}?c4ZkiUy)|MT=wjykuTGp
zeSCMWEam2FtC=sCJ$q^7%d}@7-@<d!^@u&bcAEKe*|VQUzD#@e@%?n9fUCdy@GdsQ
z5)tVcBNNg@zVn3vunvG|@+6T6Nre0r)ij7l=uH?$3?U#6x!RKXLMtT_JZ)`>7WsC(
zPITo6q*}<=gU|-v#L-PzvShxnr82UXfrL-62BS=h2W+iuy5~^yfLF-Zhxf$=bXz(W
z>cDDm2rtKCd#uHI#iqg61wHG+UM+IUAy5cXbW%{nS;VGjB&SHv7&R0nf$NXll2UY5
zP{jGcrr1PIk)8``DALY=Ps!+_poo_5$?CPSoFZDes^%cV(}geMc!c+2;Cvz4Fb)Ns
zcsxsZzwgCBnHSQ=eKj1|pj7ybr#ezE1ZvAAFv1or0t5!F^`H~qBf&yA^=X+a1T1%D
zEWQxzAa73Hg0+b<5s^H)IVpKv_zn?7%!yMK(E>!wiDQb0r#mtc;q@pP4LyjN!MM7n
zwHq>D*i~5qt!5x6*5GEHQaUpT)?pY14|anJGtr?s<&i5;?Yg!ANIK2o4Z@CK*FAG}
z0ZXLJSX&oFMXUj^Zh)dGTs?RONmtHZJZZi#UAY0@49H>)Zc8zwL`~uDQ`TcV%AmA{
zQe!3Vm1wCIC81KCo>HlhZvZnyoA8dL+#l9ECZt#Ul=;GOEGe1-KSe!L7Cb1TGzeXh
zFH<sEaQmx6X%J<hOEOvLl1vu5gtGXcEO);@GtX(r46)m=`9j?2P@1AHJib5hQ`9pp
z2)iz|Abs#o;2x4^_lTvbuqFz>AxsomEt3YwDWhQku_wrab}G|LAWIf=kVR21b2Hdk
z`M99{AOMe+X#4Tc)dI_Cu1rc>3j_*@36Io?Ua$yziZ;|LR|ha1SeQBzT{$Mxj!a1a
zxNx58HZeq*fWR7DIU7qhqZA$ywuT^vd`t`ZrtpHF3Vn2xZ2Gn;^qC<Bd;uR7u4*$#
zzl|z=benAYEmY_;LkU8DEQ#Z$-&U1AI#D)#7Zv)<kO5p@(kgEH?NsTbi)GVySE0`g
z4G8JE`4l((_Nw$T9AMM;R-w-f0SI}&s0$Z;J<<XF5Wm1Zg1!9ncvj$tutsJllu5%;
zn#>Os!Fii>?&-mcjzFhy?x$X={>&8UU=7oUF#Q=i0wsTj0EIuJOH3cagM$-#hS7Bx
zRs_=g#T@)iDE?w4{&?gh>qlVVcxC=y?@t9JC|3{WEo*h<>%qKzGw|^27YnD4S6%*c
z;RH>tz+mjaqqH;g<_ibG08^fiy72f7paWQghiS3}K>~+qGM|eFVG4cGC7HhHl1yK8
z=?7sy@&kiI0q`+`Pb{pZL*Zp(G5l016Mi0sPvMZ0;3Z`I=~5ebJt>uphlntffe{9<
zVI&1$-mudd!o#z{JQyECJe?&vBql{H&h$ozLl6VvgOD@942bVCp*dN`kc(cS>31tu
z!|Us-8Fkn$AN+kE_#EX4Arms}0grqpOL+L+4xI(?QV9tU4e1sf(LE$M43#GYmnloO
zghGgki-`>l7X?Rj7R83f#EPPVLwW{x4Hd<NhJ}X2c8`o;w=<>N#fryfilPz{M<fgr
zi((Q}#7X1Q#B5w0CJ%O{p0sk@(6JN7W{O9$>l>*uVxu%sMG?is21m!T5sf(zyL6A}
z9@CAD*_6f%7bm79j7m*}%>m#Ahlye`6Eeq*Wn)X}MyEq<>ZoC&&@tmuM~@Vb$`r9N
zC2-IvB!76&KiX&sUzT--QA-q>L6!{({bL2Xv`FaQXc40Zp;0}x1SVir2(~3tXB{;D
z1W#6AbjENW5RyJB6Ic(9oiJKFcA!Vr$h6J#&JI8BWf=NCuWnk!p5HSLIIsQv{HpHX
z<hWflFu%9MefZqzetKoMzj?MV>VVKa)826C`K6P3Z=HL0MPu{AKVl#E9+Z-olyi6e
zrni5-a4D&B^^Ve-=Ct{(Ug4mss=oJMn0UD?EslM>yiI%a!nC>eYi{T|Oi0bKnsVQw
zo$--xgJwL~<NPB3-HC2RuTNBr`{>%RbJdE8(@uMO%_`l#;?<uY8#&}IY1nU5sc%C6
zRTmA9Rl9BP?4>*W+ef~)_naSk_xZObsU4>^{r#N4_i+4>cY#klAL<PF-C*;cu8;4;
zPd;J$#r=Bp2#><Cb(JLr9_Aj4_x_Ub;P93}P^tvtZDm!hy|V7%5l~SpsD(EP$>0oe
z+E`ByyiT9{8>pz!jF)+brd`PCb@8})i}9Xo3qm|s=a3rb$tiZ0*Dar3k1W+`P$HbZ
z=H>eh9qP8u{#di%p~!66MxEn#LITgG)Qs<Nc=FV;yfy1u2nS@1{%-Z8>$?XZjJmM8
z{W)*TwcYl3Eo@>i^J?V5=&hZSE|eKw>=An1Z>YoMb@RpyuCiIOyjgXtuuJdEqN@Ui
zY@NHlOtR~^SNZbDqm#F}-47Lv3Rn=9dT;2;^`3WQ4i&5yZ>(%yv3uXgD_=M}I%2{i
zvuV)5S&;EXkIWSDNU<m58lEr;CTs>8N2Bua2FFE)K{YumzbUvHkXYgzI&|mRttGW2
zq{t$;bj8J=uUFl_J1yY+ZIjDC_SBDaE7H}UB|hgdbMLEcw{@25uXVFJ>6TVgYWm=D
zmU-DPbBu3yKRvcrj{W6=ye+$LimvQ#dD-@*+s#4y9fo(9-L>zdOYdFogg$NQ*nr=f
zTliU{p6P6a@9=(w_gu`lg!e|VpT$L{Tlt$DwtsECdH=er;o~o*RfaFT`K(n%@tmF4
zS2aJh>sGUX<*!fII^MJ#KDS%9nN#<P#@x-#?Xl&=+U#XPMkX5uPZ>5Td3@2hZk_B6
zD>^v%*8cWVGU?me_>wxWghvI!?h~#xe$sb1&o1?Jso$JyM{g!fPVEpBU6YyLEV6sM
zB}UESZ)d;%X+&1YNe5fum30|fd#Cl=kd`<h?mMsi`=-n1nLKcecj$L?)67Msd>h`)
z>F(PqhmSa`SDcy~T|}<7E7a5PzCEtsx%Y~nTsP=;a@1MoJZ8HvC4ON44VOnGU;eOS
z>y8Y^lCTva<=1$xEdE$+J7GQl#P(RP3yp_AXzG?eXuv7Uk9NfoaRcJ20uE;n{B=n7
z_Mus`Qeu6!ytmx4>3WMCts%pWs-C_(aA;!p-^gh5sptDFay{2&@}XNUDSd)!$IKhQ
z_sVAf`0Tv8CsWI}M6A1%c7JETRXRyFmJL6=yVgH(#L1(U1t$ZVzM6Bs&)$*;)%vIJ
zRGGc{vT4ii?`8+ASaRX*5Z)H+YcC&G_B=g(m$hfMb@kKTRvo(r`z;t#92b_gv1t9%
zJ4p`CgPsiSQe#`OLJ(NJ%AnhqW7}7`MDNNE8!fc`$+M#9mCn(H&Dxoq$+JCYQWjMa
zwtL!p-$swU*S-IAa__dm?L#1U`1bAR4;Ktd=i1l=e!6ur!|X-1-$sw@cki4IPyT58
z>G{>Z+m>fPC_U?1_wZ%MPmfC@zXWw#yT7w%;N(wd|5)dF_``>)^yOLA1Nd_{zOoIU
z*?Di7(Y1$qkCGeR?Ge%C&d`?Mc^98=V5K$E;PLWV*459OC3lRUvF}ug(~4Oias!GD
ztm1TcEOC8OlkFQ}RqgR`^YOeY65zjWR^E(Des6r6UUD5}b2r51rALHyRc&!IljtY*
zSLb|h|DgHt4abbSf8S~14>pE(F1+Zt_J@Jrq&n}rXPoyUrt)azi21hGZKn7Q{w2it
z)!A|<(Y|Xt&b{bRSyR65U8^>k^9l@?Oqg!d<iV2HI?G*)K6Gn5=GaD^!+E`*8E1GI
zCzw_hHfV2cbgEZ+*qXOn_S*;Do^>g`Q{L;6oW<vwG<7lQ@an?Byf)kH_I?ZwIMw~Z
z@y00@eRsSp(-QW|uif|N=r{X+wEblLIrmb`&78SSN^cHpI<>?vqw_M|nah_pnCqEt
z_~OLNA*URdEOFJ^eRD&lUbtj)+VxL$d(s~M`McS(iND^v+NRg$$m3rc_I%rFdGRE{
z&Y@#wPaLrFcArPpfrD2@p1pr|+u1*&8};rVFm2D{R_<AM##h(oXWh9Gurgo2GJoEH
zi<vb|_N*FXqvNkV)~v<-t8TMvdOh^po-umfk!1ZQ@i{@g+s_=MW1W4|@8i7k?p>RR
z<Bu6#Y&0o#MDgebQMKe+Wmn??Ar5^?veRbteK&dx-=)lagWcF_ck?a7`47c=Ci*)y
zIPk?Zd7OLY{{5Hdq!hPrd!xs~-QS;EX&p9bqt3Lo{wqs^E1FGNSXJ$?E$(=kuCLFP
z@q0VE-dMGzfBV6+W+&yBI=r8EWzvPN<L<7p>tkkeVdC#YDoV?IH}|Qzaxv+4?)3>p
zvEr)Mc>`+>1-y<nI+`~ue{p27ea}s0Wzm_Hjr*Tln4H_GX!kTdt7SFbWk;Sy?_Ibg
zbhN&yYr^rm@}yRA9p5K!iYgDE+BSY>zY<U9XO&aJy6v7LP7666cHj0$^trM#hc60t
z4O+xsK0LFdOP?xR^Ez*rBR^~%QI^!HQ}1!(#htI8|MkJz1(Bvk)3UOscS&=t_1-sl
zhU+8W;wCRThJ{vmj!s;+Wn}S<J4H?d-z_h%e%3lUF8_~=O)<ZmPHGsivj3SOw_NW`
z88ztYoQ$S@Pp<jgVnek4UCC0{iGfqj&b+*%Hb}Vm6yN?Qm*=?+O~<b96c={<*Ict>
zm5pbb?R%G(Ds<g<pp`_sO{HYy`8W&5Ej3{qYE!2R^1gICIkljJb5F-l=S6*fd+*V6
z{{87;oqL~HxYTq~=f--LPb~Hozpo`H4WAS*yC*(U9dYXCKbH@yaK0EG;eWfRN1qpm
zTItrkIA7}M>wN!8!leq6TF+3wD;e!<N^ZG%*52A^H*x5#WdB*4ThD2h-*?Z<K5MN^
zPIRz~AH8X}>4@OF3zKcFvc~jEG<UOH)oAO2f;z1~ZA@)<4GwwxUE6zqMh!5^zF2WW
zlqTA^IPLC~%qhQ2vrj2{wnE=A{LGVu-|W3M{A6;D%gD+b+AVGydsNK-sq}VJzwuX#
z_CG6%KNyzy&}@9#$kGUZ|E$`iS;s2Yw7zIwy2K#mvgg3;x5Vm@epAnw;x&4XA11c&
zdRw7oys_Z(qSbK+KGNq1>=;D<Lcz~_U{$k(h1-d>y3z3nwM;V>XlZ;B-r$&*$@KSA
zzY(UVUpino&++EWiY=8|)9?A~w+eLV_3XL+RyU!?jD%m8rj{)JsmwUh=azTMMhjuv
z#|y_SJ34aTvmb(@%_6?P+AeAPkf}eU2Rt_&Hm|31xT8a~vxoPRjK)qq3X3Xc#eU4)
z+IsceKKJZa7YCm%sp$58T+WKuKk~9qIvg5mIO#HJwkT?uWY?G07T*u^v@si4*DHAJ
z)jVzIRj10U?SI@DCO9+Tz=0FDp<{IT#pAofs}Jg8RX}4Tj>t8tr!oO{1gB`-67<Q4
z=hzL|5s{*y3B=8e$cT=T80u$JVuvRRN*A~&QNaqE2HOY}G`7L}5KL(_m_$@hZG6)S
zHpJRwAoPAC?)S)#uu1%pv0;D;k`J(a1`P2Knf^Vrq0;Z68}d!Cno78hb%b|=mIvZ*
z%VBR0dq+NOg$<}@Be>%4tcB$BhSwLvheibsrr@p=yd`y=N<ng|tqM)E1sw1Z;>Mc-
zHAi6^L;s7;Gzxn<b#;_uKMHhWJUh#uUj@1_o>vk(I1EVw>F~pc-#+(4!5~$G-1MDC
ziiD1k=`z<9rJ_@BpdlnV&{s^Z#+@jsu#EJHzM>3gL*$8pqO1j9xNK~qC<|b7?#igg
zks^kQdL5V;u9k|jF7)HFuoJ}>`N0_RE(`IeOOW7g8R|w|arA_I+}Y!alC-}(1NcK4
z_=gJ$)|S#i5Wv1rV@=?nUog=n9{gDi;{8h1@uAcOWT)!{q$ky5x=tHPT|rK)!xkYR
zBTWUh(HUCFN_;4x7HLc^_@@GVn~yFDNOzziD``Usy(3+xLwZo7Sq0Y$fSQ0T9r;bj
z9?H6d0D>>db%i_|?0B})7<PjHSTZ15x|G0p{sT|^rBJ#oye}1){<7mGu-BoEJ%$OJ
zl3@%YVAgortJPW4oS-!gB2cMS@ZWtt;0&YZg8-DlgM)ZXiunLvYyGwPpkj|SWxP^j
zMiqnLierXJb<Ftmn9<c}Qkdv5`?rqL4VXxOZ?E;=K1%e^{(Y|6;Gxn<B6W}}rv3r!
z>;8|bHOwXS6|z*Ho}t&ymRdOvyk|NbB9A7KaL7EoKFyVI@E<^Ayz#D7siuG{Y`U7d
zzXJYR{(pssrZ)cy|LH&&e^8tc8CUn+ka3x0|3?n4X^4SmgqYObo5QkzxVV<lNBoLM
zAH}0DX#|MK2!HB?$otn+z2EViYK!fYAk#bv5y3N>3x+P(1lK(*<1-%b_Kb;)%1BQd
zmzddUTxwcUA903K7jU?Jy!?IKy}doWJ-j@;y}W(#Ye*{b;4h`LAap<-vj4lz9xxRD
z0Th{>oSG=6{|ZRt<K^Wml8TILa;Mbf<ks-b1%wp%S3w?B*F9R3w{3Qgq4@k=FaHB}
C9wbNr

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls
new file mode 100644
index 0000000000000000000000000000000000000000..640e800118a16f96a2deb6215a7923151a85a3cc
GIT binary patch
literal 21504
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
BHb?*f

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d94d6880..d96dbe04 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1835,8 +1835,13 @@
     <Content Include="Transfer\Instrumentation.aspx" />
     <Content Include="Transfer\InstrumentationDataIn.aspx" />
     <Content Include="Transfer\Piping.aspx" />
+    <Content Include="Transfer\PipingDataIn.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
     <Content Include="Transfer\ProjectSetupDataIn.aspx" />
+    <Content Include="Transfer\RotatingEquipment.aspx" />
+    <Content Include="Transfer\RotatingEquipmentDataIn.aspx" />
+    <Content Include="Transfer\StaticEquipment.aspx" />
+    <Content Include="Transfer\StaticEquipmentDataIn.aspx" />
     <Content Include="Video\Video.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
@@ -16372,6 +16377,13 @@
     <Compile Include="Transfer\Piping.aspx.designer.cs">
       <DependentUpon>Piping.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\PipingDataIn.aspx.cs">
+      <DependentUpon>PipingDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PipingDataIn.aspx.designer.cs">
+      <DependentUpon>PipingDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\ProjectSetup.aspx.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16386,6 +16398,34 @@
     <Compile Include="Transfer\ProjectSetupDataIn.aspx.designer.cs">
       <DependentUpon>ProjectSetupDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\RotatingEquipment.aspx.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipment.aspx.designer.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipmentDataIn.aspx.cs">
+      <DependentUpon>RotatingEquipmentDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipmentDataIn.aspx.designer.cs">
+      <DependentUpon>RotatingEquipmentDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipment.aspx.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipment.aspx.designer.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipmentDataIn.aspx.cs">
+      <DependentUpon>StaticEquipmentDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipmentDataIn.aspx.designer.cs">
+      <DependentUpon>StaticEquipmentDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Video\Video.aspx.cs">
       <DependentUpon>Video.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c78536b4..5c318055 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index f80d2b82..e0049131 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -16,12 +16,24 @@
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
                     ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="PIPINGLINENUMBER"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
                     <Toolbars>
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
+                                <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="PIPINGLINENUMBER" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+
+                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                     Width="280px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
+                                </f:DatePicker>
+
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
                                 </f:Button>
@@ -38,43 +50,47 @@
                         <f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="PIPING/LINE NUMBER" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="150px">
+                                    HeaderTextAlign="Center" Width="170px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="100px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="100px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="100px">
+                                    HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
                             <Columns>
-                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="String" HeaderText="Test Package<br/>START" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
                                 </f:RenderField>
-                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="String" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
-                                </f:RenderField>
-                                <f:RenderField ColumnID="DescriptionArea" DataField="DescriptionArea" FieldType="String" HeaderText="Description<br/>(Area)" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="100px">
+                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
                         <f:GroupField ID="g4" HeaderText="PRE-TEST/CHECK" HeaderTextAlign="Center">
                             <Columns>
                                 <f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="FINAL Status" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="100px">
+                                    HeaderTextAlign="Center" Width="130px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="PreTestFINISHED" DataField="PreTestFINISHED" FieldType="String" HeaderText="Pre-Test FINISHED?" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="150px">
+                                    HeaderTextAlign="Center" Width="170px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g5" HeaderText="WITNESS TEST/CHECK<br/>BY OWNER" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="FinalTestFINISHED" DataField="FinalTestFINISHED" FieldType="String" HeaderText="Final Test FINISHED?" ExpandUnusedSpace="true" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
index 09da90ac..dc32495c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
@@ -30,10 +30,25 @@ namespace FineUIPro.Web.Transfer
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"select * from Transfer_ProjectSetup C 
+            string strSql = @"select * from Transfer_Piping C 
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(this.txtPIPINGLINENUMBER.Text.Trim()))
+            {
+                strSql += " AND PIPINGLINENUMBER like @PIPINGLINENUMBER";
+                listStr.Add(new SqlParameter("@PIPINGLINENUMBER", "%" + this.txtPIPINGLINENUMBER.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART >= @InspectionDateA";
+                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART <= @InspectionDateZ";
+                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
@@ -154,10 +169,10 @@ namespace FineUIPro.Web.Transfer
                 foreach (int rowIndex in Grid1.SelectedRowIndexArray)
                 {
                     string rowID = Grid1.DataKeys[rowIndex][0].ToString();
-                    var data = BLL.ProjectSetupService.GetProjectSetupById(rowID);
+                    var data = BLL.PipingService.GetPipingById(rowID);
                     if (data != null)
                     {
-                        BLL.ProjectSetupService.DeleteProjectSetup(rowID);
+                        BLL.PipingService.DeletePiping(rowID);
                     }
                 }
                 BindGrid();
@@ -174,7 +189,7 @@ namespace FineUIPro.Web.Transfer
         /// <param name="e"></param>
         protected void btnImport_Click(object sender, EventArgs e)
         {
-            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("ProjectSetupDataIn.aspx", "导入 - ")));
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipingDataIn.aspx", "导入 - ")));
         }
         #endregion
 
@@ -190,7 +205,7 @@ namespace FineUIPro.Web.Transfer
             {
                 return;
             }
-            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectSetupMenuId);
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.PipingMenuId);
             if (buttonList.Count() > 0)
             {
                 if (buttonList.Contains(BLL.Const.BtnDelete))
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
index d7ce9219..9ddaec3f 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
@@ -57,6 +57,51 @@ namespace FineUIPro.Web.Transfer {
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
         
+        /// <summary>
+        /// txtPIPINGLINENUMBER 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtPIPINGLINENUMBER;
+        
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -111,6 +156,15 @@ namespace FineUIPro.Web.Transfer {
         /// </remarks>
         protected global::FineUIPro.GroupField g4;
         
+        /// <summary>
+        /// g5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g5;
+        
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx
new file mode 100644
index 00000000..0fb8ea7f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx
@@ -0,0 +1,68 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PipingDataIn.aspx.cs" Inherits="FineUIPro.Web.Transfer.PipingDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="人员报验" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
new file mode 100644
index 00000000..6288b651
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -0,0 +1,421 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class PipingDataIn : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 9);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                for (int i = 1; i < ir; i++)
+                {
+                    string row4 = pds.Rows[i][4].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row4.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                    string row5 = pds.Rows[i][5].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row5.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 9);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                List<Model.Transfer_Piping> list = new List<Model.Transfer_Piping>();
+                for (int i = 1; i < ir; i++)
+                {
+                    //查询第一列，没查到的情况下作导入处理
+                    var modelOnly = Funs.DB.Transfer_Piping.FirstOrDefault(x => x.PIPINGLINENUMBER == pds.Rows[i][0].ToString().Trim()
+                    && x.ProjectId == CurrUser.LoginProjectId);
+                    if (modelOnly == null)
+                    {
+                        Model.Transfer_Piping model = new Model.Transfer_Piping();
+                        model.Id = Guid.NewGuid().ToString();
+                        model.ProjectId = CurrUser.LoginProjectId;
+                        model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
+                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            model.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            model.TestPackageFINISH = t2;
+
+                        model.FINALStatus = pds.Rows[i][6].ToString().Trim();
+                        model.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
+                        model.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
+                        list.Add(model);
+                    }
+                    else
+                    {
+                        //修改
+                        modelOnly.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
+                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            modelOnly.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            modelOnly.TestPackageFINISH = t2;
+                        modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
+                        modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
+                        modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
+                        Funs.DB.SubmitChanges();
+                    }
+                }
+                if (list.Count > 0)
+                {
+                    Funs.DB.Transfer_Piping.InsertAllOnSubmit(list);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\Piping导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\Piping导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.designer.cs
new file mode 100644
index 00000000..fdc5b39c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class PipingDataIn {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+        
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+        
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+        
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+        
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+        
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
new file mode 100644
index 00000000..e37b9a0e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -0,0 +1,135 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.RotatingEquipment" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="RotatingEquipment"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Rotating Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+
+                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                     Width="280px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
+                                </f:DatePicker>
+
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="RotatingEquipment" DataField="RotatingEquipment" FieldType="String" HeaderText="Rotating Equipment" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="170px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="Mechanical FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="700px" Height="560px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
new file mode 100644
index 00000000..806cdd01
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -0,0 +1,223 @@
+using BLL;
+using BLL.CQMS.Comprehensive;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class RotatingEquipment : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select * from Transfer_RotatingEquipment C 
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(this.txtRotatingEquipment.Text.Trim()))
+            {
+                strSql += " AND RotatingEquipment like @RotatingEquipment";
+                listStr.Add(new SqlParameter("@RotatingEquipment", "%" + this.txtRotatingEquipment.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART >= @InspectionDateA";
+                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART <= @InspectionDateZ";
+                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 增加
+        /// <summary>
+        /// 新增按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx", "编辑 - ")));
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnMenuModify_Click(sender, e);
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var data = BLL.RotatingEquipmentService.GetRotatingEquipmentById(rowID);
+                    if (data != null)
+                    {
+                        BLL.RotatingEquipmentService.DeleteRotatingEquipment(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("RotatingEquipmentDataIn.aspx", "导入 - ")));
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.RotatingEquipmentMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnImport.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
new file mode 100644
index 00000000..ca6bd24d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -0,0 +1,222 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class RotatingEquipment {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+        
+        /// <summary>
+        /// txtRotatingEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtRotatingEquipment;
+        
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// g1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g1;
+        
+        /// <summary>
+        /// g2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g2;
+        
+        /// <summary>
+        /// g3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g3;
+        
+        /// <summary>
+        /// g5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g5;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx
new file mode 100644
index 00000000..ccec8b03
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx
@@ -0,0 +1,68 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipmentDataIn.aspx.cs" Inherits="FineUIPro.Web.Transfer.RotatingEquipmentDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="人员报验" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
new file mode 100644
index 00000000..bdc66334
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
@@ -0,0 +1,417 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class RotatingEquipmentDataIn : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 7);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                for (int i = 1; i < ir; i++)
+                {
+                    string row4 = pds.Rows[i][4].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row4.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                    string row5 = pds.Rows[i][5].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row5.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 7);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                List<Model.Transfer_RotatingEquipment> list = new List<Model.Transfer_RotatingEquipment>();
+                for (int i = 1; i < ir; i++)
+                {
+                    //查询第一列，没查到的情况下作导入处理
+                    var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
+                    && x.ProjectId == CurrUser.LoginProjectId);
+                    if (modelOnly == null)
+                    {
+                        Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
+                        model.Id = Guid.NewGuid().ToString();
+                        model.ProjectId = CurrUser.LoginProjectId;
+                        model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
+                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            model.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            model.TestPackageFINISH = t2;
+
+                        model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        list.Add(model);
+                    }
+                    else
+                    {
+                        //修改
+                        modelOnly.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
+                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            modelOnly.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            modelOnly.TestPackageFINISH = t2;
+                        modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        Funs.DB.SubmitChanges();
+                    }
+                }
+                if (list.Count > 0)
+                {
+                    Funs.DB.Transfer_RotatingEquipment.InsertAllOnSubmit(list);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\RotatingEquipment导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\RotatingEquipment导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.designer.cs
new file mode 100644
index 00000000..bb3f6d2f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class RotatingEquipmentDataIn {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+        
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+        
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+        
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+        
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+        
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
new file mode 100644
index 00000000..3c49f100
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -0,0 +1,135 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.StaticEquipment" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
+            ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="StaticEquipment"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
+                    AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
+                    EnableTextSelection="true">
+                    <Toolbars>
+                        <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox runat="server" ID="txtStaticEquipment" Label="Static Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
+
+                                <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
+                                     Width="280px">
+                                </f:DatePicker>
+                                <f:Label ID="Label1" runat="server" Text="至">
+                                </f:Label>
+                                <f:DatePicker runat="server" ID="txtEndTime" LabelAlign="Right" Width="150px">
+                                </f:DatePicker>
+
+                                <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
+                                </f:Button>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                <f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                            EnableLock="true" Locked="False">
+                            <ItemTemplate>
+                                <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                            </ItemTemplate>
+                        </f:TemplateField>
+                        <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Static Equipment" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="170px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="SYSTEM" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="120px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="TestPackageSTART" DataField="TestPackageSTART" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>START" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="TestPackageFINISH" DataField="TestPackageFINISH" FieldType="Date" Renderer="Date" HeaderText="Test Package<br/>FINISH" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="130px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                        <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
+                            <Columns>
+                                <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="Mechanical FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
+                                    HeaderTextAlign="Center" Width="200px">
+                                </f:RenderField>
+                            </Columns>
+                        </f:GroupField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                            <f:ListItem Text="10" Value="10" />
+                            <f:ListItem Text="15" Value="15" />
+                            <f:ListItem Text="20" Value="20" />
+                            <f:ListItem Text="25" Value="25" />
+                            <f:ListItem Text="所有行" Value="100000" />
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+        <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
+            Width="900px" Height="480px">
+        </f:Window>
+        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Top" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
+            Width="700px" Height="560px">
+        </f:Window>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+            EnableMaximize="true" Target="Parent" EnableResize="false" runat="server"
+            IsModal="true" Width="700px" Height="500px">
+        </f:Window>
+        <f:Menu ID="Menu1" runat="server">
+            <Items>
+                <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
+                    OnClick="btnMenuDel_Click" Hidden="true">
+                </f:MenuButton>
+            </Items>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
new file mode 100644
index 00000000..e774e6bc
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -0,0 +1,223 @@
+using BLL;
+using BLL.CQMS.Comprehensive;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class StaticEquipment : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                GetButtonPower();
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select * from Transfer_StaticEquipment C 
+                              where C.ProjectId = @ProjectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(this.txtStaticEquipment.Text.Trim()))
+            {
+                strSql += " AND StaticEquipment like @StaticEquipment";
+                listStr.Add(new SqlParameter("@StaticEquipment", "%" + this.txtStaticEquipment.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART >= @InspectionDateA";
+                listStr.Add(new SqlParameter("@InspectionDateA", Funs.GetNewDateTime(txtStarTime.Text.Trim())));
+            }
+            if (!string.IsNullOrEmpty(txtEndTime.Text.Trim()))
+            {
+                strSql += " AND TestPackageSTART <= @InspectionDateZ";
+                listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
+            }
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 分页、排序
+        /// <summary>
+        /// 分页下拉
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            Grid1.SortDirection = e.SortDirection;
+            Grid1.SortField = e.SortField;
+            BindGrid();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 关闭弹出窗口
+        /// <summary>
+        /// 关闭弹出窗口
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Window1_Close(object sender, WindowCloseEventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+
+        #region 增加
+        /// <summary>
+        /// 新增按钮事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnNew_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx", "编辑 - ")));
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuModify_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InspectionEquipmentEdit.aspx?InspectionEquipmentId={0}", Grid1.SelectedRowID, "编辑 - ")));
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnMenuModify_Click(sender, e);
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 右键删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDel_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var data = BLL.StaticEquipmentService.GetStaticEquipmentById(rowID);
+                    if (data != null)
+                    {
+                        BLL.StaticEquipmentService.DeleteStaticEquipment(rowID);
+                    }
+                }
+                BindGrid();
+                ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+            }
+        }
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("StaticEquipmentDataIn.aspx", "导入 - ")));
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.StaticEquipmentMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnMenuDel.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnImport.Hidden = false;
+                }
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
new file mode 100644
index 00000000..e428de06
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -0,0 +1,222 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class StaticEquipment {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// ToolSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar ToolSearch;
+        
+        /// <summary>
+        /// txtStaticEquipment 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtStaticEquipment;
+        
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+        
+        /// <summary>
+        /// Label1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label1;
+        
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+        
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+        
+        /// <summary>
+        /// g1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g1;
+        
+        /// <summary>
+        /// g2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g2;
+        
+        /// <summary>
+        /// g3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g3;
+        
+        /// <summary>
+        /// g5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.GroupField g5;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// Window1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window1;
+        
+        /// <summary>
+        /// Window2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window Window2;
+        
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDel;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx
new file mode 100644
index 00000000..22fc0d7a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx
@@ -0,0 +1,68 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipmentDataIn.aspx.cs" Inherits="FineUIPro.Web.Transfer.StaticEquipmentDataIn" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:HiddenField ID="hdFileName" runat="server">
+                        </f:HiddenField>
+                        <f:Button ID="btnAudit" Icon="ApplicationEdit" runat="server" ToolTip="审核" ValidateForms="SimpleForm1" Text="审核"
+                            OnClick="btnAudit_Click">
+                        </f:Button>
+                        <f:Button ID="btnImport" Icon="ApplicationGet" runat="server" ToolTip="导入" ValidateForms="SimpleForm1" Text="导入"
+                            OnClick="btnImport_Click">
+                        </f:Button>
+                        <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载模板" OnClick="btnDownLoad_Click" Text="下载模板">
+                        </f:Button>
+                        <f:HiddenField ID="hdCheckResult" runat="server">
+                        </f:HiddenField>
+                    </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+                <f:FormRow>
+                    <Items>
+                        <f:FileUpload runat="server" ID="fuAttachUrl" EmptyText="选择要导入的文件" Label="选择要导入的文件"
+                            LabelWidth="150px">
+                        </f:FileUpload>
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:Grid ID="gvErrorInfo" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="人员报验" EnableCollapse="true"
+                            runat="server" BoxFlex="1" AllowCellEditing="true" ClicksToEdit="2" AllowSorting="true"
+                            SortDirection="DESC" EnableColumnLines="true" ForceFit="true" AllowPaging="true" IsDatabasePaging="true" PageSize="10"
+                            EnableRowDoubleClickEvent="true" AllowFilters="true" EnableTextSelection="True">
+                            <Columns>
+                                <f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
+                                    EnableLock="true" Locked="False">
+                                    <ItemTemplate>
+                                        <asp:Label ID="lblPageIndex" runat="server" Text='<%# gvErrorInfo.PageIndex * gvErrorInfo.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
+                                    </ItemTemplate>
+                                </f:TemplateField>
+                                <f:BoundField DataField="Row" HeaderText="错误行号">
+                                </f:BoundField>
+                                <f:BoundField DataField="Column" HeaderText="错误列">
+                                </f:BoundField>
+                                <f:BoundField DataField="Reason" HeaderText="错误类型">
+                                </f:BoundField>
+                            </Columns>
+                        </f:Grid>
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
new file mode 100644
index 00000000..f6476672
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
@@ -0,0 +1,417 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.OleDb;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer
+{
+    public partial class StaticEquipmentDataIn : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 上传预设的虚拟路径
+        /// </summary>
+        private string initPath = Const.ExcelUrl;
+
+
+        /// <summary>
+        /// 错误集合
+        /// </summary>
+        public static List<Model.ErrorInfo> errorInfos = new List<Model.ErrorInfo>();
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.hdCheckResult.Text = string.Empty;
+                this.hdFileName.Text = string.Empty;
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+            }
+        }
+        #endregion
+
+        #region 审核
+        /// <summary>
+        /// 审核
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                if (this.fuAttachUrl.HasFile == false)
+                {
+                    ShowNotify("请您选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
+                if (IsXls != ".xls")
+                {
+                    ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
+                    return;
+                }
+                if (errorInfos != null)
+                {
+                    errorInfos.Clear();
+                }
+                string rootPath = Server.MapPath("~/");
+                string initFullPath = rootPath + initPath;
+                if (!Directory.Exists(initFullPath))
+                {
+                    Directory.CreateDirectory(initFullPath);
+                }
+
+                this.hdFileName.Text = BLL.Funs.GetNewFileName() + IsXls;
+                string filePath = initFullPath + this.hdFileName.Text;
+                this.fuAttachUrl.PostedFile.SaveAs(filePath);
+                ImportXlsToData(rootPath + initPath + this.hdFileName.Text);
+            }
+            catch (Exception ex)
+            {
+                ShowNotify("'" + ex.Message + "'", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region 读Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL(ds.Tables[0], 7);
+                hdCheckResult.Text = "1";
+            }
+            catch (Exception exc)
+            {
+                Response.Write(exc);
+                //return null;
+                // return dt;
+            }
+            finally
+            {
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集行数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL(DataTable pds, int Cols)
+        {
+            string result = string.Empty;
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+                return false;
+            }
+
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                for (int i = 1; i < ir; i++)
+                {
+                    string row4 = pds.Rows[i][4].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row4.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package START" + "," + "[" + row4 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                    string row5 = pds.Rows[i][5].ToString();
+                    if (!string.IsNullOrEmpty(row4))
+                    {
+                        try
+                        {
+                            DateTime date = Convert.ToDateTime(row5.Trim());
+                        }
+                        catch (Exception)
+                        {
+                            result += (i + 3).ToString() + "," + "Test Package FINISH" + "," + "[" + row5 + "]错误！不是日期格式！" + "|";
+                        }
+                    }
+                }
+                if (!string.IsNullOrEmpty(result))
+                {
+                    result = result.Substring(0, result.LastIndexOf("|"));
+                }
+                errorInfos.Clear();
+                if (!string.IsNullOrEmpty(result))
+                {
+                    string results = result;
+                    List<string> errorInfoList = results.Split('|').ToList();
+                    foreach (var item in errorInfoList)
+                    {
+                        string[] errors = item.Split(',');
+                        Model.ErrorInfo errorInfo = new Model.ErrorInfo();
+                        errorInfo.Row = errors[0];
+                        errorInfo.Column = errors[1];
+                        errorInfo.Reason = errors[2];
+                        errorInfos.Add(errorInfo);
+                    }
+                    if (errorInfos.Count > 0)
+                    {
+                        this.gvErrorInfo.DataSource = errorInfos;
+                        this.gvErrorInfo.DataBind();
+                    }
+                }
+                else
+                {
+                    ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success);
+                }
+            }
+
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 导入
+        /// <summary>
+        /// 导入
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(hdCheckResult.Text))
+            {
+                if (errorInfos.Count <= 0)
+                {
+                    string rootPath = Server.MapPath("~/");
+                    ImportXlsToData2(rootPath + initPath + this.hdFileName.Text);
+                    hdCheckResult.Text = string.Empty;
+                    ShowNotify("导入成功！", MessageBoxIcon.Success);
+                    PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+                }
+                else
+                {
+                    ShowNotify("请先将错误数据修正，再重新导入提交！", MessageBoxIcon.Warning);
+                }
+            }
+            else
+            {
+                ShowNotify("请先审核要导入的文件！", MessageBoxIcon.Warning);
+            }
+        }
+
+        #region Excel提取数据
+        /// <summary>
+        /// 从Excel提取数据--》Dataset
+        /// </summary>
+        /// <param name="filename">Excel文件路径名</param>
+        private void ImportXlsToData2(string fileName)
+        {
+            try
+            {
+                string oleDBConnString = String.Empty;
+                oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
+                oleDBConnString += "Data Source=";
+                oleDBConnString += fileName;
+                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                OleDbConnection oleDBConn = null;
+                OleDbDataAdapter oleAdMaster = null;
+                DataTable m_tableName = new DataTable();
+                DataSet ds = new DataSet();
+
+                oleDBConn = new OleDbConnection(oleDBConnString);
+                oleDBConn.Open();
+                m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
+
+                if (m_tableName != null && m_tableName.Rows.Count > 0)
+                {
+
+                    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
+
+                }
+                string sqlMaster;
+                sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
+                oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn);
+                oleAdMaster.Fill(ds, "m_tableName");
+                oleAdMaster.Dispose();
+                oleDBConn.Close();
+                oleDBConn.Dispose();
+
+                AddDatasetToSQL2(ds.Tables[0], 7);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+        #endregion
+
+        #region 将Dataset的数据导入数据库
+        /// <summary>
+        /// 将Dataset的数据导入数据库
+        /// </summary>
+        /// <param name="pds">数据集</param>
+        /// <param name="Cols">数据集列数</param>
+        /// <returns></returns>
+        private bool AddDatasetToSQL2(DataTable pds, int Cols)
+        {
+            int ic, ir;
+            ic = pds.Columns.Count;
+            if (ic < Cols)
+            {
+                ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning);
+            }
+            string result = string.Empty;
+            ir = pds.Rows.Count;
+            if (pds != null && ir > 0)
+            {
+                List<Model.Transfer_StaticEquipment> list = new List<Model.Transfer_StaticEquipment>();
+                for (int i = 1; i < ir; i++)
+                {
+                    //查询第一列，没查到的情况下作导入处理
+                    var modelOnly = Funs.DB.Transfer_StaticEquipment.FirstOrDefault(x => x.StaticEquipment == pds.Rows[i][0].ToString().Trim()
+                    && x.ProjectId == CurrUser.LoginProjectId);
+                    if (modelOnly == null)
+                    {
+                        Model.Transfer_StaticEquipment model = new Model.Transfer_StaticEquipment();
+                        model.Id = Guid.NewGuid().ToString();
+                        model.ProjectId = CurrUser.LoginProjectId;
+                        model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
+                        model.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        model.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            model.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            model.TestPackageFINISH = t2;
+
+                        model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        list.Add(model);
+                    }
+                    else
+                    {
+                        //修改
+                        modelOnly.StaticEquipment = pds.Rows[i][0].ToString().Trim();
+                        modelOnly.SYSTEM = pds.Rows[i][1].ToString().Trim();
+                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                        modelOnly.TestPackage = pds.Rows[i][3].ToString().Trim();
+                        DateTime t1, t2;
+                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            modelOnly.TestPackageSTART = t1;
+                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            modelOnly.TestPackageFINISH = t2;
+                        modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        Funs.DB.SubmitChanges();
+                    }
+                }
+                if (list.Count > 0)
+                {
+                    Funs.DB.Transfer_StaticEquipment.InsertAllOnSubmit(list);
+                    Funs.DB.SubmitChanges();
+                }
+            }
+            else
+            {
+                ShowNotify("导入数据为空！", MessageBoxIcon.Warning);
+            }
+            return true;
+        }
+        #endregion
+        #endregion
+
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载导入模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\StaticEquipment导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\StaticEquipment导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.designer.cs
new file mode 100644
index 00000000..30d4244f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.designer.cs
@@ -0,0 +1,123 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class StaticEquipmentDataIn {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+        
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+        
+        /// <summary>
+        /// hdFileName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdFileName;
+        
+        /// <summary>
+        /// btnAudit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAudit;
+        
+        /// <summary>
+        /// btnImport 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnImport;
+        
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+        
+        /// <summary>
+        /// hdCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.HiddenField hdCheckResult;
+        
+        /// <summary>
+        /// fuAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.FileUpload fuAttachUrl;
+        
+        /// <summary>
+        /// gvErrorInfo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid gvErrorInfo;
+        
+        /// <summary>
+        /// lblPageIndex 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lblPageIndex;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f2c2e849..37de607d 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -76,7 +76,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 1c236fe9..0801de76 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -2360,6 +2360,12 @@ namespace Model
     partial void InsertTransfer_PunchlistFrom(Transfer_PunchlistFrom instance);
     partial void UpdateTransfer_PunchlistFrom(Transfer_PunchlistFrom instance);
     partial void DeleteTransfer_PunchlistFrom(Transfer_PunchlistFrom instance);
+    partial void InsertTransfer_RotatingEquipment(Transfer_RotatingEquipment instance);
+    partial void UpdateTransfer_RotatingEquipment(Transfer_RotatingEquipment instance);
+    partial void DeleteTransfer_RotatingEquipment(Transfer_RotatingEquipment instance);
+    partial void InsertTransfer_StaticEquipment(Transfer_StaticEquipment instance);
+    partial void UpdateTransfer_StaticEquipment(Transfer_StaticEquipment instance);
+    partial void DeleteTransfer_StaticEquipment(Transfer_StaticEquipment instance);
     partial void InsertTransfer_Telecom(Transfer_Telecom instance);
     partial void UpdateTransfer_Telecom(Transfer_Telecom instance);
     partial void DeleteTransfer_Telecom(Transfer_Telecom instance);
@@ -8774,6 +8780,22 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Transfer_RotatingEquipment> Transfer_RotatingEquipment
+		{
+			get
+			{
+				return this.GetTable<Transfer_RotatingEquipment>();
+			}
+		}
+		
+		public System.Data.Linq.Table<Transfer_StaticEquipment> Transfer_StaticEquipment
+		{
+			get
+			{
+				return this.GetTable<Transfer_StaticEquipment>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Transfer_Telecom> Transfer_Telecom
 		{
 			get
@@ -370477,6 +370499,514 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_RotatingEquipment")]
+	public partial class Transfer_RotatingEquipment : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _RotatingEquipment;
+		
+		private string _SYSTEM;
+		
+		private string _Subsystem;
+		
+		private string _TestPackage;
+		
+		private System.Nullable<System.DateTime> _TestPackageSTART;
+		
+		private System.Nullable<System.DateTime> _TestPackageFINISH;
+		
+		private string _MechanicalFINALStatus;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnRotatingEquipmentChanging(string value);
+    partial void OnRotatingEquipmentChanged();
+    partial void OnSYSTEMChanging(string value);
+    partial void OnSYSTEMChanged();
+    partial void OnSubsystemChanging(string value);
+    partial void OnSubsystemChanged();
+    partial void OnTestPackageChanging(string value);
+    partial void OnTestPackageChanged();
+    partial void OnTestPackageSTARTChanging(System.Nullable<System.DateTime> value);
+    partial void OnTestPackageSTARTChanged();
+    partial void OnTestPackageFINISHChanging(System.Nullable<System.DateTime> value);
+    partial void OnTestPackageFINISHChanged();
+    partial void OnMechanicalFINALStatusChanging(string value);
+    partial void OnMechanicalFINALStatusChanged();
+    #endregion
+		
+		public Transfer_RotatingEquipment()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RotatingEquipment", DbType="NVarChar(50)")]
+		public string RotatingEquipment
+		{
+			get
+			{
+				return this._RotatingEquipment;
+			}
+			set
+			{
+				if ((this._RotatingEquipment != value))
+				{
+					this.OnRotatingEquipmentChanging(value);
+					this.SendPropertyChanging();
+					this._RotatingEquipment = value;
+					this.SendPropertyChanged("RotatingEquipment");
+					this.OnRotatingEquipmentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SYSTEM", DbType="NVarChar(50)")]
+		public string SYSTEM
+		{
+			get
+			{
+				return this._SYSTEM;
+			}
+			set
+			{
+				if ((this._SYSTEM != value))
+				{
+					this.OnSYSTEMChanging(value);
+					this.SendPropertyChanging();
+					this._SYSTEM = value;
+					this.SendPropertyChanged("SYSTEM");
+					this.OnSYSTEMChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subsystem", DbType="NVarChar(50)")]
+		public string Subsystem
+		{
+			get
+			{
+				return this._Subsystem;
+			}
+			set
+			{
+				if ((this._Subsystem != value))
+				{
+					this.OnSubsystemChanging(value);
+					this.SendPropertyChanging();
+					this._Subsystem = value;
+					this.SendPropertyChanged("Subsystem");
+					this.OnSubsystemChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackage", DbType="NVarChar(50)")]
+		public string TestPackage
+		{
+			get
+			{
+				return this._TestPackage;
+			}
+			set
+			{
+				if ((this._TestPackage != value))
+				{
+					this.OnTestPackageChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackage = value;
+					this.SendPropertyChanged("TestPackage");
+					this.OnTestPackageChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageSTART", DbType="DateTime")]
+		public System.Nullable<System.DateTime> TestPackageSTART
+		{
+			get
+			{
+				return this._TestPackageSTART;
+			}
+			set
+			{
+				if ((this._TestPackageSTART != value))
+				{
+					this.OnTestPackageSTARTChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackageSTART = value;
+					this.SendPropertyChanged("TestPackageSTART");
+					this.OnTestPackageSTARTChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageFINISH", DbType="DateTime")]
+		public System.Nullable<System.DateTime> TestPackageFINISH
+		{
+			get
+			{
+				return this._TestPackageFINISH;
+			}
+			set
+			{
+				if ((this._TestPackageFINISH != value))
+				{
+					this.OnTestPackageFINISHChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackageFINISH = value;
+					this.SendPropertyChanged("TestPackageFINISH");
+					this.OnTestPackageFINISHChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MechanicalFINALStatus", DbType="NVarChar(50)")]
+		public string MechanicalFINALStatus
+		{
+			get
+			{
+				return this._MechanicalFINALStatus;
+			}
+			set
+			{
+				if ((this._MechanicalFINALStatus != value))
+				{
+					this.OnMechanicalFINALStatusChanging(value);
+					this.SendPropertyChanging();
+					this._MechanicalFINALStatus = value;
+					this.SendPropertyChanged("MechanicalFINALStatus");
+					this.OnMechanicalFINALStatusChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_StaticEquipment")]
+	public partial class Transfer_StaticEquipment : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private string _StaticEquipment;
+		
+		private string _SYSTEM;
+		
+		private string _Subsystem;
+		
+		private string _TestPackage;
+		
+		private System.Nullable<System.DateTime> _TestPackageSTART;
+		
+		private System.Nullable<System.DateTime> _TestPackageFINISH;
+		
+		private string _MechanicalFINALStatus;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnStaticEquipmentChanging(string value);
+    partial void OnStaticEquipmentChanged();
+    partial void OnSYSTEMChanging(string value);
+    partial void OnSYSTEMChanged();
+    partial void OnSubsystemChanging(string value);
+    partial void OnSubsystemChanged();
+    partial void OnTestPackageChanging(string value);
+    partial void OnTestPackageChanged();
+    partial void OnTestPackageSTARTChanging(System.Nullable<System.DateTime> value);
+    partial void OnTestPackageSTARTChanged();
+    partial void OnTestPackageFINISHChanging(System.Nullable<System.DateTime> value);
+    partial void OnTestPackageFINISHChanged();
+    partial void OnMechanicalFINALStatusChanging(string value);
+    partial void OnMechanicalFINALStatusChanged();
+    #endregion
+		
+		public Transfer_StaticEquipment()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StaticEquipment", DbType="NVarChar(50)")]
+		public string StaticEquipment
+		{
+			get
+			{
+				return this._StaticEquipment;
+			}
+			set
+			{
+				if ((this._StaticEquipment != value))
+				{
+					this.OnStaticEquipmentChanging(value);
+					this.SendPropertyChanging();
+					this._StaticEquipment = value;
+					this.SendPropertyChanged("StaticEquipment");
+					this.OnStaticEquipmentChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SYSTEM", DbType="NVarChar(50)")]
+		public string SYSTEM
+		{
+			get
+			{
+				return this._SYSTEM;
+			}
+			set
+			{
+				if ((this._SYSTEM != value))
+				{
+					this.OnSYSTEMChanging(value);
+					this.SendPropertyChanging();
+					this._SYSTEM = value;
+					this.SendPropertyChanged("SYSTEM");
+					this.OnSYSTEMChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subsystem", DbType="NVarChar(50)")]
+		public string Subsystem
+		{
+			get
+			{
+				return this._Subsystem;
+			}
+			set
+			{
+				if ((this._Subsystem != value))
+				{
+					this.OnSubsystemChanging(value);
+					this.SendPropertyChanging();
+					this._Subsystem = value;
+					this.SendPropertyChanged("Subsystem");
+					this.OnSubsystemChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackage", DbType="NVarChar(50)")]
+		public string TestPackage
+		{
+			get
+			{
+				return this._TestPackage;
+			}
+			set
+			{
+				if ((this._TestPackage != value))
+				{
+					this.OnTestPackageChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackage = value;
+					this.SendPropertyChanged("TestPackage");
+					this.OnTestPackageChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageSTART", DbType="DateTime")]
+		public System.Nullable<System.DateTime> TestPackageSTART
+		{
+			get
+			{
+				return this._TestPackageSTART;
+			}
+			set
+			{
+				if ((this._TestPackageSTART != value))
+				{
+					this.OnTestPackageSTARTChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackageSTART = value;
+					this.SendPropertyChanged("TestPackageSTART");
+					this.OnTestPackageSTARTChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackageFINISH", DbType="DateTime")]
+		public System.Nullable<System.DateTime> TestPackageFINISH
+		{
+			get
+			{
+				return this._TestPackageFINISH;
+			}
+			set
+			{
+				if ((this._TestPackageFINISH != value))
+				{
+					this.OnTestPackageFINISHChanging(value);
+					this.SendPropertyChanging();
+					this._TestPackageFINISH = value;
+					this.SendPropertyChanged("TestPackageFINISH");
+					this.OnTestPackageFINISHChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MechanicalFINALStatus", DbType="NVarChar(50)")]
+		public string MechanicalFINALStatus
+		{
+			get
+			{
+				return this._MechanicalFINALStatus;
+			}
+			set
+			{
+				if ((this._MechanicalFINALStatus != value))
+				{
+					this.OnMechanicalFINALStatusChanging(value);
+					this.SendPropertyChanging();
+					this._MechanicalFINALStatus = value;
+					this.SendPropertyChanged("MechanicalFINALStatus");
+					this.OnMechanicalFINALStatusChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Transfer_Telecom")]
 	public partial class Transfer_Telecom : INotifyPropertyChanging, INotifyPropertyChanged
 	{
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 8e4f1e0e8d01ed8a8961fe2907dfec9a6dc665f8 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:20:45 +0800
Subject: [PATCH 03/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 48 -------------------------
 1 file changed, 48 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index d34ccb12..0494f7f1 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1840,14 +1840,8 @@
     <Content Include="Transfer\Instrumentation.aspx" />
     <Content Include="Transfer\InstrumentationDataIn.aspx" />
     <Content Include="Transfer\Piping.aspx" />
-    <Content Include="Transfer\Plumbing.aspx" />
-    <Content Include="Transfer\PlumbingDataIn.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
     <Content Include="Transfer\ProjectSetupDataIn.aspx" />
-    <Content Include="Transfer\PunchlistFrom.aspx" />
-    <Content Include="Transfer\PunchlistFromDataIn.aspx" />
-    <Content Include="Transfer\Telecom.aspx" />
-    <Content Include="Transfer\TelecomDataIn.aspx" />
     <Content Include="Video\Video.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
@@ -16418,20 +16412,6 @@
     <Compile Include="Transfer\Piping.aspx.designer.cs">
       <DependentUpon>Piping.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Transfer\Plumbing.aspx.cs">
-      <DependentUpon>Plumbing.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Plumbing.aspx.designer.cs">
-      <DependentUpon>Plumbing.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\PlumbingDataIn.aspx.cs">
-      <DependentUpon>PlumbingDataIn.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\PlumbingDataIn.aspx.designer.cs">
-      <DependentUpon>PlumbingDataIn.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Transfer\ProjectSetup.aspx.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16446,34 +16426,6 @@
     <Compile Include="Transfer\ProjectSetupDataIn.aspx.designer.cs">
       <DependentUpon>ProjectSetupDataIn.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Transfer\PunchlistFrom.aspx.cs">
-      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\PunchlistFrom.aspx.designer.cs">
-      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\PunchlistFromDataIn.aspx.cs">
-      <DependentUpon>PunchlistFromDataIn.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\PunchlistFromDataIn.aspx.designer.cs">
-      <DependentUpon>PunchlistFromDataIn.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Telecom.aspx.cs">
-      <DependentUpon>Telecom.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Telecom.aspx.designer.cs">
-      <DependentUpon>Telecom.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\TelecomDataIn.aspx.cs">
-      <DependentUpon>TelecomDataIn.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\TelecomDataIn.aspx.designer.cs">
-      <DependentUpon>TelecomDataIn.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Video\Video.aspx.cs">
       <DependentUpon>Video.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

From 8677c4fe01fb07e8be4a801d365f62333c3765f6 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:24:30 +0800
Subject: [PATCH 04/31] 11

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 88 +++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 0494f7f1..1e89f1fc 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1840,8 +1840,19 @@
     <Content Include="Transfer\Instrumentation.aspx" />
     <Content Include="Transfer\InstrumentationDataIn.aspx" />
     <Content Include="Transfer\Piping.aspx" />
+    <Content Include="Transfer\PipingDataIn.aspx" />
+    <Content Include="Transfer\Plumbing.aspx" />
+    <Content Include="Transfer\PlumbingDataIn.aspx" />
     <Content Include="Transfer\ProjectSetup.aspx" />
     <Content Include="Transfer\ProjectSetupDataIn.aspx" />
+    <Content Include="Transfer\PunchlistFrom.aspx" />
+    <Content Include="Transfer\PunchlistFromDataIn.aspx" />
+    <Content Include="Transfer\RotatingEquipment.aspx" />
+    <Content Include="Transfer\RotatingEquipmentDataIn.aspx" />
+    <Content Include="Transfer\StaticEquipment.aspx" />
+    <Content Include="Transfer\StaticEquipmentDataIn.aspx" />
+    <Content Include="Transfer\Telecom.aspx" />
+    <Content Include="Transfer\TelecomDataIn.aspx" />
     <Content Include="Video\Video.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBar.aspx" />
     <Content Include="ZHGL\DataIn\AccidentCauseReportBarIn.aspx" />
@@ -16412,6 +16423,27 @@
     <Compile Include="Transfer\Piping.aspx.designer.cs">
       <DependentUpon>Piping.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\PipingDataIn.aspx.cs">
+      <DependentUpon>PipingDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PipingDataIn.aspx.designer.cs">
+      <DependentUpon>PipingDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Plumbing.aspx.cs">
+      <DependentUpon>Plumbing.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Plumbing.aspx.designer.cs">
+      <DependentUpon>Plumbing.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\PlumbingDataIn.aspx.cs">
+      <DependentUpon>PlumbingDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PlumbingDataIn.aspx.designer.cs">
+      <DependentUpon>PlumbingDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\ProjectSetup.aspx.cs">
       <DependentUpon>ProjectSetup.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16426,6 +16458,62 @@
     <Compile Include="Transfer\ProjectSetupDataIn.aspx.designer.cs">
       <DependentUpon>ProjectSetupDataIn.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\PunchlistFrom.aspx.cs">
+      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PunchlistFrom.aspx.designer.cs">
+      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\PunchlistFromDataIn.aspx.cs">
+      <DependentUpon>PunchlistFromDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\PunchlistFromDataIn.aspx.designer.cs">
+      <DependentUpon>PunchlistFromDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipment.aspx.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipment.aspx.designer.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipmentDataIn.aspx.cs">
+      <DependentUpon>RotatingEquipmentDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\RotatingEquipmentDataIn.aspx.designer.cs">
+      <DependentUpon>RotatingEquipmentDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipment.aspx.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipment.aspx.designer.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipmentDataIn.aspx.cs">
+      <DependentUpon>StaticEquipmentDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\StaticEquipmentDataIn.aspx.designer.cs">
+      <DependentUpon>StaticEquipmentDataIn.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Telecom.aspx.cs">
+      <DependentUpon>Telecom.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Telecom.aspx.designer.cs">
+      <DependentUpon>Telecom.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\TelecomDataIn.aspx.cs">
+      <DependentUpon>TelecomDataIn.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\TelecomDataIn.aspx.designer.cs">
+      <DependentUpon>TelecomDataIn.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Video\Video.aspx.cs">
       <DependentUpon>Video.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

From 79e0fa73bc08ba73e58b12bcb713341ee0a52c3a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:26:48 +0800
Subject: [PATCH 05/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2024-01-26-lpf.sql     |   20 +-
 .../版本日志/SGGLDB_WH_2024-01-26-phf.sql     |   79 --
 SGGL/Model/Model.cs                           | 1116 +++++++++--------
 3 files changed, 637 insertions(+), 578 deletions(-)
 delete mode 100644 DataBase/版本日志/SGGLDB_WH_2024-01-26-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-26-lpf.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-26-lpf.sql
index 3c56725d..e2850604 100644
--- a/DataBase/版本日志/SGGLDB_WH_2024-01-26-lpf.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-26-lpf.sql
@@ -1,11 +1,11 @@
-alter table  DriverSub_DriverSubPlan add  DriverSubNames varchar(100);
-go;
-alter table  DriverSub_DriverSubContact add  DriverSubPlanId varchar(100);
-go;
-alter table  DriverSub_DriverSubContact add  DriverSubContractorsId varchar(100);
-go;
-alter table  DriverSub_DriverSubContact add  SubcontractingType varchar(100);
-go;
+alter table  DriverSub_DriverSubPlan add  DriverSubNames varchar(100)
+go
+alter table  DriverSub_DriverSubContact add  DriverSubPlanId varchar(100)
+go
+alter table  DriverSub_DriverSubContact add  DriverSubContractorsId varchar(100)
+go
+alter table  DriverSub_DriverSubContact add  SubcontractingType varchar(100)
+go
 create table DriverSub_DriverSubContractors
 (
     DriverSubContractorsId varchar(100) primary key,
@@ -20,8 +20,8 @@ create table DriverSub_DriverSubContractors
     Province varchar(100),
     City varchar(100),
     IsUse bit default 1,
-);
-go;
+)
+go
 exec sp_addextendedproperty 'MS_Description', N'企业名称', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSubContractors',
      'COLUMN', 'SubUnitName'
 go
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-26-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-26-phf.sql
deleted file mode 100644
index ce48014a..00000000
--- a/DataBase/版本日志/SGGLDB_WH_2024-01-26-phf.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-CREATE TABLE [dbo].[Transfer_PunchlistFrom](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Item_No] [nvarchar](50) NULL,
-	[Punch_No] [nvarchar](50) NULL,
-	[SystemName] [nvarchar](50) NULL,
-	[Subsystem] [nvarchar](50) NULL,
-	[Test_Package] [nvarchar](50) NULL,
-	[Discipline] [nvarchar](50) NULL,
-	[DESCRIPTION] [nvarchar](50) NULL,
-	[Identified] [nvarchar](50) NULL,
-	[Category] [nvarchar](50) NULL,
-	[PUNCH_ITEM_FINISH_DATE] [datetime] NULL,
-	[Action_By] [nvarchar](50) NULL,
-	[Required_By] [nvarchar](50) NULL,
-	[PUNCH_ITEM_STATUS] [nvarchar](50) NULL,
-	[Comments] [nvarchar](50) NULL,
- CONSTRAINT [PK_Transfer_PunchlistFrom] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-GO
-
-
-CREATE TABLE [dbo].[Transfer_HVAC](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[HVAC] [nvarchar](50) NULL,
-	[SystemName] [nvarchar](50) NULL,
-	[Subsystem] [nvarchar](50) NULL,
-	[Test_Package] [nvarchar](50) NULL,
-	[Test_Package_START] [datetime] NULL,
-	[Test_Package_FINISH] [datetime] NULL,
-	[FINAL_Status] [nvarchar](50) NULL,
- CONSTRAINT [PK_Transfer_HVAC] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-GO
-
-CREATE TABLE [dbo].[Transfer_Plumbing](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Plumbing] [nvarchar](50) NULL,
-	[SystemName] [nvarchar](50) NULL,
-	[Subsystem] [nvarchar](50) NULL,
-	[Test_Package] [nvarchar](50) NULL,
-	[Test_Package_START] [datetime] NULL,
-	[Test_Package_FINISH] [datetime] NULL,
-	[FINAL_Status] [nvarchar](50) NULL,
- CONSTRAINT [PK_Transfer_Plumbing] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-GO
-
-CREATE TABLE [dbo].[Transfer_Telecom](
-	[Id] [nvarchar](50) NOT NULL,
-	[ProjectId] [nvarchar](50) NULL,
-	[Telecom] [nvarchar](50) NULL,
-	[SystemName] [nvarchar](50) NULL,
-	[Subsystem] [nvarchar](50) NULL,
-	[Test_Package] [nvarchar](50) NULL,
-	[Test_Package_START] [datetime] NULL,
-	[Test_Package_FINISH] [datetime] NULL,
-	[FINAL_Status] [nvarchar](50) NULL,
- CONSTRAINT [PK_Transfer_Telecom] PRIMARY KEY CLUSTERED 
-(
-	[Id] ASC
-)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
-) ON [PRIMARY]
-
-GO
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index b3ff1bf8..676b1b4d 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -22,7 +22,7 @@ namespace Model
 	using System;
 	
 	
-	public partial class SGGLDB : System.Data.Linq.DataContext
+	public partial class SGGLDB_WH : System.Data.Linq.DataContext
 	{
 		
 		private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@@ -2527,25 +2527,25 @@ namespace Model
     partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance);
     #endregion
 		
-		public SGGLDB(string connection) : 
+		public SGGLDB_WH(string connection) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB(System.Data.IDbConnection connection) : 
+		public SGGLDB_WH(System.Data.IDbConnection connection) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
+		public SGGLDB_WH(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
+		public SGGLDB_WH(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
@@ -25637,6 +25637,8 @@ namespace Model
 		
 		private EntitySet<DriverSub_DriverSubContact> _DriverSub_DriverSubContact;
 		
+		private EntitySet<DriverSub_DriverSubPlan> _DriverSub_DriverSubPlan;
+		
 		private EntitySet<EduTrain_TrainRecord> _EduTrain_TrainRecord;
 		
 		private EntitySet<EduTrain_TrainPersonRecord> _EduTrain_TrainPersonRecord;
@@ -26207,6 +26209,7 @@ namespace Model
 			this._DriverRun_DriverRunPlan = new EntitySet<DriverRun_DriverRunPlan>(new Action<DriverRun_DriverRunPlan>(this.attach_DriverRun_DriverRunPlan), new Action<DriverRun_DriverRunPlan>(this.detach_DriverRun_DriverRunPlan));
 			this._DriverSub_DriverSub = new EntitySet<DriverSub_DriverSub>(new Action<DriverSub_DriverSub>(this.attach_DriverSub_DriverSub), new Action<DriverSub_DriverSub>(this.detach_DriverSub_DriverSub));
 			this._DriverSub_DriverSubContact = new EntitySet<DriverSub_DriverSubContact>(new Action<DriverSub_DriverSubContact>(this.attach_DriverSub_DriverSubContact), new Action<DriverSub_DriverSubContact>(this.detach_DriverSub_DriverSubContact));
+			this._DriverSub_DriverSubPlan = new EntitySet<DriverSub_DriverSubPlan>(new Action<DriverSub_DriverSubPlan>(this.attach_DriverSub_DriverSubPlan), new Action<DriverSub_DriverSubPlan>(this.detach_DriverSub_DriverSubPlan));
 			this._EduTrain_TrainRecord = new EntitySet<EduTrain_TrainRecord>(new Action<EduTrain_TrainRecord>(this.attach_EduTrain_TrainRecord), new Action<EduTrain_TrainRecord>(this.detach_EduTrain_TrainRecord));
 			this._EduTrain_TrainPersonRecord = new EntitySet<EduTrain_TrainPersonRecord>(new Action<EduTrain_TrainPersonRecord>(this.attach_EduTrain_TrainPersonRecord), new Action<EduTrain_TrainPersonRecord>(this.detach_EduTrain_TrainPersonRecord));
 			this._Emergency_DrillRecordList = new EntitySet<Emergency_DrillRecordList>(new Action<Emergency_DrillRecordList>(this.attach_Emergency_DrillRecordList), new Action<Emergency_DrillRecordList>(this.detach_Emergency_DrillRecordList));
@@ -28576,6 +28579,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Project", Storage="_DriverSub_DriverSubPlan", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
+		public EntitySet<DriverSub_DriverSubPlan> DriverSub_DriverSubPlan
+		{
+			get
+			{
+				return this._DriverSub_DriverSubPlan;
+			}
+			set
+			{
+				this._DriverSub_DriverSubPlan.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EduTrain_Training_Base_Project", Storage="_EduTrain_TrainRecord", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<EduTrain_TrainRecord> EduTrain_TrainRecord
 		{
@@ -32266,6 +32282,18 @@ namespace Model
 			entity.Base_Project = null;
 		}
 		
+		private void attach_DriverSub_DriverSubPlan(DriverSub_DriverSubPlan entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = this;
+		}
+		
+		private void detach_DriverSub_DriverSubPlan(DriverSub_DriverSubPlan entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Project = null;
+		}
+		
 		private void attach_EduTrain_TrainRecord(EduTrain_TrainRecord entity)
 		{
 			this.SendPropertyChanging();
@@ -37999,6 +38027,8 @@ namespace Model
 		
 		private EntitySet<DriverSub_DriverSubContact> _DriverSub_DriverSubContact;
 		
+		private EntitySet<DriverSub_DriverSubPlan> _DriverSub_DriverSubPlan;
+		
 		private EntitySet<Emergency_EmergencyList> _Emergency_EmergencyList;
 		
 		private EntitySet<Emergency_EmergencySupply> _Emergency_EmergencySupply;
@@ -38349,6 +38379,7 @@ namespace Model
 			this._DriverRun_DriverRunPlan = new EntitySet<DriverRun_DriverRunPlan>(new Action<DriverRun_DriverRunPlan>(this.attach_DriverRun_DriverRunPlan), new Action<DriverRun_DriverRunPlan>(this.detach_DriverRun_DriverRunPlan));
 			this._DriverSub_DriverSub = new EntitySet<DriverSub_DriverSub>(new Action<DriverSub_DriverSub>(this.attach_DriverSub_DriverSub), new Action<DriverSub_DriverSub>(this.detach_DriverSub_DriverSub));
 			this._DriverSub_DriverSubContact = new EntitySet<DriverSub_DriverSubContact>(new Action<DriverSub_DriverSubContact>(this.attach_DriverSub_DriverSubContact), new Action<DriverSub_DriverSubContact>(this.detach_DriverSub_DriverSubContact));
+			this._DriverSub_DriverSubPlan = new EntitySet<DriverSub_DriverSubPlan>(new Action<DriverSub_DriverSubPlan>(this.attach_DriverSub_DriverSubPlan), new Action<DriverSub_DriverSubPlan>(this.detach_DriverSub_DriverSubPlan));
 			this._Emergency_EmergencyList = new EntitySet<Emergency_EmergencyList>(new Action<Emergency_EmergencyList>(this.attach_Emergency_EmergencyList), new Action<Emergency_EmergencyList>(this.detach_Emergency_EmergencyList));
 			this._Emergency_EmergencySupply = new EntitySet<Emergency_EmergencySupply>(new Action<Emergency_EmergencySupply>(this.attach_Emergency_EmergencySupply), new Action<Emergency_EmergencySupply>(this.detach_Emergency_EmergencySupply));
 			this._Emergency_EmergencyTeamAndTrain = new EntitySet<Emergency_EmergencyTeamAndTrain>(new Action<Emergency_EmergencyTeamAndTrain>(this.attach_Emergency_EmergencyTeamAndTrain), new Action<Emergency_EmergencyTeamAndTrain>(this.detach_Emergency_EmergencyTeamAndTrain));
@@ -39723,6 +39754,19 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Unit", Storage="_DriverSub_DriverSubPlan", ThisKey="UnitId", OtherKey="SubUnitId", DeleteRule="NO ACTION")]
+		public EntitySet<DriverSub_DriverSubPlan> DriverSub_DriverSubPlan
+		{
+			get
+			{
+				return this._DriverSub_DriverSubPlan;
+			}
+			set
+			{
+				this._DriverSub_DriverSubPlan.Assign(value);
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Emergency_EmergencyList_Base_Unit", Storage="_Emergency_EmergencyList", ThisKey="UnitId", OtherKey="UnitId", DeleteRule="NO ACTION")]
 		public EntitySet<Emergency_EmergencyList> Emergency_EmergencyList
 		{
@@ -41960,6 +42004,18 @@ namespace Model
 			entity.Base_Unit = null;
 		}
 		
+		private void attach_DriverSub_DriverSubPlan(DriverSub_DriverSubPlan entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = this;
+		}
+		
+		private void detach_DriverSub_DriverSubPlan(DriverSub_DriverSubPlan entity)
+		{
+			this.SendPropertyChanging();
+			entity.Base_Unit = null;
+		}
+		
 		private void attach_Emergency_EmergencyList(Emergency_EmergencyList entity)
 		{
 			this.SendPropertyChanging();
@@ -60139,8 +60195,6 @@ namespace Model
 		
 		private string _CheckItemSetId;
 		
-		private string _ReceiveMan;
-		
 		private string _ResponsibleUnit;
 		
 		private string _WorkAreaId;
@@ -60149,6 +60203,8 @@ namespace Model
 		
 		private string _ResponsibleMan;
 		
+		private string _ReceiveMan;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@@ -60189,8 +60245,6 @@ namespace Model
     partial void OnPartInPersonNamesChanged();
     partial void OnCheckItemSetIdChanging(string value);
     partial void OnCheckItemSetIdChanged();
-    partial void OnReceiveManChanging(string value);
-    partial void OnReceiveManChanged();
     partial void OnResponsibleUnitChanging(string value);
     partial void OnResponsibleUnitChanged();
     partial void OnWorkAreaIdChanging(string value);
@@ -60199,6 +60253,8 @@ namespace Model
     partial void OnQuestionTypeChanged();
     partial void OnResponsibleManChanging(string value);
     partial void OnResponsibleManChanged();
+    partial void OnReceiveManChanging(string value);
+    partial void OnReceiveManChanged();
     #endregion
 		
 		public Check_CheckSpecial()
@@ -60536,26 +60592,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
-		public string ReceiveMan
-		{
-			get
-			{
-				return this._ReceiveMan;
-			}
-			set
-			{
-				if ((this._ReceiveMan != value))
-				{
-					this.OnReceiveManChanging(value);
-					this.SendPropertyChanging();
-					this._ReceiveMan = value;
-					this.SendPropertyChanged("ReceiveMan");
-					this.OnReceiveManChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
 		public string ResponsibleUnit
 		{
@@ -60636,6 +60672,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveMan", DbType="NVarChar(2000)")]
+		public string ReceiveMan
+		{
+			get
+			{
+				return this._ReceiveMan;
+			}
+			set
+			{
+				if ((this._ReceiveMan != value))
+				{
+					this.OnReceiveManChanging(value);
+					this.SendPropertyChanging();
+					this._ReceiveMan = value;
+					this.SendPropertyChanged("ReceiveMan");
+					this.OnReceiveManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -111363,8 +111419,6 @@ namespace Model
 		
 		private string _States;
 		
-		private System.Nullable<int> _SgCount;
-		
 		private System.Nullable<int> _OutDay;
 		
 		private System.Nullable<decimal> _Workloads;
@@ -111373,6 +111427,8 @@ namespace Model
 		
 		private string _ScorMan;
 		
+		private System.Nullable<int> _SgCount;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -111399,8 +111455,6 @@ namespace Model
     partial void OnCreateDateMonthChanged();
     partial void OnStatesChanging(string value);
     partial void OnStatesChanged();
-    partial void OnSgCountChanging(System.Nullable<int> value);
-    partial void OnSgCountChanged();
     partial void OnOutDayChanging(System.Nullable<int> value);
     partial void OnOutDayChanged();
     partial void OnWorkloadsChanging(System.Nullable<decimal> value);
@@ -111409,6 +111463,8 @@ namespace Model
     partial void OnWorkRangeChanged();
     partial void OnScorManChanging(string value);
     partial void OnScorManChanged();
+    partial void OnSgCountChanging(System.Nullable<int> value);
+    partial void OnSgCountChanged();
     #endregion
 		
 		public CQMS_Performance()
@@ -111636,26 +111692,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SgCount", DbType="Int")]
-		public System.Nullable<int> SgCount
-		{
-			get
-			{
-				return this._SgCount;
-			}
-			set
-			{
-				if ((this._SgCount != value))
-				{
-					this.OnSgCountChanging(value);
-					this.SendPropertyChanging();
-					this._SgCount = value;
-					this.SendPropertyChanged("SgCount");
-					this.OnSgCountChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutDay", DbType="Int")]
 		public System.Nullable<int> OutDay
 		{
@@ -111736,6 +111772,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SgCount", DbType="Int")]
+		public System.Nullable<int> SgCount
+		{
+			get
+			{
+				return this._SgCount;
+			}
+			set
+			{
+				if ((this._SgCount != value))
+				{
+					this.OnSgCountChanging(value);
+					this.SendPropertyChanging();
+					this._SgCount = value;
+					this.SendPropertyChanged("SgCount");
+					this.OnSgCountChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -129162,7 +129218,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitName", DbType="VarChar(500)")]
 		public string SubUnitName
 		{
 			get
@@ -129182,7 +129238,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EnterpriseNature", DbType="VarChar(500)")]
 		public string EnterpriseNature
 		{
 			get
@@ -129202,7 +129258,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingType", DbType="VarChar(500)")]
 		public string SubcontractingType
 		{
 			get
@@ -129222,7 +129278,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CollCropCode", DbType="VarChar(500)")]
 		public string CollCropCode
 		{
 			get
@@ -129242,7 +129298,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyProductionLicense", DbType="VarChar(500)")]
 		public string SafetyProductionLicense
 		{
 			get
@@ -129262,7 +129318,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationCertificateNumber", DbType="VarChar(500)")]
 		public string QualificationCertificateNumber
 		{
 			get
@@ -129282,7 +129338,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationType", DbType="VarChar(500)")]
 		public string QualificationType
 		{
 			get
@@ -129302,7 +129358,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(100)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QualificationLevel", DbType="VarChar(500)")]
 		public string QualificationLevel
 		{
 			get
@@ -129435,6 +129491,10 @@ namespace Model
 		
 		private string _DriverSubNames;
 		
+		private EntityRef<Base_Project> _Base_Project;
+		
+		private EntityRef<Base_Unit> _Base_Unit;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -129469,10 +129529,12 @@ namespace Model
 		
 		public DriverSub_DriverSubPlan()
 		{
+			this._Base_Project = default(EntityRef<Base_Project>);
+			this._Base_Unit = default(EntityRef<Base_Unit>);
 			OnCreated();
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubPlanId", DbType="NVarChar(36) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverSubPlanId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
 		public string DriverSubPlanId
 		{
 			get
@@ -129492,7 +129554,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(36)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{
 			get
@@ -129503,6 +129565,10 @@ namespace Model
 			{
 				if ((this._ProjectId != value))
 				{
+					if (this._Base_Project.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
 					this.OnProjectIdChanging(value);
 					this.SendPropertyChanging();
 					this._ProjectId = value;
@@ -129512,7 +129578,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(36)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Code", DbType="NVarChar(50)")]
 		public string Code
 		{
 			get
@@ -129532,7 +129598,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitId", DbType="NVarChar(36)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubUnitId", DbType="NVarChar(50)")]
 		public string SubUnitId
 		{
 			get
@@ -129543,6 +129609,10 @@ namespace Model
 			{
 				if ((this._SubUnitId != value))
 				{
+					if (this._Base_Unit.HasLoadedOrAssignedValue)
+					{
+						throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
+					}
 					this.OnSubUnitIdChanging(value);
 					this.SendPropertyChanging();
 					this._SubUnitId = value;
@@ -129552,7 +129622,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Introductions", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Introductions", DbType="NVarChar(1000)")]
 		public string Introductions
 		{
 			get
@@ -129572,7 +129642,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Achievement", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Achievement", DbType="NVarChar(1000)")]
 		public string Achievement
 		{
 			get
@@ -129592,7 +129662,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cooperation", DbType="NVarChar(2000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Cooperation", DbType="NVarChar(1000)")]
 		public string Cooperation
 		{
 			get
@@ -129732,6 +129802,74 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
+		public Base_Project Base_Project
+		{
+			get
+			{
+				return this._Base_Project.Entity;
+			}
+			set
+			{
+				Base_Project previousValue = this._Base_Project.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Project.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Project.Entity = null;
+						previousValue.DriverSub_DriverSubPlan.Remove(this);
+					}
+					this._Base_Project.Entity = value;
+					if ((value != null))
+					{
+						value.DriverSub_DriverSubPlan.Add(this);
+						this._ProjectId = value.ProjectId;
+					}
+					else
+					{
+						this._ProjectId = default(string);
+					}
+					this.SendPropertyChanged("Base_Project");
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubPlan_Base_Unit", Storage="_Base_Unit", ThisKey="SubUnitId", OtherKey="UnitId", IsForeignKey=true)]
+		public Base_Unit Base_Unit
+		{
+			get
+			{
+				return this._Base_Unit.Entity;
+			}
+			set
+			{
+				Base_Unit previousValue = this._Base_Unit.Entity;
+				if (((previousValue != value) 
+							|| (this._Base_Unit.HasLoadedOrAssignedValue == false)))
+				{
+					this.SendPropertyChanging();
+					if ((previousValue != null))
+					{
+						this._Base_Unit.Entity = null;
+						previousValue.DriverSub_DriverSubPlan.Remove(this);
+					}
+					this._Base_Unit.Entity = value;
+					if ((value != null))
+					{
+						value.DriverSub_DriverSubPlan.Add(this);
+						this._SubUnitId = value.UnitId;
+					}
+					else
+					{
+						this._SubUnitId = default(string);
+					}
+					this.SendPropertyChanged("Base_Unit");
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -264629,6 +264767,8 @@ namespace Model
 		
 		private System.Nullable<int> _ProblemType;
 		
+		private string _SubInspectId;
+		
 		private string _TermItemId;
 		
 		private string _WorkPackId;
@@ -264641,20 +264781,18 @@ namespace Model
 		
 		private string _InspectUser;
 		
+		private string _HandleUser;
+		
 		private string _ApproveUser;
 		
+		private System.Nullable<System.DateTime> _AdjustCompleteTime;
+		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
-		private string _SubInspectId;
-		
-		private string _HandleUser;
-		
-		private System.Nullable<System.DateTime> _AdjustCompleteTime;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -264671,6 +264809,8 @@ namespace Model
     partial void OnConstructionUnitChanged();
     partial void OnProblemTypeChanging(System.Nullable<int> value);
     partial void OnProblemTypeChanged();
+    partial void OnSubInspectIdChanging(string value);
+    partial void OnSubInspectIdChanged();
     partial void OnTermItemIdChanging(string value);
     partial void OnTermItemIdChanged();
     partial void OnWorkPackIdChanging(string value);
@@ -264683,20 +264823,18 @@ namespace Model
     partial void OnRectifyTimeChanged();
     partial void OnInspectUserChanging(string value);
     partial void OnInspectUserChanged();
+    partial void OnHandleUserChanging(string value);
+    partial void OnHandleUserChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
+    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAdjustCompleteTimeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
-    partial void OnSubInspectIdChanging(string value);
-    partial void OnSubInspectIdChanged();
-    partial void OnHandleUserChanging(string value);
-    partial void OnHandleUserChanged();
-    partial void OnAdjustCompleteTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAdjustCompleteTimeChanged();
     #endregion
 		
 		public PreRun_InspectTailTerm()
@@ -264824,6 +264962,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")]
+		public string SubInspectId
+		{
+			get
+			{
+				return this._SubInspectId;
+			}
+			set
+			{
+				if ((this._SubInspectId != value))
+				{
+					this.OnSubInspectIdChanging(value);
+					this.SendPropertyChanging();
+					this._SubInspectId = value;
+					this.SendPropertyChanged("SubInspectId");
+					this.OnSubInspectIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TermItemId", DbType="VarChar(50)")]
 		public string TermItemId
 		{
@@ -264944,6 +265102,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
+		public string HandleUser
+		{
+			get
+			{
+				return this._HandleUser;
+			}
+			set
+			{
+				if ((this._HandleUser != value))
+				{
+					this.OnHandleUserChanging(value);
+					this.SendPropertyChanging();
+					this._HandleUser = value;
+					this.SendPropertyChanged("HandleUser");
+					this.OnHandleUserChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveUser", DbType="VarChar(50)")]
 		public string ApproveUser
 		{
@@ -264964,6 +265142,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AdjustCompleteTime
+		{
+			get
+			{
+				return this._AdjustCompleteTime;
+			}
+			set
+			{
+				if ((this._AdjustCompleteTime != value))
+				{
+					this.OnAdjustCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AdjustCompleteTime = value;
+					this.SendPropertyChanged("AdjustCompleteTime");
+					this.OnAdjustCompleteTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -265024,66 +265222,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubInspectId", DbType="VarChar(50)")]
-		public string SubInspectId
-		{
-			get
-			{
-				return this._SubInspectId;
-			}
-			set
-			{
-				if ((this._SubInspectId != value))
-				{
-					this.OnSubInspectIdChanging(value);
-					this.SendPropertyChanging();
-					this._SubInspectId = value;
-					this.SendPropertyChanged("SubInspectId");
-					this.OnSubInspectIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HandleUser", DbType="VarChar(50)")]
-		public string HandleUser
-		{
-			get
-			{
-				return this._HandleUser;
-			}
-			set
-			{
-				if ((this._HandleUser != value))
-				{
-					this.OnHandleUserChanging(value);
-					this.SendPropertyChanging();
-					this._HandleUser = value;
-					this.SendPropertyChanged("HandleUser");
-					this.OnHandleUserChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AdjustCompleteTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AdjustCompleteTime
-		{
-			get
-			{
-				return this._AdjustCompleteTime;
-			}
-			set
-			{
-				if ((this._AdjustCompleteTime != value))
-				{
-					this.OnAdjustCompleteTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AdjustCompleteTime = value;
-					this.SendPropertyChanged("AdjustCompleteTime");
-					this.OnAdjustCompleteTimeChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -265125,14 +265263,14 @@ namespace Model
 		
 		private string _ApproveUser;
 		
+		private System.Nullable<int> _ApproveType;
+		
 		private System.Nullable<int> _ApproveState;
 		
 		private string _AddUser;
 		
 		private System.Nullable<System.DateTime> _AddTime;
 		
-		private System.Nullable<int> _ApproveType;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -265151,14 +265289,14 @@ namespace Model
     partial void OnApproveTimeChanged();
     partial void OnApproveUserChanging(string value);
     partial void OnApproveUserChanged();
+    partial void OnApproveTypeChanging(System.Nullable<int> value);
+    partial void OnApproveTypeChanged();
     partial void OnApproveStateChanging(System.Nullable<int> value);
     partial void OnApproveStateChanged();
     partial void OnAddUserChanging(string value);
     partial void OnAddUserChanged();
     partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnAddTimeChanged();
-    partial void OnApproveTypeChanging(System.Nullable<int> value);
-    partial void OnApproveTypeChanged();
     #endregion
 		
 		public PreRun_InspectTermApproveRecords()
@@ -265306,6 +265444,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
+		public System.Nullable<int> ApproveType
+		{
+			get
+			{
+				return this._ApproveType;
+			}
+			set
+			{
+				if ((this._ApproveType != value))
+				{
+					this.OnApproveTypeChanging(value);
+					this.SendPropertyChanging();
+					this._ApproveType = value;
+					this.SendPropertyChanged("ApproveType");
+					this.OnApproveTypeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveState", DbType="Int")]
 		public System.Nullable<int> ApproveState
 		{
@@ -265366,26 +265524,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveType", DbType="Int")]
-		public System.Nullable<int> ApproveType
-		{
-			get
-			{
-				return this._ApproveType;
-			}
-			set
-			{
-				if ((this._ApproveType != value))
-				{
-					this.OnApproveTypeChanging(value);
-					this.SendPropertyChanging();
-					this._ApproveType = value;
-					this.SendPropertyChanged("ApproveType");
-					this.OnApproveTypeChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -266318,7 +266456,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get
@@ -266441,12 +266579,6 @@ namespace Model
 		
 		private string _InspectResult;
 		
-		private System.Nullable<System.DateTime> _InspectTime;
-		
-		private string _AddUser;
-		
-		private System.Nullable<System.DateTime> _AddTime;
-		
 		private string _Subcontractor;
 		
 		private string _Contractor;
@@ -266455,10 +266587,6 @@ namespace Model
 		
 		private string _Owner;
 		
-		private System.Nullable<int> _WorkPackType;
-		
-		private string _PropertyTechnologyId;
-		
 		private System.Nullable<int> _InspectionIsAllPass;
 		
 		private System.Nullable<int> _SubcontractorIsAllPass;
@@ -266469,6 +266597,10 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerIsAllPass;
 		
+		private System.Nullable<int> _WorkPackType;
+		
+		private string _PropertyTechnologyId;
+		
 		private System.Nullable<System.DateTime> _SubcontractorAllPassData;
 		
 		private System.Nullable<System.DateTime> _ContractorAllPassData;
@@ -266501,6 +266633,12 @@ namespace Model
 		
 		private string _UnifyWanderAboutOpinion;
 		
+		private System.Nullable<System.DateTime> _InspectTime;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -266521,12 +266659,6 @@ namespace Model
     partial void OnWorkPackIdChanged();
     partial void OnInspectResultChanging(string value);
     partial void OnInspectResultChanged();
-    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnInspectTimeChanged();
-    partial void OnAddUserChanging(string value);
-    partial void OnAddUserChanged();
-    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAddTimeChanged();
     partial void OnSubcontractorChanging(string value);
     partial void OnSubcontractorChanged();
     partial void OnContractorChanging(string value);
@@ -266535,10 +266667,6 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
-    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
-    partial void OnWorkPackTypeChanged();
-    partial void OnPropertyTechnologyIdChanging(string value);
-    partial void OnPropertyTechnologyIdChanged();
     partial void OnInspectionIsAllPassChanging(System.Nullable<int> value);
     partial void OnInspectionIsAllPassChanged();
     partial void OnSubcontractorIsAllPassChanging(System.Nullable<int> value);
@@ -266549,6 +266677,10 @@ namespace Model
     partial void OnSupervisionIsAllPassChanged();
     partial void OnOwnerIsAllPassChanging(System.Nullable<int> value);
     partial void OnOwnerIsAllPassChanged();
+    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
+    partial void OnWorkPackTypeChanged();
+    partial void OnPropertyTechnologyIdChanging(string value);
+    partial void OnPropertyTechnologyIdChanged();
     partial void OnSubcontractorAllPassDataChanging(System.Nullable<System.DateTime> value);
     partial void OnSubcontractorAllPassDataChanged();
     partial void OnContractorAllPassDataChanging(System.Nullable<System.DateTime> value);
@@ -266581,6 +266713,12 @@ namespace Model
     partial void OnUnifyWanderAboutDataChanged();
     partial void OnUnifyWanderAboutOpinionChanging(string value);
     partial void OnUnifyWanderAboutOpinionChanged();
+    partial void OnInspectTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnInspectTimeChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
     #endregion
 		
 		public PreRun_SubInspectTerm()
@@ -266748,66 +266886,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> InspectTime
-		{
-			get
-			{
-				return this._InspectTime;
-			}
-			set
-			{
-				if ((this._InspectTime != value))
-				{
-					this.OnInspectTimeChanging(value);
-					this.SendPropertyChanging();
-					this._InspectTime = value;
-					this.SendPropertyChanged("InspectTime");
-					this.OnInspectTimeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
-		public string AddUser
-		{
-			get
-			{
-				return this._AddUser;
-			}
-			set
-			{
-				if ((this._AddUser != value))
-				{
-					this.OnAddUserChanging(value);
-					this.SendPropertyChanging();
-					this._AddUser = value;
-					this.SendPropertyChanged("AddUser");
-					this.OnAddUserChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AddTime
-		{
-			get
-			{
-				return this._AddTime;
-			}
-			set
-			{
-				if ((this._AddTime != value))
-				{
-					this.OnAddTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AddTime = value;
-					this.SendPropertyChanged("AddTime");
-					this.OnAddTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subcontractor", DbType="VarChar(50)")]
 		public string Subcontractor
 		{
@@ -266888,46 +266966,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
-		public System.Nullable<int> WorkPackType
-		{
-			get
-			{
-				return this._WorkPackType;
-			}
-			set
-			{
-				if ((this._WorkPackType != value))
-				{
-					this.OnWorkPackTypeChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackType = value;
-					this.SendPropertyChanged("WorkPackType");
-					this.OnWorkPackTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string PropertyTechnologyId
-		{
-			get
-			{
-				return this._PropertyTechnologyId;
-			}
-			set
-			{
-				if ((this._PropertyTechnologyId != value))
-				{
-					this.OnPropertyTechnologyIdChanging(value);
-					this.SendPropertyChanging();
-					this._PropertyTechnologyId = value;
-					this.SendPropertyChanged("PropertyTechnologyId");
-					this.OnPropertyTechnologyIdChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionIsAllPass", DbType="Int")]
 		public System.Nullable<int> InspectionIsAllPass
 		{
@@ -267028,6 +267066,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
+		public System.Nullable<int> WorkPackType
+		{
+			get
+			{
+				return this._WorkPackType;
+			}
+			set
+			{
+				if ((this._WorkPackType != value))
+				{
+					this.OnWorkPackTypeChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackType = value;
+					this.SendPropertyChanged("WorkPackType");
+					this.OnWorkPackTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string PropertyTechnologyId
+		{
+			get
+			{
+				return this._PropertyTechnologyId;
+			}
+			set
+			{
+				if ((this._PropertyTechnologyId != value))
+				{
+					this.OnPropertyTechnologyIdChanging(value);
+					this.SendPropertyChanging();
+					this._PropertyTechnologyId = value;
+					this.SendPropertyChanged("PropertyTechnologyId");
+					this.OnPropertyTechnologyIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorAllPassData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> SubcontractorAllPassData
 		{
@@ -267348,6 +267426,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> InspectTime
+		{
+			get
+			{
+				return this._InspectTime;
+			}
+			set
+			{
+				if ((this._InspectTime != value))
+				{
+					this.OnInspectTimeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectTime = value;
+					this.SendPropertyChanged("InspectTime");
+					this.OnInspectTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -267411,18 +267549,6 @@ namespace Model
 		
 		private string _Owner;
 		
-		private System.Nullable<int> _WorkPackType;
-		
-		private string _PropertyTechnologyId;
-		
-		private string _Remark;
-		
-		private string _AddUser;
-		
-		private System.Nullable<System.DateTime> _AddTime;
-		
-		private System.Nullable<int> _Sort;
-		
 		private System.Nullable<int> _SubcontractorIsPass;
 		
 		private System.Nullable<int> _ContractorIsPass;
@@ -267439,6 +267565,18 @@ namespace Model
 		
 		private string _OwnerRemark;
 		
+		private System.Nullable<int> _WorkPackType;
+		
+		private string _PropertyTechnologyId;
+		
+		private string _Remark;
+		
+		private string _AddUser;
+		
+		private System.Nullable<System.DateTime> _AddTime;
+		
+		private System.Nullable<int> _Sort;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -267479,18 +267617,6 @@ namespace Model
     partial void OnSupervisionChanged();
     partial void OnOwnerChanging(string value);
     partial void OnOwnerChanged();
-    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
-    partial void OnWorkPackTypeChanged();
-    partial void OnPropertyTechnologyIdChanging(string value);
-    partial void OnPropertyTechnologyIdChanged();
-    partial void OnRemarkChanging(string value);
-    partial void OnRemarkChanged();
-    partial void OnAddUserChanging(string value);
-    partial void OnAddUserChanged();
-    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnAddTimeChanged();
-    partial void OnSortChanging(System.Nullable<int> value);
-    partial void OnSortChanged();
     partial void OnSubcontractorIsPassChanging(System.Nullable<int> value);
     partial void OnSubcontractorIsPassChanged();
     partial void OnContractorIsPassChanging(System.Nullable<int> value);
@@ -267507,6 +267633,18 @@ namespace Model
     partial void OnSupervisionRemarkChanged();
     partial void OnOwnerRemarkChanging(string value);
     partial void OnOwnerRemarkChanged();
+    partial void OnWorkPackTypeChanging(System.Nullable<int> value);
+    partial void OnWorkPackTypeChanged();
+    partial void OnPropertyTechnologyIdChanging(string value);
+    partial void OnPropertyTechnologyIdChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    partial void OnAddUserChanging(string value);
+    partial void OnAddUserChanged();
+    partial void OnAddTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnAddTimeChanged();
+    partial void OnSortChanging(System.Nullable<int> value);
+    partial void OnSortChanged();
     #endregion
 		
 		public PreRun_SubInspectTermItem()
@@ -267874,126 +268012,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
-		public System.Nullable<int> WorkPackType
-		{
-			get
-			{
-				return this._WorkPackType;
-			}
-			set
-			{
-				if ((this._WorkPackType != value))
-				{
-					this.OnWorkPackTypeChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackType = value;
-					this.SendPropertyChanged("WorkPackType");
-					this.OnWorkPackTypeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
-		public string PropertyTechnologyId
-		{
-			get
-			{
-				return this._PropertyTechnologyId;
-			}
-			set
-			{
-				if ((this._PropertyTechnologyId != value))
-				{
-					this.OnPropertyTechnologyIdChanging(value);
-					this.SendPropertyChanging();
-					this._PropertyTechnologyId = value;
-					this.SendPropertyChanged("PropertyTechnologyId");
-					this.OnPropertyTechnologyIdChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")]
-		public string Remark
-		{
-			get
-			{
-				return this._Remark;
-			}
-			set
-			{
-				if ((this._Remark != value))
-				{
-					this.OnRemarkChanging(value);
-					this.SendPropertyChanging();
-					this._Remark = value;
-					this.SendPropertyChanged("Remark");
-					this.OnRemarkChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
-		public string AddUser
-		{
-			get
-			{
-				return this._AddUser;
-			}
-			set
-			{
-				if ((this._AddUser != value))
-				{
-					this.OnAddUserChanging(value);
-					this.SendPropertyChanging();
-					this._AddUser = value;
-					this.SendPropertyChanged("AddUser");
-					this.OnAddUserChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> AddTime
-		{
-			get
-			{
-				return this._AddTime;
-			}
-			set
-			{
-				if ((this._AddTime != value))
-				{
-					this.OnAddTimeChanging(value);
-					this.SendPropertyChanging();
-					this._AddTime = value;
-					this.SendPropertyChanged("AddTime");
-					this.OnAddTimeChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")]
-		public System.Nullable<int> Sort
-		{
-			get
-			{
-				return this._Sort;
-			}
-			set
-			{
-				if ((this._Sort != value))
-				{
-					this.OnSortChanging(value);
-					this.SendPropertyChanging();
-					this._Sort = value;
-					this.SendPropertyChanged("Sort");
-					this.OnSortChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractorIsPass", DbType="Int")]
 		public System.Nullable<int> SubcontractorIsPass
 		{
@@ -268154,6 +268172,126 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackType", DbType="Int")]
+		public System.Nullable<int> WorkPackType
+		{
+			get
+			{
+				return this._WorkPackType;
+			}
+			set
+			{
+				if ((this._WorkPackType != value))
+				{
+					this.OnWorkPackTypeChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackType = value;
+					this.SendPropertyChanged("WorkPackType");
+					this.OnWorkPackTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PropertyTechnologyId", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		public string PropertyTechnologyId
+		{
+			get
+			{
+				return this._PropertyTechnologyId;
+			}
+			set
+			{
+				if ((this._PropertyTechnologyId != value))
+				{
+					this.OnPropertyTechnologyIdChanging(value);
+					this.SendPropertyChanging();
+					this._PropertyTechnologyId = value;
+					this.SendPropertyChanged("PropertyTechnologyId");
+					this.OnPropertyTechnologyIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(200)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddUser", DbType="VarChar(50)")]
+		public string AddUser
+		{
+			get
+			{
+				return this._AddUser;
+			}
+			set
+			{
+				if ((this._AddUser != value))
+				{
+					this.OnAddUserChanging(value);
+					this.SendPropertyChanging();
+					this._AddUser = value;
+					this.SendPropertyChanged("AddUser");
+					this.OnAddUserChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AddTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AddTime
+		{
+			get
+			{
+				return this._AddTime;
+			}
+			set
+			{
+				if ((this._AddTime != value))
+				{
+					this.OnAddTimeChanging(value);
+					this.SendPropertyChanging();
+					this._AddTime = value;
+					this.SendPropertyChanged("AddTime");
+					this.OnAddTimeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sort", DbType="Int")]
+		public System.Nullable<int> Sort
+		{
+			get
+			{
+				return this._Sort;
+			}
+			set
+			{
+				if ((this._Sort != value))
+				{
+					this.OnSortChanging(value);
+					this.SendPropertyChanging();
+					this._Sort = value;
+					this.SendPropertyChanged("Sort");
+					this.OnSortChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -269155,6 +269293,8 @@ namespace Model
 		
 		private string _RestrictCondition;
 		
+		private System.Nullable<int> _ResponsibilityProposeSatate;
+		
 		private System.Nullable<int> _ResponsibilityConfirm;
 		
 		private System.Nullable<int> _ProposeConfirm;
@@ -269165,9 +269305,11 @@ namespace Model
 		
 		private System.Nullable<int> _OwnerConfirm;
 		
+		private System.Nullable<System.DateTime> _ProposeConfirmData;
+		
 		private System.Nullable<System.DateTime> _ResponsibilityConfirmData;
 		
-		private System.Nullable<System.DateTime> _ProposeConfirmData;
+		private System.Nullable<System.DateTime> _ProposeHandleData;
 		
 		private System.Nullable<System.DateTime> _GeneraConfirmData;
 		
@@ -269183,10 +269325,6 @@ namespace Model
 		
 		private System.Nullable<int> _Sort;
 		
-		private System.Nullable<int> _ResponsibilityProposeSatate;
-		
-		private System.Nullable<System.DateTime> _ProposeHandleData;
-		
 		private string _FourDecisionCode;
 		
     #region 可扩展性方法定义
@@ -269223,6 +269361,8 @@ namespace Model
     partial void OnRealityDestructionTimeChanged();
     partial void OnRestrictConditionChanging(string value);
     partial void OnRestrictConditionChanged();
+    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
+    partial void OnResponsibilityProposeSatateChanged();
     partial void OnResponsibilityConfirmChanging(System.Nullable<int> value);
     partial void OnResponsibilityConfirmChanged();
     partial void OnProposeConfirmChanging(System.Nullable<int> value);
@@ -269233,10 +269373,12 @@ namespace Model
     partial void OnSupervisionConfirmChanged();
     partial void OnOwnerConfirmChanging(System.Nullable<int> value);
     partial void OnOwnerConfirmChanged();
-    partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnResponsibilityConfirmDataChanged();
     partial void OnProposeConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnProposeConfirmDataChanged();
+    partial void OnResponsibilityConfirmDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnResponsibilityConfirmDataChanged();
+    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
+    partial void OnProposeHandleDataChanged();
     partial void OnGeneraConfirmDataChanging(System.Nullable<System.DateTime> value);
     partial void OnGeneraConfirmDataChanged();
     partial void OnSupervisionConfirmDataChanging(System.Nullable<System.DateTime> value);
@@ -269251,10 +269393,6 @@ namespace Model
     partial void OnAddTimeChanged();
     partial void OnSortChanging(System.Nullable<int> value);
     partial void OnSortChanged();
-    partial void OnResponsibilityProposeSatateChanging(System.Nullable<int> value);
-    partial void OnResponsibilityProposeSatateChanged();
-    partial void OnProposeHandleDataChanging(System.Nullable<System.DateTime> value);
-    partial void OnProposeHandleDataChanged();
     partial void OnFourDecisionCodeChanging(string value);
     partial void OnFourDecisionCodeChanged();
     #endregion
@@ -269564,6 +269702,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
+		public System.Nullable<int> ResponsibilityProposeSatate
+		{
+			get
+			{
+				return this._ResponsibilityProposeSatate;
+			}
+			set
+			{
+				if ((this._ResponsibilityProposeSatate != value))
+				{
+					this.OnResponsibilityProposeSatateChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibilityProposeSatate = value;
+					this.SendPropertyChanged("ResponsibilityProposeSatate");
+					this.OnResponsibilityProposeSatateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirm", DbType="Int")]
 		public System.Nullable<int> ResponsibilityConfirm
 		{
@@ -269664,6 +269822,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeConfirmData
+		{
+			get
+			{
+				return this._ProposeConfirmData;
+			}
+			set
+			{
+				if ((this._ProposeConfirmData != value))
+				{
+					this.OnProposeConfirmDataChanging(value);
+					this.SendPropertyChanging();
+					this._ProposeConfirmData = value;
+					this.SendPropertyChanged("ProposeConfirmData");
+					this.OnProposeConfirmDataChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityConfirmData", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ResponsibilityConfirmData
 		{
@@ -269684,22 +269862,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeConfirmData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeConfirmData
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ProposeHandleData
 		{
 			get
 			{
-				return this._ProposeConfirmData;
+				return this._ProposeHandleData;
 			}
 			set
 			{
-				if ((this._ProposeConfirmData != value))
+				if ((this._ProposeHandleData != value))
 				{
-					this.OnProposeConfirmDataChanging(value);
+					this.OnProposeHandleDataChanging(value);
 					this.SendPropertyChanging();
-					this._ProposeConfirmData = value;
-					this.SendPropertyChanged("ProposeConfirmData");
-					this.OnProposeConfirmDataChanged();
+					this._ProposeHandleData = value;
+					this.SendPropertyChanged("ProposeHandleData");
+					this.OnProposeHandleDataChanged();
 				}
 			}
 		}
@@ -269844,46 +270022,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibilityProposeSatate", DbType="Int")]
-		public System.Nullable<int> ResponsibilityProposeSatate
-		{
-			get
-			{
-				return this._ResponsibilityProposeSatate;
-			}
-			set
-			{
-				if ((this._ResponsibilityProposeSatate != value))
-				{
-					this.OnResponsibilityProposeSatateChanging(value);
-					this.SendPropertyChanging();
-					this._ResponsibilityProposeSatate = value;
-					this.SendPropertyChanged("ResponsibilityProposeSatate");
-					this.OnResponsibilityProposeSatateChanged();
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposeHandleData", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ProposeHandleData
-		{
-			get
-			{
-				return this._ProposeHandleData;
-			}
-			set
-			{
-				if ((this._ProposeHandleData != value))
-				{
-					this.OnProposeHandleDataChanging(value);
-					this.SendPropertyChanging();
-					this._ProposeHandleData = value;
-					this.SendPropertyChanged("ProposeHandleData");
-					this.OnProposeHandleDataChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FourDecisionCode", DbType="VarChar(20)")]
 		public string FourDecisionCode
 		{
@@ -270596,7 +270734,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string Remark
 		{
 			get

From 7fca28cc33608048b01e3202a00c9589140abe1c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:29:45 +0800
Subject: [PATCH 06/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user |  2 +-
 SGGL/FineUIPro.Web/Web.config                |  2 +-
 SGGL/Model/Model.cs                          | 10 +++++-----
 SGGL/WebAPI/WebAPI.csproj.user               |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c4484e3e..f8ca7c7a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 37de607d..f2c2e849 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -76,7 +76,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 676b1b4d..5f548e84 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -22,7 +22,7 @@ namespace Model
 	using System;
 	
 	
-	public partial class SGGLDB_WH : System.Data.Linq.DataContext
+	public partial class SGGLDB : System.Data.Linq.DataContext
 	{
 		
 		private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@@ -2527,25 +2527,25 @@ namespace Model
     partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance);
     #endregion
 		
-		public SGGLDB_WH(string connection) : 
+		public SGGLDB(string connection) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB_WH(System.Data.IDbConnection connection) : 
+		public SGGLDB(System.Data.IDbConnection connection) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB_WH(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
+		public SGGLDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
 		}
 		
-		public SGGLDB_WH(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
+		public SGGLDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : 
 				base(connection, mappingSource)
 		{
 			OnCreated();
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 6bc24ada..4edb5e0f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From bf1ede67fde4476f2456e8867723dfeee81b37d3 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 26 Jan 2024 17:31:55 +0800
Subject: [PATCH 07/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 1e89f1fc..81f3be4b 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -368,6 +368,7 @@
     <Content Include="common\Menu_ToDo.xml" />
     <Content Include="common\Menu_ZHGL.xml" />
     <Content Include="common\themes.aspx" />
+    <Content Include="Controls\DataImportControl.ascx" />
     <Content Include="Controls\FlowOperateControl.ascx" />
     <Content Include="Controls\QRCodePrint.aspx" />
     <Content Include="Controls\SeeQRImage.aspx" />
@@ -6851,6 +6852,13 @@
     <Compile Include="common\themes.aspx.designer.cs">
       <DependentUpon>themes.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Controls\DataImportControl.ascx.cs">
+      <DependentUpon>DataImportControl.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Controls\DataImportControl.ascx.designer.cs">
+      <DependentUpon>DataImportControl.ascx</DependentUpon>
+    </Compile>
     <Compile Include="Controls\FlowOperateControl.ascx.cs">
       <DependentUpon>FlowOperateControl.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>

From 4f0caef4dc7866eac3dbdd739982aae33e3b440d Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Mon, 29 Jan 2024 10:02:33 +0800
Subject: [PATCH 08/31] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1-14移交管理图表（Menu_Transfer）.sql     | 50 +++++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       | 88 +++++++++++++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |  2 +-
 .../Transfer/Chart/CivilStructure.aspx        | 16 ++++
 .../Transfer/Chart/CivilStructure.aspx.cs     | 17 ++++
 .../Chart/CivilStructure.aspx.designer.cs     | 25 ++++++
 .../Transfer/Chart/Electrical.aspx            | 16 ++++
 .../Transfer/Chart/Electrical.aspx.cs         | 17 ++++
 .../Chart/Electrical.aspx.designer.cs         | 25 ++++++
 .../Transfer/Chart/Firefighting.aspx          | 16 ++++
 .../Transfer/Chart/Firefighting.aspx.cs       | 17 ++++
 .../Chart/Firefighting.aspx.designer.cs       | 25 ++++++
 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx   | 16 ++++
 .../FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs | 17 ++++
 .../Transfer/Chart/HVAC.aspx.designer.cs      | 25 ++++++
 .../Transfer/Chart/Instrumentation.aspx       | 16 ++++
 .../Transfer/Chart/Instrumentation.aspx.cs    | 17 ++++
 .../Chart/Instrumentation.aspx.designer.cs    | 25 ++++++
 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx | 16 ++++
 .../Transfer/Chart/Piping.aspx.cs             | 17 ++++
 .../Transfer/Chart/Piping.aspx.designer.cs    | 25 ++++++
 .../Transfer/Chart/Plumbing.aspx              | 16 ++++
 .../Transfer/Chart/Plumbing.aspx.cs           | 17 ++++
 .../Transfer/Chart/Plumbing.aspx.designer.cs  | 25 ++++++
 .../Transfer/Chart/PunchlistFrom.aspx         | 16 ++++
 .../Transfer/Chart/PunchlistFrom.aspx.cs      | 17 ++++
 .../Chart/PunchlistFrom.aspx.designer.cs      | 25 ++++++
 .../Transfer/Chart/RotatingEquipment.aspx     | 16 ++++
 .../Transfer/Chart/RotatingEquipment.aspx.cs  | 17 ++++
 .../Chart/RotatingEquipment.aspx.designer.cs  | 25 ++++++
 .../Transfer/Chart/StaticEquipment.aspx       | 16 ++++
 .../Transfer/Chart/StaticEquipment.aspx.cs    | 17 ++++
 .../Chart/StaticEquipment.aspx.designer.cs    | 25 ++++++
 .../FineUIPro.Web/Transfer/Chart/Telecom.aspx | 16 ++++
 .../Transfer/Chart/Telecom.aspx.cs            | 17 ++++
 .../Transfer/Chart/Telecom.aspx.designer.cs   | 25 ++++++
 SGGL/FineUIPro.Web/Web.config                 |  5 +-
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   | 12 +++
 SGGL/WebAPI/WebAPI.csproj.user                |  2 +-
 39 files changed, 793 insertions(+), 4 deletions(-)
 create mode 100644 DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs

diff --git a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
new file mode 100644
index 00000000..8f602f9b
--- /dev/null
+++ b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
@@ -0,0 +1,50 @@
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('3517DBE2-9728-4BA0-9EA5-AE2147DB883B','�ƽ�ͼ��','',
+130,'0','Menu_Transfer',0,0,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('4B83D8B6-18E8-41E3-A6BF-72432B2B1F56','Piping',
+'Transfer/Chart/Piping.aspx',10,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('D8579ED5-77E7-4BB3-8065-FD10F5681255','Static Equipment',
+'Transfer/Chart/StaticEquipment.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('AD1159B3-023F-45AC-A6C2-D5498A8D7D33','Rotating Equipment',
+'Transfer/Chart/RotatingEquipment.aspx',30,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('E6F5125D-DD94-4978-B7EB-D9C26694D86D','Instrumentation',
+'Transfer/Chart/Instrumentation.aspx',40,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('713B1FB5-B70D-4C79-9CE4-71CE6B543146','Electrical',
+'Transfer/Chart/Electrical.aspx',50,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('71FC9E2A-D2AE-43E3-A5E4-BD7C0468C940','Civil Structure',
+'Transfer/Chart/CivilStructure.aspx',60,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('83CB9222-5E5E-4AAF-BDBC-0EE141262B5D','Firefighting',
+'Transfer/Chart/Firefighting.aspx',70,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('66E63C90-0F4E-4737-82A2-090EF8ABB3C7','Telecom',
+'Transfer/Chart/Telecom.aspx',80,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('EC2705EA-629A-4C0F-AC3A-A7BA848A3C34','Plumbing',
+'Transfer/Chart/Plumbing.aspx',90,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('BF7CD047-466D-4399-BF59-B8ED569F2819','HVAC',
+'Transfer/Chart/HVAC.aspx',100,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','Punchlist from',
+'Transfer/Chart/PunchlistFrom.aspx',110,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
+
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 81f3be4b..e10cfad1 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1830,6 +1830,17 @@
     <Content Include="TestRun\TestRunManage\TailTermHandleList.aspx" />
     <Content Include="TestRun\TestRunManage\TestRunRecordUpload.aspx" />
     <Content Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx" />
+    <Content Include="Transfer\Chart\CivilStructure.aspx" />
+    <Content Include="Transfer\Chart\Electrical.aspx" />
+    <Content Include="Transfer\Chart\Firefighting.aspx" />
+    <Content Include="Transfer\Chart\HVAC.aspx" />
+    <Content Include="Transfer\Chart\Instrumentation.aspx" />
+    <Content Include="Transfer\Chart\Piping.aspx" />
+    <Content Include="Transfer\Chart\Plumbing.aspx" />
+    <Content Include="Transfer\Chart\PunchlistFrom.aspx" />
+    <Content Include="Transfer\Chart\RotatingEquipment.aspx" />
+    <Content Include="Transfer\Chart\StaticEquipment.aspx" />
+    <Content Include="Transfer\Chart\Telecom.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
@@ -16354,6 +16365,83 @@
     <Compile Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx.designer.cs">
       <DependentUpon>TestRunRecordUploadList.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Chart\CivilStructure.aspx.cs">
+      <DependentUpon>CivilStructure.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\CivilStructure.aspx.designer.cs">
+      <DependentUpon>CivilStructure.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Electrical.aspx.cs">
+      <DependentUpon>Electrical.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Electrical.aspx.designer.cs">
+      <DependentUpon>Electrical.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Firefighting.aspx.cs">
+      <DependentUpon>Firefighting.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Firefighting.aspx.designer.cs">
+      <DependentUpon>Firefighting.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\HVAC.aspx.cs">
+      <DependentUpon>HVAC.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\HVAC.aspx.designer.cs">
+      <DependentUpon>HVAC.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Instrumentation.aspx.cs">
+      <DependentUpon>Instrumentation.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Instrumentation.aspx.designer.cs">
+      <DependentUpon>Instrumentation.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Piping.aspx.cs">
+      <DependentUpon>Piping.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Piping.aspx.designer.cs">
+      <DependentUpon>Piping.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Plumbing.aspx.cs">
+      <DependentUpon>Plumbing.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Plumbing.aspx.designer.cs">
+      <DependentUpon>Plumbing.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFrom.aspx.cs">
+      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\PunchlistFrom.aspx.designer.cs">
+      <DependentUpon>PunchlistFrom.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\RotatingEquipment.aspx.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\RotatingEquipment.aspx.designer.cs">
+      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\StaticEquipment.aspx.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\StaticEquipment.aspx.designer.cs">
+      <DependentUpon>StaticEquipment.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Transfer\Chart\Telecom.aspx.cs">
+      <DependentUpon>Telecom.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\Telecom.aspx.designer.cs">
+      <DependentUpon>Telecom.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\CivilStructure.aspx.cs">
       <DependentUpon>CivilStructure.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f8ca7c7a..c4484e3e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
new file mode 100644
index 00000000..104375f0
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CivilStructure.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.CivilStructure" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
new file mode 100644
index 00000000..98f1f36d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class CivilStructure : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
new file mode 100644
index 00000000..41bc479d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class CivilStructure
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
new file mode 100644
index 00000000..d525baed
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Electrical.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Electrical" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
new file mode 100644
index 00000000..66b9ce33
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Electrical : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
new file mode 100644
index 00000000..309a7743
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Electrical
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
new file mode 100644
index 00000000..d5d87bc3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Firefighting.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Firefighting" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
new file mode 100644
index 00000000..e08dd12d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Firefighting : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
new file mode 100644
index 00000000..2fea476c
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Firefighting
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
new file mode 100644
index 00000000..a7c813c1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HVAC.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.HVAC" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
new file mode 100644
index 00000000..0d22dd9d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class HVAC : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
new file mode 100644
index 00000000..8cae12ea
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class HVAC
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
new file mode 100644
index 00000000..9715f314
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Instrumentation.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Instrumentation" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
new file mode 100644
index 00000000..c3ab6622
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Instrumentation : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
new file mode 100644
index 00000000..c8e4a650
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Instrumentation
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
new file mode 100644
index 00000000..ec068d15
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Piping.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Piping" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
new file mode 100644
index 00000000..6eae9ebd
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Piping : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
new file mode 100644
index 00000000..38219c00
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Piping
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
new file mode 100644
index 00000000..72a01361
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Plumbing.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Plumbing" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
new file mode 100644
index 00000000..29320d17
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Plumbing : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
new file mode 100644
index 00000000..a74b7d1f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Plumbing
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
new file mode 100644
index 00000000..8a30d823
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFrom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFrom" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
new file mode 100644
index 00000000..c64b3db1
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFrom : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
new file mode 100644
index 00000000..509734ff
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class PunchlistFrom
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
new file mode 100644
index 00000000..f4301891
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.RotatingEquipment" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
new file mode 100644
index 00000000..34f8a11f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class RotatingEquipment : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
new file mode 100644
index 00000000..7591da93
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class RotatingEquipment
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
new file mode 100644
index 00000000..b8dcff2e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.StaticEquipment" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
new file mode 100644
index 00000000..608e802b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class StaticEquipment : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
new file mode 100644
index 00000000..8949e11a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class StaticEquipment
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
new file mode 100644
index 00000000..ec0082b6
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Telecom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Telecom" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+        </div>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
new file mode 100644
index 00000000..338f7427
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Telecom : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs
new file mode 100644
index 00000000..f3a8f109
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class Telecom
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f2c2e849..7c103ddf 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,8 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <!--<add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
+   <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -76,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index c006fd7f..3959574b 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -13,4 +13,16 @@
 <TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
 <TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
 <TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="4B83D8B6-18E8-41E3-A6BF-72432B2B1F56" Text="Piping" NavigateUrl="Transfer/Chart/Piping.aspx"></TreeNode>
+<TreeNode id="D8579ED5-77E7-4BB3-8065-FD10F5681255" Text="Static Equipment" NavigateUrl="Transfer/Chart/StaticEquipment.aspx"></TreeNode>
+<TreeNode id="AD1159B3-023F-45AC-A6C2-D5498A8D7D33" Text="Rotating Equipment" NavigateUrl="Transfer/Chart/RotatingEquipment.aspx"></TreeNode>
+<TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="Instrumentation" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
+<TreeNode id="713B1FB5-B70D-4C79-9CE4-71CE6B543146" Text="Electrical" NavigateUrl="Transfer/Chart/Electrical.aspx"></TreeNode>
+<TreeNode id="71FC9E2A-D2AE-43E3-A5E4-BD7C0468C940" Text="Civil Structure" NavigateUrl="Transfer/Chart/CivilStructure.aspx"></TreeNode>
+<TreeNode id="83CB9222-5E5E-4AAF-BDBC-0EE141262B5D" Text="Firefighting" NavigateUrl="Transfer/Chart/Firefighting.aspx"></TreeNode>
+<TreeNode id="66E63C90-0F4E-4737-82A2-090EF8ABB3C7" Text="Telecom" NavigateUrl="Transfer/Chart/Telecom.aspx"></TreeNode>
+<TreeNode id="EC2705EA-629A-4C0F-AC3A-A7BA848A3C34" Text="Plumbing" NavigateUrl="Transfer/Chart/Plumbing.aspx"></TreeNode>
+<TreeNode id="BF7CD047-466D-4399-BF59-B8ED569F2819" Text="HVAC" NavigateUrl="Transfer/Chart/HVAC.aspx"></TreeNode>
+<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 38a0dc2263a243f116aa282d6457c4ec65d7a291 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Mon, 29 Jan 2024 16:57:52 +0800
Subject: [PATCH 09/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/ConstInitData.sql                    |   3 +
 .../版本日志/SGGLDB_WH_2024-01-29-gaofei.sql  |  71 +++++
 .../0-1系统设置（Menu_SysSet）.sql            |   9 +
 SGGL/BLL/BLL.csproj                           |   1 +
 SGGL/BLL/BaseInfo/TransferMajorService.cs     |  86 +++++
 SGGL/BLL/Common/Const.cs                      |   4 +
 .../FineUIPro.Web/BaseInfo/TransferMajor.aspx | 152 +++++++++
 .../BaseInfo/TransferMajor.aspx.cs            | 280 ++++++++++++++++
 .../BaseInfo/TransferMajor.aspx.designer.cs   | 204 ++++++++++++
 SGGL/FineUIPro.Web/ErrLog.txt                 | 300 ++++++++++++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 .../TestRun/DriverPrepare/SchemePlan.aspx     |   2 +
 .../TestRun/DriverPrepare/SchemePlan.aspx.cs  |  15 +
 .../DriverPrepare/SchemePlan.aspx.designer.cs |   9 +
 SGGL/FineUIPro.Web/common/Menu_HSSE.xml       |   4 +-
 SGGL/FineUIPro.Web/common/Menu_SysSet.xml     |   1 +
 SGGL/FineUIPro.Web/common/Menu_TestRun.xml    |   4 +-
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   |   2 +-
 SGGL/Model/Model.cs                           | 169 ++++++++++
 19 files changed, 1320 insertions(+), 4 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-01-29-gaofei.sql
 create mode 100644 SGGL/BLL/BaseInfo/TransferMajorService.cs
 create mode 100644 SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx
 create mode 100644 SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.designer.cs

diff --git a/DataBase/ConstInitData.sql b/DataBase/ConstInitData.sql
index eb357dc8..9e03c871 100644
--- a/DataBase/ConstInitData.sql
+++ b/DataBase/ConstInitData.sql
@@ -572,6 +572,9 @@ GO
 INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId)  
 VALUES('85CF0BBF-A3F3-42DF-89DC-CE9A4886BCA1','Menu_Video','��Ƶ���',11,'MenuType_P')
 GO
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) 
+VALUES('4F835AC7-9FD8-443D-A5A6-F557AA5A2221','Menu_Transfer','�ƽ�����',12,'MenuType_P')
+GO
 
 --��Ŀ����
 INSERT INTO dbo.Sys_Const(ID, ConstValue, ConstText, SortIndex, GroupId)
diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-29-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-29-gaofei.sql
new file mode 100644
index 00000000..39437a4f
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-29-gaofei.sql
@@ -0,0 +1,71 @@
+INSERT INTO Sys_Const (ID,ConstValue,ConstText,SortIndex,GroupId) 
+VALUES('4F835AC7-9FD8-443D-A5A6-F557AA5A2221','Menu_Transfer','�ƽ�����',12,'MenuType_P')
+GO
+
+	insert into Sys_Menu( MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType ,IsOffice,IsEnd,IsUsed )
+	values('D0850615-BF32-4CFA-84CA-EEA261676EA8','�ƽ�רҵ����','BaseInfo/TransferMajor.aspx',180,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1)
+	GO
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('0465EA2B-2F37-4103-A717-4033894108E0','D0850615-BF32-4CFA-84CA-EEA261676EA8','����',1)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('EF58BDF7-F303-4633-8B83-DB4B151F8EAF','D0850615-BF32-4CFA-84CA-EEA261676EA8','�޸�',2)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('FC1373E2-D942-4D0E-822F-CE2F16C5D42D','D0850615-BF32-4CFA-84CA-EEA261676EA8','ɾ��',3)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('65427D56-5490-42D7-8F00-EB3A59FAA6B0','D0850615-BF32-4CFA-84CA-EEA261676EA8','����',4)
+	GO
+
+
+CREATE TABLE [dbo].[Base_TransferMajor](
+	[TransferMajorId] [nvarchar](50) NOT NULL,
+	[Discipline] [nvarchar](50) NULL,
+	[Major] [nvarchar](50) NULL,
+	[DisciplineCode] [nvarchar](50) NULL,
+	[Remark] [nvarchar](200) NULL,
+ CONSTRAINT [PK_BaseInfo_TransferMajor] PRIMARY KEY CLUSTERED 
+(
+	[TransferMajorId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'�ƽ�רҵ��' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_TransferMajor'
+GO
+
+
+INSERT INTO Base_TransferMajor 
+VALUES('7A0CD361-2BF9-466A-A586-3DBA49A7D4A1','Static Equipment','���豸','01',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('3D5FC248-8437-4062-A882-945C077B1910','Equipment','���豸','02',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('B55C034D-057E-4CD3-B09B-75DBDB7D2CDC','Piping','�ܵ�','03',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('2DA0AB18-78BD-43A5-BBB0-2BF96E25789E','Instrument','�DZ�','04','only refer to field instrument')
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('A7C08424-D6B4-40AD-8563-DCD793290ADE','Eletrical','����','05',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('0A4DE4BE-DE07-41F2-ABB1-FE8B8710BC2A','Structure','�ṹ','06',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('2EE1D310-53DF-43E1-B7A0-F4C1389E4A52','Civil','����','07',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('2CDA9F7D-2212-4D6F-9E62-14241BA57DF3','Architecture','����','08',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('53CB3BF5-517F-4E67-A218-E9A7E1E31A58','FF','����','09',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('B87322EC-75DA-4BEB-9CED-31B7E89B4FA9','Plumbing','����ˮ','10',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('D109A3D9-E8CC-46B4-830A-AB2686E6321F','Plot Plan','��ͼ','11',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('DE4904D2-1CD8-4248-8599-AC16995FBDDB','Telecom','����','12',null)
+GO
+INSERT INTO Base_TransferMajor 
+VALUES('82B6666D-1866-4A38-927A-0B2DB60C4D64','HVAC','ůͨ','13',null)
+GO
\ No newline at end of file
diff --git a/DataBase/菜单初始化脚本/0-1系统设置（Menu_SysSet）.sql b/DataBase/菜单初始化脚本/0-1系统设置（Menu_SysSet）.sql
index 0459d502..e85a33ac 100644
--- a/DataBase/菜单初始化脚本/0-1系统设置（Menu_SysSet）.sql
+++ b/DataBase/菜单初始化脚本/0-1系统设置（Menu_SysSet）.sql
@@ -244,6 +244,15 @@ GO
 	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('124B7659-5F18-49F3-8D30-BF8680830827','F0DF2F2B-7C12-4A0F-B7D4-0B00BADE1D64','����',4)
 	GO
 
+	insert into Sys_Menu( MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType ,IsOffice,IsEnd,IsUsed )
+	values('D0850615-BF32-4CFA-84CA-EEA261676EA8','�ƽ�רҵ����','BaseInfo/TransferMajor.aspx',180,'5196A6FD-4BF1-46B3-8D24-9A3CE5BB4760','Menu_SysSet',1,1,1)
+	GO
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('0465EA2B-2F37-4103-A717-4033894108E0','D0850615-BF32-4CFA-84CA-EEA261676EA8','����',1)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('EF58BDF7-F303-4633-8B83-DB4B151F8EAF','D0850615-BF32-4CFA-84CA-EEA261676EA8','�޸�',2)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('FC1373E2-D942-4D0E-822F-CE2F16C5D42D','D0850615-BF32-4CFA-84CA-EEA261676EA8','ɾ��',3)
+	insert into Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) values('65427D56-5490-42D7-8F00-EB3A59FAA6B0','D0850615-BF32-4CFA-84CA-EEA261676EA8','����',4)
+	GO
+
 /****������������******/
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('A93BA810-3511-4BB2-9C10-9663351DF79F','��������','',20,'D363BD9D-4DEC-45D8-89C8-B0E49DEF61B4','Menu_SysSet',1,0,1)
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index f388964b..372cebec 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -165,6 +165,7 @@
     <Compile Include="BaseInfo\SteelService.cs" />
     <Compile Include="BaseInfo\TrainLevelService.cs" />
     <Compile Include="BaseInfo\TrainTypeService.cs" />
+    <Compile Include="BaseInfo\TransferMajorService.cs" />
     <Compile Include="BaseInfo\UnitTypeService.cs" />
     <Compile Include="BaseInfo\WorkPostService.cs" />
     <Compile Include="BaseInfo\WorkStageService.cs" />
diff --git a/SGGL/BLL/BaseInfo/TransferMajorService.cs b/SGGL/BLL/BaseInfo/TransferMajorService.cs
new file mode 100644
index 00000000..2099310b
--- /dev/null
+++ b/SGGL/BLL/BaseInfo/TransferMajorService.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+    /// <summary>
+    /// 移交专业
+    /// </summary>
+    public static class TransferMajorService
+    {
+        public static Model.SGGLDB db = Funs.DB;
+
+        /// <summary>
+        /// 根据主键获取移交专业
+        /// </summary>
+        /// <param name="TransferMajorId"></param>
+        /// <returns></returns>
+        public static Model.Base_TransferMajor GetTransferMajorById(string TransferMajorId)
+        {
+            return Funs.DB.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajorId);
+        }
+
+        /// <summary>
+        /// 添加移交专业
+        /// </summary>
+        /// <param name="TransferMajor"></param>
+        public static void AddTransferMajor(Model.Base_TransferMajor TransferMajor)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_TransferMajor newTransferMajor = new Model.Base_TransferMajor
+            {
+                TransferMajorId = TransferMajor.TransferMajorId,
+                Discipline = TransferMajor.Discipline,
+                Major = TransferMajor.Major,
+                DisciplineCode = TransferMajor.DisciplineCode,
+                Remark = TransferMajor.Remark
+            };
+            db.Base_TransferMajor.InsertOnSubmit(newTransferMajor);
+            db.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 修改移交专业
+        /// </summary>
+        /// <param name="TransferMajor"></param>
+        public static void UpdateTransferMajor(Model.Base_TransferMajor TransferMajor)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_TransferMajor newTransferMajor = db.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajor.TransferMajorId);
+            if (newTransferMajor != null)
+            {
+                newTransferMajor.Discipline = TransferMajor.Discipline;
+                newTransferMajor.Major = TransferMajor.Major;
+                newTransferMajor.DisciplineCode = TransferMajor.DisciplineCode;
+                newTransferMajor.Remark = TransferMajor.Remark;
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据主键删除移交专业
+        /// </summary>
+        /// <param name="TransferMajorId"></param>
+        public static void DeleteTransferMajorById(string TransferMajorId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.Base_TransferMajor TransferMajor = db.Base_TransferMajor.FirstOrDefault(e => e.TransferMajorId == TransferMajorId);
+            if (TransferMajor != null)
+            {
+                db.Base_TransferMajor.DeleteOnSubmit(TransferMajor);
+                db.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 获取移交专业下拉列表项
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.Base_TransferMajor> GetTransferMajorList()
+        {
+            return (from x in Funs.DB.Base_TransferMajor orderby x.DisciplineCode select x).ToList();
+        }
+    }
+}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 2b52aa32..a96ed1c0 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -1026,6 +1026,10 @@ namespace BLL
         /// 风险等级
         /// </summary>
         public const string RiskLevelMenuId = "E4B526CC-805E-4131-8E18-2FFA6871507E";
+        /// <summary>
+        /// 移交专业
+        /// </summary>
+        public const string TransferMajorMenuId = "D0850615-BF32-4CFA-84CA-EEA261676EA8";
         #endregion
 
         #region 质量基础信息
diff --git a/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx
new file mode 100644
index 00000000..07c4b6a5
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx
@@ -0,0 +1,152 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TransferMajor.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.TransferMajor" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <title>移交专业</title>
+    <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="移交专业" Layout="HBox" ShowHeader="false">
+            <Items>
+                <f:Grid ID="Grid1" Title="移交专业" ShowHeader="false" EnableCollapse="true" PageSize="10" EnableColumnLines="true"
+                    ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="750px" ForceFit="true"
+                    DataKeyNames="TransferMajorId" DataIDField="TransferMajorId" OnPageIndexChange="Grid1_PageIndexChange"
+                    AllowFilters="true" OnFilterChange="Grid1_FilterChange" EnableTextSelection="True">
+                    <Columns>
+                        <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField Width="150px" ColumnID="Discipline" DataField="Discipline" FieldType="String"
+                            HeaderText="Discipline" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="90px" ColumnID="Major" DataField="Major" FieldType="String"
+                            HeaderText="专业" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="150px" ColumnID="DisciplineCode" DataField="DisciplineCode" FieldType="String"
+                            HeaderText="Discipline Code" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                        <f:RenderField Width="200px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                            HeaderText="Remark" HeaderTextAlign="Center" TextAlign="Left">
+                        </f:RenderField>
+                    </Columns>
+                    <Listeners>
+                        <f:Listener Event="rowselect" Handler="onGridRowSelect" />
+                        <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                    </Listeners>
+                    <PageItems>
+                        <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
+                        </f:ToolbarSeparator>
+                        <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
+                        </f:ToolbarText>
+                        <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                            OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                        </f:DropDownList>
+                    </PageItems>
+                </f:Grid>
+                <f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
+                    LabelWidth="80px" BodyPadding="5px" Width="350px">
+                    <Items>
+                        <f:TextBox ID="hfFormID" runat="server" Hidden="true"></f:TextBox>
+                        <f:TextBox ID="txtDiscipline" Label="Discipline" ShowRedStar="true" Required="true" runat="server"
+                            LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                        </f:TextBox>
+                        <f:TextBox ID="txtMajor" Label="专业" ShowRedStar="true" Required="true" runat="server"
+                            LabelAlign="right" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
+                        </f:TextBox>
+                        <f:TextBox ID="txtDisciplineCode" runat="server" Label="Discipline Code" LabelAlign="right">
+                        </f:TextBox>
+                        <f:TextArea ID="txtRemark" runat="server" Label="备注" LabelAlign="right">
+                        </f:TextArea>
+                    </Items>
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">
+                            <Items>
+                                <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server">
+                                    <Listeners>
+                                        <f:Listener Event="click" Handler="onNewButtonClick" />
+                                    </Listeners>
+                                </f:Button>
+                                <f:Button ID="btnDelete" Enabled="false" ToolTip="删除" Icon="Delete" ConfirmText="确定删除当前数据？"
+                                    OnClick="btnDelete_Click" runat="server">
+                                </f:Button>
+                                <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                                </f:ToolbarFill>
+                                <f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
+                                    OnClick="btnSave_Click">
+                                </f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                </f:SimpleForm>
+            </Items>
+        </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" EnablePostBack="true"
+                runat="server" Text="编辑" Icon="Pencil">
+            </f:MenuButton>
+            <f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
+    </form>
+    <script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+
+
+        var gridClientID = '<%= Grid1.ClientID %>';
+        var btnDeleteClientID = '<%= btnDelete.ClientID %>';
+        var btnSaveClientID = '<%= btnSave.ClientID %>';
+
+        var formClientID = '<%= SimpleForm1.ClientID %>';
+        var hfFormIDClientID = '<%= hfFormID.ClientID %>';
+        var txtDisciplineClientID = '<%= txtDiscipline.ClientID %>';
+        var txtMajorClientID = '<%= txtMajor.ClientID %>';
+        var txtDisciplineCodeClientID = '<%= txtDisciplineCode.ClientID %>';
+        var txtRemarkClientID = '<%=txtRemark.ClientID %>';
+
+        function onGridRowSelect(event, rowId) {
+            var grid = F(gridClientID);
+
+            // 启用删除按钮
+            F(btnDeleteClientID).enable();
+
+            // 当前行数据
+            var rowValue = grid.getRowValue(rowId);
+
+            // 使用当前行数据填充表单字段
+            F(hfFormIDClientID).setValue(rowId);
+            F(txtDisciplineClientID).setValue(rowValue['Discipline']);
+            F(txtMajorClientID).setValue(rowValue['Major']);
+            F(txtDisciplineCodeClientID).setValue(rowValue['DisciplineCode']);
+            F(txtRemarkClientID).setValue(rowValue['Remark']);
+
+            // 更新保存按钮文本
+            //            F(btnSaveClientID).setText('保存数据（编辑）');
+        }
+
+        function onNewButtonClick() {
+            // 重置表单字段
+            F(formClientID).reset();
+            F(hfFormIDClientID).reset();
+            // 清空表格选中行
+            F(gridClientID).clearSelections();
+            // 禁用删除按钮
+            F(btnDeleteClientID).disable();
+
+            // 更新保存按钮文本
+            //            F(btnSaveClientID).setText('保存数据（新增）');
+        }
+    </script>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.cs
new file mode 100644
index 00000000..b0d6346e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.cs
@@ -0,0 +1,280 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.BaseInfo
+{
+    public partial class TransferMajor : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                ////权限按钮方法
+                this.GetButtonPower();
+                Funs.DropDownPageSize(this.ddlPageSize);
+                ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+                // 绑定表格
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            var q = from x in Funs.DB.Base_TransferMajor orderby x.DisciplineCode select x;
+            Grid1.RecordCount = q.Count();
+            // 2.获取当前分页数据
+            var table = GetPagedDataTable(Grid1.PageIndex, Grid1.PageSize);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        /// <summary>
+        /// 分页
+        /// </summary>
+        /// <returns></returns>
+        private List<Model.Base_TransferMajor> GetPagedDataTable(int pageIndex, int pageSize)
+        {
+            List<Model.Base_TransferMajor> source = (from x in Funs.DB.Base_TransferMajor orderby x.DisciplineCode select x).ToList();
+            List<Model.Base_TransferMajor> paged = new List<Model.Base_TransferMajor>();
+
+            int rowbegin = pageIndex * pageSize;
+            int rowend = (pageIndex + 1) * pageSize;
+            if (rowend > source.Count())
+            {
+                rowend = source.Count();
+            }
+
+            for (int i = rowbegin; i < rowend; i++)
+            {
+                paged.Add(source[i]);
+            }
+
+            return paged;
+        }
+
+        /// <summary>
+        /// 过滤表头
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_FilterChange(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            Grid1.PageIndex = e.NewPageIndex;
+            BindGrid();
+        }
+        #endregion
+
+        #region 分页下拉选择
+        /// <summary>
+        /// 分页下拉选择
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+        #endregion
+
+        #region 删除
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDelete_Click(object sender, EventArgs e)
+        {
+            var getV = BLL.TransferMajorService.GetTransferMajorById(hfFormID.Text);
+            if (getV != null)
+            {
+                BLL.LogService.AddSys_Log(this.CurrUser, getV.DisciplineCode, getV.TransferMajorId, BLL.Const.TransferMajorMenuId, BLL.Const.BtnDelete);
+                BLL.TransferMajorService.DeleteTransferMajorById(hfFormID.Text);
+                // 重新绑定表格，并模拟点击[新增按钮]
+                BindGrid();
+                PageContext.RegisterStartupScript("onNewButtonClick();");
+            }
+        }
+
+        /// <summary>
+        /// 右键删除事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuDelete_Click(object sender, EventArgs e)
+        {
+            this.DeleteData();
+        }
+
+        /// <summary>
+        /// 删除方法
+        /// </summary>
+        private void DeleteData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length > 0)
+            {
+                foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+                {
+                    string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+                    var getV = BLL.TransferMajorService.GetTransferMajorById(rowID);
+                    if (getV != null)
+                    {
+                        BLL.LogService.AddSys_Log(this.CurrUser, getV.DisciplineCode, getV.TransferMajorId, BLL.Const.TransferMajorMenuId, BLL.Const.BtnDelete);
+                        BLL.TransferMajorService.DeleteTransferMajorById(rowID);
+                    }
+                }
+
+                BindGrid();
+                PageContext.RegisterStartupScript("onNewButtonClick();");
+            }
+        }
+        #endregion
+
+        #region 编辑
+        /// <summary>
+        /// 右键编辑事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnMenuEdit_Click(object sender, EventArgs e)
+        {
+            this.EditData();
+        }
+
+        /// <summary>
+        /// 编辑数据方法
+        /// </summary>
+        private void EditData()
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string Id = Grid1.SelectedRowID;
+            var TransferMajor = BLL.TransferMajorService.GetTransferMajorById(Id);
+            if (TransferMajor != null)
+            {
+                this.txtDiscipline.Text = TransferMajor.Discipline;
+                this.txtMajor.Text = TransferMajor.Major;
+                this.txtDisciplineCode.Text = TransferMajor.DisciplineCode;
+                this.txtRemark.Text = TransferMajor.Remark;
+                hfFormID.Text = Id;
+                this.btnDelete.Enabled = true;
+            }
+        }
+        #endregion
+
+        #region 保存
+        /// <summary>
+        /// 保存按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            string strRowID = hfFormID.Text;
+            Model.Base_TransferMajor TransferMajor = new Model.Base_TransferMajor
+            {
+                Discipline = this.txtDiscipline.Text.Trim(),
+                Major = this.txtMajor.Text.Trim(),
+                DisciplineCode= this.txtDisciplineCode.Text.Trim(),
+                Remark = txtRemark.Text.Trim()
+            };
+            if (string.IsNullOrEmpty(strRowID))
+            {
+                TransferMajor.TransferMajorId = SQLHelper.GetNewID(typeof(Model.Base_TransferMajor));
+                BLL.TransferMajorService.AddTransferMajor(TransferMajor);
+                BLL.LogService.AddSys_Log(this.CurrUser, TransferMajor.Discipline, TransferMajor.TransferMajorId, BLL.Const.TransferMajorMenuId, BLL.Const.BtnAdd);
+            }
+            else
+            {
+                TransferMajor.TransferMajorId = strRowID;
+                BLL.TransferMajorService.UpdateTransferMajor(TransferMajor);
+                BLL.LogService.AddSys_Log(this.CurrUser, TransferMajor.Discipline, TransferMajor.TransferMajorId, BLL.Const.TransferMajorMenuId, BLL.Const.BtnModify);
+            }
+
+            this.SimpleForm1.Reset();
+            // 重新绑定表格，并点击当前编辑或者新增的行
+            BindGrid();
+            PageContext.RegisterStartupScript(String.Format("F('{0}').selectRow('{1}');", Grid1.ClientID, TransferMajor.TransferMajorId));
+        }
+        #endregion
+
+        #region 验证费用类别名称、编号是否存在
+        /// <summary>
+        /// 验证费用类别名称、编号是否存在
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            var q = Funs.DB.Base_TransferMajor.FirstOrDefault(x => x.Discipline == this.txtDiscipline.Text.Trim() && (x.TransferMajorId != hfFormID.Text || (hfFormID.Text == null && x.TransferMajorId != null)));
+            if (q != null)
+            {
+                ShowNotify("输入的Discipline已存在！", MessageBoxIcon.Warning);
+            }
+
+            var q2 = Funs.DB.Base_TransferMajor.FirstOrDefault(x => x.Major == this.txtMajor.Text.Trim() && (x.TransferMajorId != hfFormID.Text || (hfFormID.Text == null && x.TransferMajorId != null)));
+            if (q2 != null)
+            {
+                ShowNotify("输入的专业已存在！", MessageBoxIcon.Warning);
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.TransferMajorMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnAdd))
+                {
+                    this.btnNew.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnModify))
+                {
+                    this.btnMenuEdit.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnDelete))
+                {
+                    this.btnDelete.Hidden = false;
+                    this.btnMenuDelete.Hidden = false;
+                }
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion        
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.designer.cs
new file mode 100644
index 00000000..51b35e66
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/TransferMajor.aspx.designer.cs
@@ -0,0 +1,204 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo {
+    
+    
+    public partial class TransferMajor {
+        
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel1;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// ToolbarSeparator1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+        
+        /// <summary>
+        /// ToolbarText1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarText ToolbarText1;
+        
+        /// <summary>
+        /// ddlPageSize 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlPageSize;
+        
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.SimpleForm SimpleForm1;
+        
+        /// <summary>
+        /// hfFormID 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox hfFormID;
+        
+        /// <summary>
+        /// txtDiscipline 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDiscipline;
+        
+        /// <summary>
+        /// txtMajor 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMajor;
+        
+        /// <summary>
+        /// txtDisciplineCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDisciplineCode;
+        
+        /// <summary>
+        /// txtRemark 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRemark;
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// btnNew 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnNew;
+        
+        /// <summary>
+        /// btnDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDelete;
+        
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+        
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+        
+        /// <summary>
+        /// btnMenuEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuEdit;
+        
+        /// <summary>
+        /// btnMenuDelete 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnMenuDelete;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 40871f48..6e590a65 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -455,3 +455,303 @@ IP地址:::1
 出错时间:01/26/2024 12:55:46
 出错时间:01/26/2024 12:55:46
 
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/29/2024 11:51:59
+出错时间:01/29/2024 11:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/29/2024 11:51:59
+出错时间:01/29/2024 11:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/29/2024 11:51:59
+出错时间:01/29/2024 11:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/29/2024 11:51:59
+出错时间:01/29/2024 11:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/29/2024 13:51:58
+出错时间:01/29/2024 13:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/29/2024 13:51:59
+出错时间:01/29/2024 13:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/29/2024 13:51:59
+出错时间:01/29/2024 13:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/29/2024 13:51:59
+出错时间:01/29/2024 13:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/29/2024 15:51:58
+出错时间:01/29/2024 15:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/29/2024 15:51:59
+出错时间:01/29/2024 15:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/29/2024 15:51:59
+出错时间:01/29/2024 15:51:59
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/29/2024 15:51:59
+出错时间:01/29/2024 15:51:59
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 81f3be4b..566b43b6 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -244,6 +244,7 @@
     <Content Include="BaseInfo\TrainLevel.aspx" />
     <Content Include="BaseInfo\TrainType.aspx" />
     <Content Include="BaseInfo\TrainTypeEdit.aspx" />
+    <Content Include="BaseInfo\TransferMajor.aspx" />
     <Content Include="BaseInfo\UnitType.aspx" />
     <Content Include="BaseInfo\WorkPost.aspx" />
     <Content Include="BaseInfo\WorkStage.aspx" />
@@ -6474,6 +6475,13 @@
     <Compile Include="BaseInfo\TrainTypeEdit.aspx.designer.cs">
       <DependentUpon>TrainTypeEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="BaseInfo\TransferMajor.aspx.cs">
+      <DependentUpon>TransferMajor.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="BaseInfo\TransferMajor.aspx.designer.cs">
+      <DependentUpon>TransferMajor.aspx</DependentUpon>
+    </Compile>
     <Compile Include="BaseInfo\UnitType.aspx.cs">
       <DependentUpon>UnitType.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
index 05f4efc6..209da8ac 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx
@@ -28,6 +28,8 @@
                                 <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
                                     EnableAjax="false" DisableControlBeforePostBack="false">
                                 </f:Button>
+                                <f:Button ID="btnDel" Icon="Delete" ToolTip="删除" OnClick="btnDel_Click" runat="server" ConfirmText="确定删除当前数据？" Hidden="true">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
index 419f1737..0300fd86 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.cs
@@ -97,6 +97,20 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 ShowNotify("删除数据成功!", MessageBoxIcon.Success);
             }
         }
+
+        protected void btnDel_Click(object sender, EventArgs e)
+        {
+            var plan = (from x in Funs.DB.DriverPrepare_SchemePlan where x.ProjectId == this.CurrUser.LoginProjectId select x).FirstOrDefault();
+            if (plan == null)
+            {
+                Alert.ShowInTop("项目无记录，无需删除！", MessageBoxIcon.Warning);
+                return;
+            }
+            BLL.DriverPrepareSchemePlanItemService.DeleteSchemePlanItemByschemePlanId(plan.SchemePlanId);
+            BLL.DriverPrepareSchemePlanService.DeleteDriverPlan(plan.SchemePlanId);
+            BindGrid();
+            ShowNotify("删除数据成功!", MessageBoxIcon.Success);
+        }
         #endregion
 
         #region 权限设置
@@ -119,6 +133,7 @@ namespace FineUIPro.Web.TestRun.DriverPrepare
                 }
                 if (buttonList.Contains(BLL.Const.BtnDelete))
                 {
+                    this.btnDel.Hidden = false;
                     this.btnMenuDel.Hidden = false;
                 }
             }
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
index 39adf730..47e4ff3c 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverPrepare/SchemePlan.aspx.designer.cs
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.TestRun.DriverPrepare {
         /// </remarks>
         protected global::FineUIPro.Button btnOut;
         
+        /// <summary>
+        /// btnDel 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDel;
+        
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index f3c15865..1544f676 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -20,7 +20,7 @@
 <TreeNode id="874B4232-E0AD-41CD-8C66-8A7FF2D79358" Text="项目安全协议清单" NavigateUrl="HSSE/QualityAudit/ProjectRecord.aspx"></TreeNode>
 </TreeNode>
 </TreeNode>
-<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="HSSE/Solution/ConstructSolution.aspx"></TreeNode>
+<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
 <TreeNode id="5B3D3F7B-9B50-4927-B131-11D13D4D1C19" Text="危大工程施工方案清单" NavigateUrl="HSSE/Solution/LargerHazardList.aspx"></TreeNode>
 <TreeNode id="27DE7248-C4FF-4288-BBAC-11CB8741AD67" Text="专家论证清单" NavigateUrl="HSSE/Solution/ExpertArgumentList.aspx"></TreeNode>
 <TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
@@ -153,7 +153,7 @@
 <TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="0ED3E0CC-75E0-4FF3-8832-067217A6CD4D" Text="事故管理" NavigateUrl=""><TreeNode id="FB5C66FF-3BFB-490F-A14F-0DD5B5A4D110" Text="HSSE事故(对人员)记录" NavigateUrl="HSSE/Accident/AccidentPersonRecord.aspx"></TreeNode>
-<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故(含未遂)处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
+<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
 <TreeNode id="27C681E5-135A-414F-9FC2-D86D27805E6A" Text="事故报告登记" NavigateUrl="HSSE/Accident/AccidentReport.aspx"></TreeNode>
 <TreeNode id="B0A341A2-954A-4E24-BFC3-53D7F50628EE" Text="事故调查处理报告" NavigateUrl="HSSE/Accident/AccidentReportOther.aspx"></TreeNode>
 </TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
index 753efb73..51a57bc0 100644
--- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
@@ -24,6 +24,7 @@
 <TreeNode id="D95CA72C-182C-4718-92A4-3F665E0FB660" Text="项目亮点类型定义" NavigateUrl="BaseInfo/PictureType.aspx"></TreeNode>
 <TreeNode id="3044D68E-5018-4B57-BFC4-FBE4BCCA8B8B" Text="问题类别定义" NavigateUrl="BaseInfo/QuestionType.aspx"></TreeNode>
 <TreeNode id="F0DF2F2B-7C12-4A0F-B7D4-0B00BADE1D64" Text="文档类别定义" NavigateUrl="BaseInfo/DocType.aspx"></TreeNode>
+<TreeNode id="D0850615-BF32-4CFA-84CA-EEA261676EA8" Text="移交专业设置" NavigateUrl="BaseInfo/TransferMajor.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="A93BA810-3511-4BB2-9C10-9663351DF79F" Text="质量设置" NavigateUrl=""><TreeNode id="24F9A1ED-0F4C-407C-8EB3-2A8711BB6ECC" Text="质量问题类别定义" NavigateUrl="BaseInfo/QualityQuestionType.aspx"></TreeNode>
 <TreeNode id="D00A978A-DDEE-4BFF-8872-FFF65A7BC0BC" Text="施工专业定义" NavigateUrl="BaseInfo/CNProfessional.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index a8df02b8..08203a41 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -44,7 +44,6 @@
 <TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
 <TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
-<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
 <TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
 <TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
@@ -61,13 +60,16 @@
 <TreeNode id="CBF65CFF-6C5D-409C-A0B8-3C2283068ED4" Text="分子筛装填" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=6"></TreeNode>
 <TreeNode id="C76C79D5-ADD7-49AC-A577-820E7DAA2CFC" Text="电气调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=7"></TreeNode>
 <TreeNode id="04E072D1-5BD3-4F6C-9E81-1FE32A4851E9" Text="仪表调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=8"></TreeNode>
+<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
 </TreeNode>
 <TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
 <TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
+<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
 <TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
+<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index c006fd7f..80c38b9a 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -12,5 +12,5 @@
 <TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
 <TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
 <TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 5f548e84..3c5ee1a4 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -227,6 +227,9 @@ namespace Model
     partial void InsertBase_TrainTypeItem(Base_TrainTypeItem instance);
     partial void UpdateBase_TrainTypeItem(Base_TrainTypeItem instance);
     partial void DeleteBase_TrainTypeItem(Base_TrainTypeItem instance);
+    partial void InsertBase_TransferMajor(Base_TransferMajor instance);
+    partial void UpdateBase_TransferMajor(Base_TransferMajor instance);
+    partial void DeleteBase_TransferMajor(Base_TransferMajor instance);
     partial void InsertBase_Unit(Base_Unit instance);
     partial void UpdateBase_Unit(Base_Unit instance);
     partial void DeleteBase_Unit(Base_Unit instance);
@@ -3079,6 +3082,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Base_TransferMajor> Base_TransferMajor
+		{
+			get
+			{
+				return this.GetTable<Base_TransferMajor>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Base_Unit> Base_Unit
 		{
 			get
@@ -37855,6 +37866,164 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_TransferMajor")]
+	public partial class Base_TransferMajor : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _TransferMajorId;
+		
+		private string _Discipline;
+		
+		private string _Major;
+		
+		private string _DisciplineCode;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnTransferMajorIdChanging(string value);
+    partial void OnTransferMajorIdChanged();
+    partial void OnDisciplineChanging(string value);
+    partial void OnDisciplineChanged();
+    partial void OnMajorChanging(string value);
+    partial void OnMajorChanged();
+    partial void OnDisciplineCodeChanging(string value);
+    partial void OnDisciplineCodeChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Base_TransferMajor()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TransferMajorId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string TransferMajorId
+		{
+			get
+			{
+				return this._TransferMajorId;
+			}
+			set
+			{
+				if ((this._TransferMajorId != value))
+				{
+					this.OnTransferMajorIdChanging(value);
+					this.SendPropertyChanging();
+					this._TransferMajorId = value;
+					this.SendPropertyChanged("TransferMajorId");
+					this.OnTransferMajorIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Discipline", DbType="NVarChar(50)")]
+		public string Discipline
+		{
+			get
+			{
+				return this._Discipline;
+			}
+			set
+			{
+				if ((this._Discipline != value))
+				{
+					this.OnDisciplineChanging(value);
+					this.SendPropertyChanging();
+					this._Discipline = value;
+					this.SendPropertyChanged("Discipline");
+					this.OnDisciplineChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Major", DbType="NVarChar(50)")]
+		public string Major
+		{
+			get
+			{
+				return this._Major;
+			}
+			set
+			{
+				if ((this._Major != value))
+				{
+					this.OnMajorChanging(value);
+					this.SendPropertyChanging();
+					this._Major = value;
+					this.SendPropertyChanged("Major");
+					this.OnMajorChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DisciplineCode", DbType="NVarChar(50)")]
+		public string DisciplineCode
+		{
+			get
+			{
+				return this._DisciplineCode;
+			}
+			set
+			{
+				if ((this._DisciplineCode != value))
+				{
+					this.OnDisciplineCodeChanging(value);
+					this.SendPropertyChanging();
+					this._DisciplineCode = value;
+					this.SendPropertyChanged("DisciplineCode");
+					this.OnDisciplineCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(200)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_Unit")]
 	public partial class Base_Unit : INotifyPropertyChanging, INotifyPropertyChanged
 	{

From 0a6518332fbf1ce106493d6835395e1c83f8dd60 Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Mon, 29 Jan 2024 17:56:17 +0800
Subject: [PATCH 10/31] =?UTF-8?q?=E5=9B=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../1-14移交管理图表（Menu_Transfer）.sql     |  40 +--
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |  72 ------
 .../Transfer/Chart/CivilStructure.aspx        |  16 --
 .../Transfer/Chart/CivilStructure.aspx.cs     |  17 --
 .../Chart/CivilStructure.aspx.designer.cs     |  25 --
 .../Transfer/Chart/Electrical.aspx            |  16 --
 .../Transfer/Chart/Electrical.aspx.cs         |  17 --
 .../Chart/Electrical.aspx.designer.cs         |  25 --
 .../Transfer/Chart/Firefighting.aspx          |  16 --
 .../Transfer/Chart/Firefighting.aspx.cs       |  17 --
 .../Chart/Firefighting.aspx.designer.cs       |  25 --
 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx   |  16 --
 .../FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs |  17 --
 .../Transfer/Chart/HVAC.aspx.designer.cs      |  25 --
 .../Transfer/Chart/Instrumentation.aspx       |  67 ++++-
 .../Transfer/Chart/Instrumentation.aspx.cs    | 228 +++++++++++++++++-
 .../Chart/Instrumentation.aspx.designer.cs    | 137 ++++++++++-
 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx |  16 --
 .../Transfer/Chart/Piping.aspx.cs             |  17 --
 .../Transfer/Chart/Piping.aspx.designer.cs    |  25 --
 .../Transfer/Chart/Plumbing.aspx              |  16 --
 .../Transfer/Chart/Plumbing.aspx.cs           |  17 --
 .../Transfer/Chart/Plumbing.aspx.designer.cs  |  25 --
 .../Transfer/Chart/RotatingEquipment.aspx     |  16 --
 .../Transfer/Chart/RotatingEquipment.aspx.cs  |  17 --
 .../Chart/RotatingEquipment.aspx.designer.cs  |  25 --
 .../Transfer/Chart/StaticEquipment.aspx       |  16 --
 .../Transfer/Chart/StaticEquipment.aspx.cs    |  17 --
 .../Chart/StaticEquipment.aspx.designer.cs    |  25 --
 .../FineUIPro.Web/Transfer/Chart/Telecom.aspx |  16 --
 .../Transfer/Chart/Telecom.aspx.cs            |  17 --
 .../Transfer/Chart/Telecom.aspx.designer.cs   |  25 --
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   |  11 +-
 33 files changed, 424 insertions(+), 653 deletions(-)
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
 delete mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs

diff --git a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
index 8f602f9b..fe41f3c9 100644
--- a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
+++ b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
@@ -2,49 +2,15 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
 VALUES('3517DBE2-9728-4BA0-9EA5-AE2147DB883B','�ƽ�ͼ��','',
 130,'0','Menu_Transfer',0,0,1)
 
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('4B83D8B6-18E8-41E3-A6BF-72432B2B1F56','Piping',
-'Transfer/Chart/Piping.aspx',10,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('D8579ED5-77E7-4BB3-8065-FD10F5681255','Static Equipment',
-'Transfer/Chart/StaticEquipment.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+VALUES('E6F5125D-DD94-4978-B7EB-D9C26694D86D','ȫ���ƽ�ͳ�Ʊ�',
+'Transfer/Chart/Instrumentation.aspx',10,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('AD1159B3-023F-45AC-A6C2-D5498A8D7D33','Rotating Equipment',
-'Transfer/Chart/RotatingEquipment.aspx',30,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('E6F5125D-DD94-4978-B7EB-D9C26694D86D','Instrumentation',
-'Transfer/Chart/Instrumentation.aspx',40,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('713B1FB5-B70D-4C79-9CE4-71CE6B543146','Electrical',
-'Transfer/Chart/Electrical.aspx',50,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('71FC9E2A-D2AE-43E3-A5E4-BD7C0468C940','Civil Structure',
-'Transfer/Chart/CivilStructure.aspx',60,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('83CB9222-5E5E-4AAF-BDBC-0EE141262B5D','Firefighting',
-'Transfer/Chart/Firefighting.aspx',70,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('66E63C90-0F4E-4737-82A2-090EF8ABB3C7','Telecom',
-'Transfer/Chart/Telecom.aspx',80,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('EC2705EA-629A-4C0F-AC3A-A7BA848A3C34','Plumbing',
-'Transfer/Chart/Plumbing.aspx',90,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
-
-INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-VALUES('BF7CD047-466D-4399-BF59-B8ED569F2819','HVAC',
-'Transfer/Chart/HVAC.aspx',100,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
 INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 VALUES('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','Punchlist from',
-'Transfer/Chart/PunchlistFrom.aspx',110,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+'Transfer/Chart/PunchlistFrom.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
 
 
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index e10cfad1..745334d5 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1830,17 +1830,8 @@
     <Content Include="TestRun\TestRunManage\TailTermHandleList.aspx" />
     <Content Include="TestRun\TestRunManage\TestRunRecordUpload.aspx" />
     <Content Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx" />
-    <Content Include="Transfer\Chart\CivilStructure.aspx" />
-    <Content Include="Transfer\Chart\Electrical.aspx" />
-    <Content Include="Transfer\Chart\Firefighting.aspx" />
-    <Content Include="Transfer\Chart\HVAC.aspx" />
     <Content Include="Transfer\Chart\Instrumentation.aspx" />
-    <Content Include="Transfer\Chart\Piping.aspx" />
-    <Content Include="Transfer\Chart\Plumbing.aspx" />
     <Content Include="Transfer\Chart\PunchlistFrom.aspx" />
-    <Content Include="Transfer\Chart\RotatingEquipment.aspx" />
-    <Content Include="Transfer\Chart\StaticEquipment.aspx" />
-    <Content Include="Transfer\Chart\Telecom.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
@@ -16365,34 +16356,6 @@
     <Compile Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx.designer.cs">
       <DependentUpon>TestRunRecordUploadList.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Transfer\Chart\CivilStructure.aspx.cs">
-      <DependentUpon>CivilStructure.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\CivilStructure.aspx.designer.cs">
-      <DependentUpon>CivilStructure.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\Electrical.aspx.cs">
-      <DependentUpon>Electrical.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\Electrical.aspx.designer.cs">
-      <DependentUpon>Electrical.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\Firefighting.aspx.cs">
-      <DependentUpon>Firefighting.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\Firefighting.aspx.designer.cs">
-      <DependentUpon>Firefighting.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\HVAC.aspx.cs">
-      <DependentUpon>HVAC.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\HVAC.aspx.designer.cs">
-      <DependentUpon>HVAC.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Transfer\Chart\Instrumentation.aspx.cs">
       <DependentUpon>Instrumentation.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16400,20 +16363,6 @@
     <Compile Include="Transfer\Chart\Instrumentation.aspx.designer.cs">
       <DependentUpon>Instrumentation.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Transfer\Chart\Piping.aspx.cs">
-      <DependentUpon>Piping.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\Piping.aspx.designer.cs">
-      <DependentUpon>Piping.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\Plumbing.aspx.cs">
-      <DependentUpon>Plumbing.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\Plumbing.aspx.designer.cs">
-      <DependentUpon>Plumbing.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Transfer\Chart\PunchlistFrom.aspx.cs">
       <DependentUpon>PunchlistFrom.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -16421,27 +16370,6 @@
     <Compile Include="Transfer\Chart\PunchlistFrom.aspx.designer.cs">
       <DependentUpon>PunchlistFrom.aspx</DependentUpon>
     </Compile>
-    <Compile Include="Transfer\Chart\RotatingEquipment.aspx.cs">
-      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\RotatingEquipment.aspx.designer.cs">
-      <DependentUpon>RotatingEquipment.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\StaticEquipment.aspx.cs">
-      <DependentUpon>StaticEquipment.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\StaticEquipment.aspx.designer.cs">
-      <DependentUpon>StaticEquipment.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="Transfer\Chart\Telecom.aspx.cs">
-      <DependentUpon>Telecom.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="Transfer\Chart\Telecom.aspx.designer.cs">
-      <DependentUpon>Telecom.aspx</DependentUpon>
-    </Compile>
     <Compile Include="Transfer\CivilStructure.aspx.cs">
       <DependentUpon>CivilStructure.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
deleted file mode 100644
index 104375f0..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CivilStructure.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.CivilStructure" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
deleted file mode 100644
index 98f1f36d..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class CivilStructure : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
deleted file mode 100644
index 41bc479d..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/CivilStructure.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class CivilStructure
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
deleted file mode 100644
index d525baed..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Electrical.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Electrical" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
deleted file mode 100644
index 66b9ce33..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Electrical : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
deleted file mode 100644
index 309a7743..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Electrical.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Electrical
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
deleted file mode 100644
index d5d87bc3..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Firefighting.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Firefighting" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
deleted file mode 100644
index e08dd12d..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Firefighting : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
deleted file mode 100644
index 2fea476c..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Firefighting.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Firefighting
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
deleted file mode 100644
index a7c813c1..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="HVAC.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.HVAC" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
deleted file mode 100644
index 0d22dd9d..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class HVAC : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
deleted file mode 100644
index 8cae12ea..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/HVAC.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class HVAC
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index 9715f314..b8290120 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Instrumentation.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Instrumentation" %>
 
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,8 +10,70 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <div>
-        </div>
+       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
+
+        <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
+            <Regions>
+                <f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
+                    BodyPadding="0 5 0 0" Width="200px" Layout="Fit" runat="server" EnableCollapse="true">
+                    <Items>
+                        <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                            <Rows>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
+                                       
+                                        <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
+
+                                        <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                            <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
+                                            <f:ListItem Value="Line" Text="折线图" Selected="true"></f:ListItem>
+                                        </f:DropDownList>
+
+                                        <%--<f:DropDownList ID="drpChartType" runat="server" LabelWidth="80px" Label="图形类型"
+                                            AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
+                                        </f:DropDownList>
+
+                                        <f:CheckBox ID="ckbShow" runat="server" LabelWidth="80px" Label="三维效果"
+                                            AutoPostBack="true" OnCheckedChanged="ckbShow_CheckedChanged">
+                                        </f:CheckBox>--%>
+
+                                        <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
+                                    </Items>
+                                </f:FormRow>
+                            </Rows>
+                        </f:Form>
+                    </Items>
+                </f:Region>
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
+                    BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
+                    <Items>
+                        <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="800px" ShowBorder="true"
+                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark"
+                                    runat="server" TitleToolTip="按图形显示">
+                                    <Items>
+                                        <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0" CssStyle="margin-left:200px">
+                                            <div id="divAnalyse">
+                                                <uc1:ChartControl ID="ChartUc" runat="server" />
+                                            </div>
+                                        </f:ContentPanel>
+                                    </Items>
+
+                                   <Items>
+                                      <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
+                                            Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px">
+                                        </f:Tree>
+                                   </Items>
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
+                    </Items>
+                </f:Region>
+            </Regions>
+        </f:RegionPanel>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index c3ab6622..e6051bf0 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -1,17 +1,235 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using BLL;
 
 namespace FineUIPro.Web.Transfer.Chart
 {
-    public partial class Instrumentation : System.Web.UI.Page
+    public partial class Instrumentation : PageBase
     {
+        #region 定义项
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
-
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]))
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+               
+                this.AnalyseData();
+            }
         }
+        #endregion
+
+        #region 统计
+        /// <summary>
+        /// 统计方法
+        /// </summary>
+        private void AnalyseData()
+        {
+            var sTime = DateTime.Now.AddDays(-7);
+            var eTime = DateTime.Now; ;
+
+            //如果没有填写日期，则是七天内的
+            if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
+             {
+                 sTime = Convert.ToDateTime(txtStarTime.Text);
+                 eTime = Convert.ToDateTime(txtEndTime.Text);
+
+            }
+             
+            //查询当前日期中的system的具体数目，去除重复
+            var list = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+               && x.Test_Package_FINISH >= sTime && x.Test_Package_FINISH <= eTime).ToList();
+            var SystemList = (from x in list select x.SystemName).Distinct();
+
+            //先加载左侧system 树菜单
+            LoadData(SystemList);
+
+            DataTable dtTime = new DataTable();
+            dtTime.Columns.Add("日期", typeof(string));
+            dtTime.Columns.Add("Finished", typeof(string));
+            dtTime.Columns.Add("In Progress", typeof(string));
+            dtTime.Columns.Add("Not Start", typeof(string));
+
+            var systemBol = false;
+            for (var i = sTime; i <= eTime; i=i.AddDays(1))
+            {
+                var finishedCount = 0;
+                var inProgress = 0;
+                var notStart = 0;
+                DataRow rowTime = dtTime.NewRow();
+                Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
+                //根据日期查询当前system的数量
+                var systemListbyDate = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+                && x.Test_Package_FINISH >= Convert.ToDateTime(rowTime["日期"]) 
+                && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+
+                //具体的system 去重
+                var systemList = (from x in systemListbyDate select x.SystemName).Distinct();
+                if (systemList.ToList().Count>0)
+                {
+                    systemBol = true;
+                }
+                foreach (var item in systemList)
+                {
+                    //查询当前日期每个system的数量
+                    var systemSumCount = systemListbyDate.Where(x => x.SystemName == item).ToList().Count;
+                    //子系统中完成的数量
+                    var subSystemSumCount = systemListbyDate.Where(x => x.SystemName == item &&
+                    x.FINAL_Status.ToLower() == "finished").ToList().Count;
+
+                    //子系统中没完成的情况
+                    var subSystemSumNotStartCount = systemListbyDate.Where(x => x.SystemName == item &&
+                    x.FINAL_Status.ToLower() == "not start").ToList().Count;
+
+                    if (systemSumCount == subSystemSumCount)
+                    {
+                        finishedCount += 1;
+                    }
+                    else if (systemSumCount== subSystemSumNotStartCount)
+                    {
+                        notStart += 1;
+                    }
+                    else { 
+                        inProgress += 1;
+
+                    }
+                }
+                rowTime["Finished"] = finishedCount;
+                rowTime["In Progress"] = inProgress;
+                rowTime["Not Start"] = notStart;
+                dtTime.Rows.Add(rowTime);
+
+            }
+            if (systemBol)
+            {
+                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "Instrumentation PROGRESS", this.drpChartType.SelectedValue, 1100, 600, false));
+            }
+            
+
+            
+        }
+
+        public class CheckAnalysisModel
+        {
+            public string itemType { get; set; }
+            public int count { get; set; }
+        }
+        #endregion
+
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        private void LoadData(IEnumerable<String> list)
+        {
+            Tree1.Nodes.Clear();
+            // 模拟从数据库返回数据表
+            DataTable table = CreateDataTable(list);
+
+            DataSet ds = new DataSet();
+            ds.Tables.Add(table);
+            ds.Relations.Add("TreeRelation", ds.Tables[0].Columns["Id"], ds.Tables[0].Columns["ParentId"]);
+
+            foreach (DataRow row in ds.Tables[0].Rows)
+            {
+                if (row.IsNull("ParentId"))
+                {
+                    TreeNode node = new TreeNode();
+                    node.Text = row["Text"].ToString();
+                    Tree1.Nodes.Add(node);
+
+                    ResolveSubTree(row, node);
+                }
+            }
+        }
+
+        private void ResolveSubTree(DataRow dataRow, TreeNode treeNode)
+        {
+            DataRow[] rows = dataRow.GetChildRows("TreeRelation");
+            if (rows.Length > 0)
+            {
+                // 如果是目录，则默认展开
+                treeNode.Expanded = true;
+                foreach (DataRow row in rows)
+                {
+                    TreeNode node = new TreeNode();
+                    node.Text = row["Text"].ToString();
+                    treeNode.Nodes.Add(node);
+
+                    ResolveSubTree(row, node);
+                }
+            }
+        }
+
+        #region CreateDataTable
+
+        private DataTable CreateDataTable(IEnumerable<String> list)
+        {
+            DataTable table = new DataTable();
+            DataColumn column1 = new DataColumn("Id", typeof(string));
+            DataColumn column2 = new DataColumn("Text", typeof(String));
+            DataColumn column3 = new DataColumn("ParentId", typeof(string));
+            table.Columns.Add(column1);
+            table.Columns.Add(column2);
+            table.Columns.Add(column3);
+
+            DataRow row = table.NewRow();
+            row[0] = "ALL";
+            row[1] = "全部";
+            row[2] = DBNull.Value;
+            table.Rows.Add(row);
+
+            foreach (var item in list)
+            {
+                row = table.NewRow();
+                row[0] = item.ToString();
+                row[1] = item.ToString();
+                row[2] = "ALL";
+                table.Rows.Add(row);
+            }
+            return table;
+        }
+
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
index c8e4a650..e9e5e8af 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -1,15 +1,16 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
 //------------------------------------------------------------------------------
 
-
 namespace FineUIPro.Web.Transfer.Chart
 {
+
+
     public partial class Instrumentation
     {
 
@@ -21,5 +22,131 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// RegionPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RegionPanel RegionPanel1;
+
+        /// <summary>
+        /// Region1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// drpChartType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChartType;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Region2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region2;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// cpCostTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpCostTime;
+
+        /// <summary>
+        /// ChartUc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::Web.Controls.ChartControl ChartUc;
+
+        /// <summary>
+        /// Tree1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree Tree1;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
deleted file mode 100644
index ec068d15..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Piping.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Piping" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
deleted file mode 100644
index 6eae9ebd..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Piping : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
deleted file mode 100644
index 38219c00..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Piping.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Piping
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
deleted file mode 100644
index 72a01361..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Plumbing.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Plumbing" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
deleted file mode 100644
index 29320d17..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Plumbing : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
deleted file mode 100644
index a74b7d1f..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Plumbing.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Plumbing
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
deleted file mode 100644
index f4301891..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RotatingEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.RotatingEquipment" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
deleted file mode 100644
index 34f8a11f..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class RotatingEquipment : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
deleted file mode 100644
index 7591da93..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/RotatingEquipment.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class RotatingEquipment
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
deleted file mode 100644
index b8dcff2e..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaticEquipment.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.StaticEquipment" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
deleted file mode 100644
index 608e802b..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class StaticEquipment : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
deleted file mode 100644
index 8949e11a..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/StaticEquipment.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class StaticEquipment
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
deleted file mode 100644
index ec0082b6..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx
+++ /dev/null
@@ -1,16 +0,0 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Telecom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.Telecom" %>
-
-<!DOCTYPE html>
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <title></title>
-</head>
-<body>
-    <form id="form1" runat="server">
-        <div>
-        </div>
-    </form>
-</body>
-</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
deleted file mode 100644
index 338f7427..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Telecom : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs
deleted file mode 100644
index f3a8f109..00000000
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Telecom.aspx.designer.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     此代码由工具生成。
-//
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class Telecom
-    {
-
-        /// <summary>
-        /// form1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-    }
-}
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 3959574b..0cc40f8e 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -13,16 +13,7 @@
 <TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
 <TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
 <TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="4B83D8B6-18E8-41E3-A6BF-72432B2B1F56" Text="Piping" NavigateUrl="Transfer/Chart/Piping.aspx"></TreeNode>
-<TreeNode id="D8579ED5-77E7-4BB3-8065-FD10F5681255" Text="Static Equipment" NavigateUrl="Transfer/Chart/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="AD1159B3-023F-45AC-A6C2-D5498A8D7D33" Text="Rotating Equipment" NavigateUrl="Transfer/Chart/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="Instrumentation" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
-<TreeNode id="713B1FB5-B70D-4C79-9CE4-71CE6B543146" Text="Electrical" NavigateUrl="Transfer/Chart/Electrical.aspx"></TreeNode>
-<TreeNode id="71FC9E2A-D2AE-43E3-A5E4-BD7C0468C940" Text="Civil Structure" NavigateUrl="Transfer/Chart/CivilStructure.aspx"></TreeNode>
-<TreeNode id="83CB9222-5E5E-4AAF-BDBC-0EE141262B5D" Text="Firefighting" NavigateUrl="Transfer/Chart/Firefighting.aspx"></TreeNode>
-<TreeNode id="66E63C90-0F4E-4737-82A2-090EF8ABB3C7" Text="Telecom" NavigateUrl="Transfer/Chart/Telecom.aspx"></TreeNode>
-<TreeNode id="EC2705EA-629A-4C0F-AC3A-A7BA848A3C34" Text="Plumbing" NavigateUrl="Transfer/Chart/Plumbing.aspx"></TreeNode>
-<TreeNode id="BF7CD047-466D-4399-BF59-B8ED569F2819" Text="HVAC" NavigateUrl="Transfer/Chart/HVAC.aspx"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
 <TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file

From 32330ab41872b59ca43ff3b9fad826e1dd60b1fa Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Tue, 30 Jan 2024 09:29:43 +0800
Subject: [PATCH 11/31] 1

---
 .../版本日志/SGGLDB_WH_2024-01-30-phf.sql     | 76 +++++++++++++++++++
 SGGL/FineUIPro.Web/Web.config                 |  4 +-
 2 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql
new file mode 100644
index 00000000..8e1f450c
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql
@@ -0,0 +1,76 @@
+CREATE VIEW [dbo].[View_TransferDetail]  AS 
+/*�ƽ������б���ͼ*/
+
+select SystemName,Subsystem,TestPackage,sDate,fDate,Status from (
+
+SELECT SYSTEM as SystemName, Subsystem ,TestPackage,
+TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status 
+FROM Transfer_Piping
+
+UNION ALL
+
+SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status 
+FROM Transfer_StaticEquipment
+
+UNION ALL
+
+SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status 
+FROM Transfer_RotatingEquipment
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Instrumentation
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Electrical
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Civil_Structure
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Firefighting
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Telecom
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_Plumbing
+
+UNION ALL
+
+SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status 
+FROM Transfer_HVAC
+
+)f
+
+
+GO
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 7c103ddf..cd4a65e1 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,8 +11,8 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <!--<add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-   <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+   <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

From c4dbae478abe129cd3a120a757d4a620b3e70723 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 30 Jan 2024 09:30:40 +0800
Subject: [PATCH 12/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../Transfer/Chart/PunchlistFrom.aspx         |  73 +++++++-
 .../Transfer/Chart/PunchlistFrom.aspx.cs      | 161 ++++++++++++++++-
 .../Chart/PunchlistFrom.aspx.designer.cs      | 163 ++++++++++++++++--
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 6 files changed, 382 insertions(+), 21 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c4484e3e..f8ca7c7a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
index 8a30d823..c7135ea0 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFrom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFrom" %>
-
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -9,8 +9,75 @@
 </head>
 <body>
     <form id="form1" runat="server">
-        <div>
-        </div>
+       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
+    <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
+        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+        <Items>
+            <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                <Rows>
+                    <f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
+                        <Items>
+                            <f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
+                                LabelWidth="80px">
+                            </f:DatePicker>
+                            <f:Label ID="Label3" runat="server" Text="至" Width="5px">
+                            </f:Label>
+                            <f:DatePicker ID="txtEndRectificationTime" runat="server">
+                            </f:DatePicker>
+                            <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
+                                <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                <f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
+                                <f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
+                                <f:ListItem Value="Spline" Text="样条图"></f:ListItem>
+                                <f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
+                                <f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
+                                <f:ListItem Value="Stock" Text="股价图"></f:ListItem>
+                                <f:ListItem Value="Radar" Text="雷达图"></f:ListItem>
+                            </f:DropDownList>
+                            <f:CheckBox ID="ckbShow" runat="server" LabelWidth="80px" Label="三维效果" AutoPostBack="true"
+                                OnCheckedChanged="ckbShow_CheckedChanged" Width="110px">
+                            </f:CheckBox>
+                            <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                            </f:Button>
+                        </Items>
+                    </f:FormRow>
+                    <f:FormRow >
+                        <Items>
+                            <f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
+                                AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
+                                <f:RadioItem Value="0" Selected="true" Text="按责任单位" />
+                                <f:RadioItem Value="1" Text="按检查项" />
+                            </f:RadioButtonList>
+                            <f:Label ID="aa" runat="server">
+                            </f:Label>
+                        </Items>
+                    </f:FormRow>
+                </Rows>
+            </f:Form>
+        </Items>
+    </f:Panel>
+    <f:Panel ID="Panel4" CssClass="blockpanel" runat="server"  EnableCollapse="false"
+        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+        <Items>
+            <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="360px" ShowBorder="true"
+                TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                <Tabs>
+                    <f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                        TitleToolTip="按类别统计">
+                        <Items>
+                            <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
+                                <div id="divAccidentTime">
+                                    <uc1:ChartControl ID="ChartAccidentTime" runat="server" />
+                                </div>
+                            </f:ContentPanel>
+                        </Items>
+                    </f:Tab>
+                </Tabs>
+            </f:TabStrip>
+        </Items>
+    </f:Panel>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
index c64b3db1..9cbf342b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
@@ -1,17 +1,168 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using BLL;
 
 namespace FineUIPro.Web.Transfer.Chart
 {
-    public partial class PunchlistFrom : System.Web.UI.Page
+    public partial class PunchlistFrom : PageBase
     {
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         protected void Page_Load(object sender, EventArgs e)
         {
-
+            if (!IsPostBack)
+            {
+            }
         }
+        #endregion
+
+        #region 统计
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        /// <summary>
+        /// 统计方法
+        /// </summary>
+        private void AnalyseData()
+        {
+            var hazardRegisters = (from x in Funs.DB.HSSE_Hazard_HazardRegister
+                                   where x.ProjectId == this.CurrUser.LoginProjectId
+                                   && x.States != "4" && x.ProblemTypes == "1"
+                                   select x);
+            if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
+            {
+                hazardRegisters = hazardRegisters.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStartRectificationTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
+            {
+                hazardRegisters = hazardRegisters.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndRectificationTime.Text.Trim()));
+            }
+            if (this.rblState.SelectedValue == "0")
+            {
+                #region 按单位统计
+                if (this.drpChartType.SelectedValue != "Pie")  //非饼形图
+                {
+                    ///按单位统计
+                    DataTable dtTime = new DataTable();
+                    dtTime.Columns.Add("单位", typeof(string));
+                    dtTime.Columns.Add("总数量", typeof(string));
+                    dtTime.Columns.Add("待整改", typeof(string));
+                    dtTime.Columns.Add("已整改", typeof(string));
+
+                    var units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
+                    foreach (var item in units)
+                    {
+                        DataRow rowTime = dtTime.NewRow();
+                        Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                        rowTime["单位"] = item.UnitName;
+                        var unitHazad = hazardRegisters.Where(x => x.ResponsibleUnit == item.UnitId);
+                        rowTime["总数量"] = unitHazad.Count();
+                        rowTime["待整改"] = unitHazad.Where(x => x.States == "1" || x.States == null).Count();
+                        rowTime["已整改"] = unitHazad.Where(x => x.States == "3" || x.States == "2").Count();
+                        dtTime.Rows.Add(rowTime);
+                    }
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1100, 300, this.ckbShow.Checked));
+                }
+                else   //饼形图
+                {
+                    DataTable dtTime = new DataTable();
+                    dtTime.Columns.Add("单位", typeof(string));
+                    dtTime.Columns.Add("总数量", typeof(string));
+
+                    var units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
+                    foreach (var item in units)
+                    {
+                        DataRow rowTime = dtTime.NewRow();
+                        Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                        rowTime["单位"] = item.UnitName;
+                        var unitHazad = hazardRegisters.Where(x => x.ResponsibleUnit == item.UnitId);
+                        rowTime["总数量"] = unitHazad.Count();
+                        dtTime.Rows.Add(rowTime);
+                    }
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1130, 450, this.ckbShow.Checked));
+                }
+                #endregion
+            }
+            else
+            {
+                #region 按检查项
+                if (this.drpChartType.SelectedValue != "Pie")  //非饼形图
+                {
+                    ///按检查项
+                    DataTable dtTime = new DataTable();
+                    dtTime.Columns.Add("检查项", typeof(string));
+                    dtTime.Columns.Add("总数量", typeof(string));
+                    dtTime.Columns.Add("待整改", typeof(string));
+                    dtTime.Columns.Add("已整改", typeof(string));
+
+                    var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
+                    foreach (var item in types)
+                    {
+                        DataRow rowTime = dtTime.NewRow();
+                        Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                        rowTime["检查项"] = item.RegisterTypesName;
+                        var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
+                        rowTime["总数量"] = typeHazad.Count();
+                        rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
+                        rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
+                        dtTime.Rows.Add(rowTime);
+                    }
+
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
+                }
+                else   //饼形图
+                {
+                    ///按问题类型
+                    DataTable dtTime = new DataTable();
+                    dtTime.Columns.Add("检查项", typeof(string));
+                    dtTime.Columns.Add("总数量", typeof(string));
+
+                    var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
+                    foreach (var item in types)
+                    {
+                        DataRow rowTime = dtTime.NewRow();
+                        Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                        rowTime["检查项"] = item.RegisterTypesName;
+                        var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
+                        rowTime["总数量"] = typeHazad.Count();
+                        dtTime.Rows.Add(rowTime);
+                    }
+
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
+                }
+                #endregion
+            }
+        }
+        #endregion
+
+        #region 图形
+        /// <summary>
+        /// 图形变换 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void drpChartType_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        protected void ckbShow_CheckedChanged(object sender, CheckedEventArgs e)
+        {
+            this.AnalyseData();
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
index 509734ff..53e81f30 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
@@ -1,18 +1,17 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
-// </auto-generated>
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
 //------------------------------------------------------------------------------
 
-
-namespace FineUIPro.Web.Transfer.Chart
-{
-    public partial class PunchlistFrom
-    {
-
+namespace FineUIPro.Web.Transfer.Chart {
+    
+    
+    public partial class PunchlistFrom {
+        
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -21,5 +20,149 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+        
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+        
+        /// <summary>
+        /// Panel3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel3;
+        
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+        
+        /// <summary>
+        /// txtStartRectificationTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStartRectificationTime;
+        
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+        
+        /// <summary>
+        /// txtEndRectificationTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndRectificationTime;
+        
+        /// <summary>
+        /// drpChartType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChartType;
+        
+        /// <summary>
+        /// ckbShow 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckbShow;
+        
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+        
+        /// <summary>
+        /// rblState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RadioButtonList rblState;
+        
+        /// <summary>
+        /// aa 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label aa;
+        
+        /// <summary>
+        /// Panel4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel Panel4;
+        
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+        
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+        
+        /// <summary>
+        /// cpAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpAccidentTime;
+        
+        /// <summary>
+        /// ChartAccidentTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::Web.Controls.ChartControl ChartAccidentTime;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 7c103ddf..59ac7ef4 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 6bc24ada..4edb5e0f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From b203e1f10b5485ccc7e4be1aa710cbcce428e41f Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Tue, 30 Jan 2024 09:32:31 +0800
Subject: [PATCH 13/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2024-01-30-phf.sql     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql
index 8e1f450c..d10e30b0 100644
--- a/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql
@@ -1,71 +1,71 @@
-CREATE VIEW [dbo].[View_TransferDetail]  AS 
+Create VIEW [dbo].[View_TransferDetail]  AS 
 /*�ƽ������б���ͼ*/
 
-select SystemName,Subsystem,TestPackage,sDate,fDate,Status from (
+select Projectid,SystemName,Subsystem,TestPackage,sDate,fDate,Status from (
 
-SELECT SYSTEM as SystemName, Subsystem ,TestPackage,
+SELECT Projectid, SYSTEM as SystemName, Subsystem ,TestPackage,
 TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status 
 FROM Transfer_Piping
 
 UNION ALL
 
-SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
 TestPackageFINISH as fDate,
 MechanicalFINALStatus as Status 
 FROM Transfer_StaticEquipment
 
 UNION ALL
 
-SELECT SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
 TestPackageFINISH as fDate,
 MechanicalFINALStatus as Status 
 FROM Transfer_RotatingEquipment
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Instrumentation
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Electrical
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Civil_Structure
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Firefighting
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Telecom
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_Plumbing
 
 UNION ALL
 
-SELECT SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
 Test_Package_FINISH as fDate,
 FINAL_Status as Status 
 FROM Transfer_HVAC

From fdf500e8d0362af17fa1d54d8364642d3ebb6259 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 30 Jan 2024 09:35:23 +0800
Subject: [PATCH 14/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/Model/Model.cs | 143 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 143 insertions(+)

diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 3c5ee1a4..29f8b692 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -9762,6 +9762,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_TransferDetail> View_TransferDetail
+		{
+			get
+			{
+				return this.GetTable<View_TransferDetail>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_WBS> View_WBS
 		{
 			get
@@ -414716,6 +414724,141 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_TransferDetail")]
+	public partial class View_TransferDetail
+	{
+		
+		private string _Projectid;
+		
+		private string _SystemName;
+		
+		private string _Subsystem;
+		
+		private string _TestPackage;
+		
+		private System.Nullable<System.DateTime> _SDate;
+		
+		private System.Nullable<System.DateTime> _FDate;
+		
+		private string _Status;
+		
+		public View_TransferDetail()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Projectid", DbType="NVarChar(50)")]
+		public string Projectid
+		{
+			get
+			{
+				return this._Projectid;
+			}
+			set
+			{
+				if ((this._Projectid != value))
+				{
+					this._Projectid = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SystemName", DbType="NVarChar(50)")]
+		public string SystemName
+		{
+			get
+			{
+				return this._SystemName;
+			}
+			set
+			{
+				if ((this._SystemName != value))
+				{
+					this._SystemName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Subsystem", DbType="NVarChar(50)")]
+		public string Subsystem
+		{
+			get
+			{
+				return this._Subsystem;
+			}
+			set
+			{
+				if ((this._Subsystem != value))
+				{
+					this._Subsystem = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TestPackage", DbType="NVarChar(50)")]
+		public string TestPackage
+		{
+			get
+			{
+				return this._TestPackage;
+			}
+			set
+			{
+				if ((this._TestPackage != value))
+				{
+					this._TestPackage = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="sDate", Storage="_SDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> SDate
+		{
+			get
+			{
+				return this._SDate;
+			}
+			set
+			{
+				if ((this._SDate != value))
+				{
+					this._SDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="fDate", Storage="_FDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FDate
+		{
+			get
+			{
+				return this._FDate;
+			}
+			set
+			{
+				if ((this._FDate != value))
+				{
+					this._FDate = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(50)")]
+		public string Status
+		{
+			get
+			{
+				return this._Status;
+			}
+			set
+			{
+				if ((this._Status != value))
+				{
+					this._Status = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBS")]
 	public partial class View_WBS
 	{

From 77f19c496599287e1390887ad71fbdd721cc7e8c Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 30 Jan 2024 15:26:48 +0800
Subject: [PATCH 15/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ErrLog.txt                 | 220 ++++++++++++++++++
 .../Transfer/Chart/PunchlistFrom.aspx         | 143 ++++++------
 .../Transfer/Chart/PunchlistFrom.aspx.cs      |  97 ++++----
 .../Chart/PunchlistFrom.aspx.designer.cs      |   8 +-
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 5 files changed, 345 insertions(+), 125 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 6e590a65..518e3c1a 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -755,3 +755,223 @@ IP地址:::1
 出错时间:01/29/2024 15:51:59
 出错时间:01/29/2024 15:51:59
 
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+   在 FineUIPro.Web.Transfer.Chart.PunchlistFrom.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFrom.aspx.cs:行号 41
+   在 FineUIPro.Web.Transfer.Chart.PunchlistFrom.BtnAnalyse_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFrom.aspx.cs:行号 33
+   在 FineUIPro.Button.OnClick(EventArgs e)
+   在 (Button , EventArgs )
+   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
+   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:01/30/2024 10:36:38
+出错文件:http://localhost:8579/Transfer/Chart/PunchlistFrom.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:01/30/2024 10:36:38
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/30/2024 12:11:43
+出错时间:01/30/2024 12:11:43
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/30/2024 12:11:43
+出错时间:01/30/2024 12:11:43
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/30/2024 12:11:43
+出错时间:01/30/2024 12:11:43
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/30/2024 12:11:43
+出错时间:01/30/2024 12:11:43
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/30/2024 14:11:42
+出错时间:01/30/2024 14:11:42
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/30/2024 14:11:42
+出错时间:01/30/2024 14:11:42
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/30/2024 14:11:42
+出错时间:01/30/2024 14:11:42
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/30/2024 14:11:42
+出错时间:01/30/2024 14:11:42
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
index c7135ea0..1839b0da 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx
@@ -1,83 +1,86 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PunchlistFrom.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.PunchlistFrom" %>
+
 <%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
     <form id="form1" runat="server">
-       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
-    <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
-        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
-        <Items>
-            <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
-                <Rows>
-                    <f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
-                        <Items>
-                            <f:DatePicker ID="txtStartRectificationTime" runat="server" Label="检查时间" LabelAlign="Right"
-                                LabelWidth="80px">
-                            </f:DatePicker>
-                            <f:Label ID="Label3" runat="server" Text="至" Width="5px">
-                            </f:Label>
-                            <f:DatePicker ID="txtEndRectificationTime" runat="server">
-                            </f:DatePicker>
-                            <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
-                                OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
-                                <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
-                                <f:ListItem Value="Line" Text="折线图"></f:ListItem>
-                                <f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
-                                <f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
-                                <f:ListItem Value="Spline" Text="样条图"></f:ListItem>
-                                <f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
-                                <f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
-                                <f:ListItem Value="Stock" Text="股价图"></f:ListItem>
-                                <f:ListItem Value="Radar" Text="雷达图"></f:ListItem>
-                            </f:DropDownList>
-                            <f:CheckBox ID="ckbShow" runat="server" LabelWidth="80px" Label="三维效果" AutoPostBack="true"
-                                OnCheckedChanged="ckbShow_CheckedChanged" Width="110px">
-                            </f:CheckBox>
-                            <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
-                            </f:Button>
-                        </Items>
-                    </f:FormRow>
-                    <f:FormRow >
-                        <Items>
-                            <f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
-                                AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
-                                <f:RadioItem Value="0" Selected="true" Text="按责任单位" />
-                                <f:RadioItem Value="1" Text="按检查项" />
-                            </f:RadioButtonList>
-                            <f:Label ID="aa" runat="server">
-                            </f:Label>
-                        </Items>
-                    </f:FormRow>
-                </Rows>
-            </f:Form>
-        </Items>
-    </f:Panel>
-    <f:Panel ID="Panel4" CssClass="blockpanel" runat="server"  EnableCollapse="false"
-        BodyPadding="10px" ShowBorder="true" ShowHeader="false">
-        <Items>
-            <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="360px" ShowBorder="true"
-                TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
-                <Tabs>
-                    <f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
-                        TitleToolTip="按类别统计">
-                        <Items>
-                            <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
-                                <div id="divAccidentTime">
-                                    <uc1:ChartControl ID="ChartAccidentTime" runat="server" />
-                                </div>
-                            </f:ContentPanel>
-                        </Items>
-                    </f:Tab>
-                </Tabs>
-            </f:TabStrip>
-        </Items>
-    </f:Panel>
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
+        <f:Panel ID="Panel3" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                    <Rows>
+                        <f:FormRow ColumnWidths="20% 3% 20% 30% 15% 10%">
+                            <Items>
+                                <f:DatePicker ID="txtStartTime" runat="server" Label="时间" LabelAlign="Right"
+                                    LabelWidth="80px">
+                                </f:DatePicker>
+                                <f:Label ID="Label3" runat="server" Text="至" Width="5px">
+                                </f:Label>
+                                <f:DatePicker ID="txtEndTime" runat="server">
+                                </f:DatePicker>
+                                <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                    OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                    <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
+                                    <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                    <f:ListItem Value="Pie" Text="饼形图"></f:ListItem>
+                                    <f:ListItem Value="StackedArea" Text="堆积面积图"></f:ListItem>
+                                    <f:ListItem Value="Spline" Text="样条图"></f:ListItem>
+                                    <f:ListItem Value="SplineArea" Text="样条面积图"></f:ListItem>
+                                    <f:ListItem Value="StepLine" Text="阶梯线图"></f:ListItem>
+                                    <f:ListItem Value="Stock" Text="股价图"></f:ListItem>
+                                    <f:ListItem Value="Radar" Text="雷达图"></f:ListItem>
+                                </f:DropDownList>
+                                <f:CheckBox ID="ckbShow" runat="server" LabelWidth="80px" Label="三维效果" AutoPostBack="true"
+                                    OnCheckedChanged="ckbShow_CheckedChanged" Width="110px">
+                                </f:CheckBox>
+                                <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click">
+                                </f:Button>
+                            </Items>
+                        </f:FormRow>
+                        <f:FormRow>
+                            <Items>
+                                <f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
+                                    AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
+                                    <f:RadioItem Value="0" Selected="true" Text="按Identified during/by" />
+                                    <f:RadioItem Value="1" Text="按Discipline" />
+                                </f:RadioButtonList>
+                                <%--<f:DropDownList ID="drpType" OnSelectedIndexChanged="drpType_SelectedIndexChanged" AutoPostBack="true" runat="server" Label="Identified during/by" LabelAlign="Right" AutoSelectFirstItem="false" EnableEdit="true">
+                                </f:DropDownList>--%>
+                                <f:Label ID="aa" runat="server">
+                                </f:Label>
+                            </Items>
+                        </f:FormRow>
+                    </Rows>
+                </f:Form>
+            </Items>
+        </f:Panel>
+        <f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
+            BodyPadding="10px" ShowBorder="true" ShowHeader="false">
+            <Items>
+                <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
+                    TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                    <Tabs>
+                        <f:Tab ID="Tab2" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
+                            TitleToolTip="图形">
+                            <Items>
+                                <f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
+                                    <div id="divAccidentTime">
+                                        <uc1:ChartControl ID="ChartAccidentTime" runat="server" />
+                                    </div>
+                                </f:ContentPanel>
+                            </Items>
+                        </f:Tab>
+                    </Tabs>
+                </f:TabStrip>
+            </Items>
+        </f:Panel>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
index 9cbf342b..aa3fe84b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
@@ -38,110 +38,107 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </summary>
         private void AnalyseData()
         {
-            var hazardRegisters = (from x in Funs.DB.HSSE_Hazard_HazardRegister
-                                   where x.ProjectId == this.CurrUser.LoginProjectId
-                                   && x.States != "4" && x.ProblemTypes == "1"
-                                   select x);
-            if (!string.IsNullOrEmpty(this.txtStartRectificationTime.Text.Trim()))
+            var forms = from x in Funs.DB.Transfer_PunchlistFrom
+                                  where x.ProjectId == this.CurrUser.LoginProjectId
+                                  select x;
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
             {
-                hazardRegisters = hazardRegisters.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStartRectificationTime.Text.Trim()));
+                forms = forms.Where(x => x.PUNCH_ITEM_FINISH_DATE >= Funs.GetNewDateTime(this.txtStartTime.Text.Trim()));
             }
-            if (!string.IsNullOrEmpty(this.txtEndRectificationTime.Text.Trim()))
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
             {
-                hazardRegisters = hazardRegisters.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndRectificationTime.Text.Trim()));
+                forms = forms.Where(x => x.PUNCH_ITEM_FINISH_DATE <= Funs.GetNewDateTime(this.txtEndTime.Text.Trim()));
             }
+            var list = new List<string> { "Testing", "Pre-Commissioning", "PSSR", "Commissioning" };
             if (this.rblState.SelectedValue == "0")
             {
-                #region 按单位统计
+                #region 按Identified during/by统计
                 if (this.drpChartType.SelectedValue != "Pie")  //非饼形图
                 {
                     ///按单位统计
                     DataTable dtTime = new DataTable();
-                    dtTime.Columns.Add("单位", typeof(string));
+                    dtTime.Columns.Add("Identified during/by", typeof(string));
                     dtTime.Columns.Add("总数量", typeof(string));
-                    dtTime.Columns.Add("待整改", typeof(string));
-                    dtTime.Columns.Add("已整改", typeof(string));
-
-                    var units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
-                    foreach (var item in units)
+                    dtTime.Columns.Add("A数量", typeof(string));
+                    dtTime.Columns.Add("B数量", typeof(string));
+                    dtTime.Columns.Add("C数量", typeof(string));
+                    foreach (var item in list)
                     {
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                        rowTime["单位"] = item.UnitName;
-                        var unitHazad = hazardRegisters.Where(x => x.ResponsibleUnit == item.UnitId);
-                        rowTime["总数量"] = unitHazad.Count();
-                        rowTime["待整改"] = unitHazad.Where(x => x.States == "1" || x.States == null).Count();
-                        rowTime["已整改"] = unitHazad.Where(x => x.States == "3" || x.States == "2").Count();
+                        rowTime["Identified during/by"] = item;
+                        var types = forms.Where(x => x.Identified == item);
+                        rowTime["总数量"] = types.Count();
+                        rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
+                        rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
+                        rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
                         dtTime.Rows.Add(rowTime);
                     }
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1100, 300, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
                 }
                 else   //饼形图
                 {
                     DataTable dtTime = new DataTable();
-                    dtTime.Columns.Add("单位", typeof(string));
+                    dtTime.Columns.Add("Identified during/by", typeof(string)); 
                     dtTime.Columns.Add("总数量", typeof(string));
-
-                    var units = BLL.UnitService.GetUnitByProjectIdUnitTypeList(this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2);
-                    foreach (var item in units)
+                    foreach (var item in list)
                     {
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                        rowTime["单位"] = item.UnitName;
-                        var unitHazad = hazardRegisters.Where(x => x.ResponsibleUnit == item.UnitId);
-                        rowTime["总数量"] = unitHazad.Count();
+                        rowTime["Identified during/by"] = item;
+                        var types = forms.Where(x => x.Identified == item);
+                        rowTime["总数量"] = types.Count();
                         dtTime.Rows.Add(rowTime);
                     }
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "单位巡检分析", this.drpChartType.SelectedValue, 1130, 450, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1130, 550, this.ckbShow.Checked));
                 }
                 #endregion
             }
             else
             {
-                #region 按检查项
+                #region 按Discipline
+                var disciplines = from x in Funs.DB.Base_TransferMajor orderby x.DisciplineCode select x;
                 if (this.drpChartType.SelectedValue != "Pie")  //非饼形图
                 {
                     ///按检查项
                     DataTable dtTime = new DataTable();
-                    dtTime.Columns.Add("检查项", typeof(string));
+                    dtTime.Columns.Add("Discipline", typeof(string));
                     dtTime.Columns.Add("总数量", typeof(string));
-                    dtTime.Columns.Add("待整改", typeof(string));
-                    dtTime.Columns.Add("已整改", typeof(string));
-
-                    var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
-                    foreach (var item in types)
+                    dtTime.Columns.Add("A数量", typeof(string));
+                    dtTime.Columns.Add("B数量", typeof(string));
+                    dtTime.Columns.Add("C数量", typeof(string));
+                    foreach (var item in disciplines)
                     {
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                        rowTime["检查项"] = item.RegisterTypesName;
-                        var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
-                        rowTime["总数量"] = typeHazad.Count();
-                        rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
-                        rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
+                        rowTime["Discipline"] = item.Discipline;
+                        var types = forms.Where(x => x.Discipline == item.Discipline);
+                        rowTime["总数量"] = types.Count();
+                        rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
+                        rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
+                        rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
                         dtTime.Rows.Add(rowTime);
                     }
 
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
                 }
                 else   //饼形图
                 {
                     ///按问题类型
                     DataTable dtTime = new DataTable();
-                    dtTime.Columns.Add("检查项", typeof(string));
+                    dtTime.Columns.Add("Discipline", typeof(string));
                     dtTime.Columns.Add("总数量", typeof(string));
-
-                    var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
-                    foreach (var item in types)
+                    foreach (var item in disciplines)
                     {
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                        rowTime["检查项"] = item.RegisterTypesName;
-                        var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
-                        rowTime["总数量"] = typeHazad.Count();
+                        rowTime["Discipline"] = item.Discipline;
+                        var types = forms.Where(x => x.Discipline == item.Discipline);
+                        rowTime["总数量"] = types.Count();
                         dtTime.Rows.Add(rowTime);
                     }
 
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
                 }
                 #endregion
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
index 53e81f30..ee441487 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs
@@ -49,13 +49,13 @@ namespace FineUIPro.Web.Transfer.Chart {
         protected global::FineUIPro.Form Form2;
         
         /// <summary>
-        /// txtStartRectificationTime 控件。
+        /// txtStartTime 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtStartRectificationTime;
+        protected global::FineUIPro.DatePicker txtStartTime;
         
         /// <summary>
         /// Label3 控件。
@@ -67,13 +67,13 @@ namespace FineUIPro.Web.Transfer.Chart {
         protected global::FineUIPro.Label Label3;
         
         /// <summary>
-        /// txtEndRectificationTime 控件。
+        /// txtEndTime 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.DatePicker txtEndRectificationTime;
+        protected global::FineUIPro.DatePicker txtEndTime;
         
         /// <summary>
         /// drpChartType 控件。
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 5dd4914b..d7e4dff0 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
    <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>

From 183af3a610eedd18a016bd4418937dd308470f5e Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Tue, 30 Jan 2024 16:01:53 +0800
Subject: [PATCH 16/31] =?UTF-8?q?=E5=85=A8=E5=8E=82=E7=A7=BB=E4=BA=A4?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ErrLog.txt                 | 123 ++++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../Transfer/Chart/Instrumentation.aspx       |  27 +-
 .../Transfer/Chart/Instrumentation.aspx.cs    | 268 +++++++++++++-----
 .../Chart/Instrumentation.aspx.designer.cs    |   4 +-
 .../Transfer/CivilStructureDataIn.aspx.cs     |  71 ++---
 .../Transfer/ElectricalDataIn.aspx.cs         |  71 ++---
 .../Transfer/FirefightingDataIn.aspx.cs       |  69 ++---
 .../FineUIPro.Web/Transfer/HVACDataIn.aspx.cs |  71 ++---
 .../Transfer/InstrumentationDataIn.aspx.cs    |  74 ++---
 .../Transfer/PlumbingDataIn.aspx.cs           |  71 ++---
 .../Transfer/PunchlistFromDataIn.aspx.cs      |  95 ++++---
 .../Transfer/TelecomDataIn.aspx.cs            |  71 ++---
 SGGL/FineUIPro.Web/Web.config                 |   4 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 15 files changed, 650 insertions(+), 373 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 6e590a65..8dcb5402 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -755,3 +755,126 @@ IP地址:::1
 出错时间:01/29/2024 15:51:59
 出错时间:01/29/2024 15:51:59
 
+
+错误信息开始=====>
+错误类型:HttpCompileException
+错误信息:e:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\Instrumentation.aspx(66): error CS0123: “tvControlItem_NodeCommand”的重载均与委托“System.EventHandler<FineUIPro.TreeCommandEventArgs>”不匹配
+错误堆栈:
+   在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
+   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
+   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
+   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
+   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
+   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
+   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
+   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
+出错时间:01/30/2024 10:25:17
+出错文件:http://localhost:8579/Transfer/Chart/Instrumentation.aspx
+IP地址:::1
+
+出错时间:01/30/2024 10:25:18
+
+
+错误信息开始=====>
+错误类型:HttpParseException
+错误信息:FineUIPro.RegionCollection 必须具有类型为“FineUIPro.Region”的项。“f:Tree”的类型为“FineUIPro.Tree”。
+错误堆栈:
+   在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
+   在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+   在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
+----错误类型:HttpException
+----错误信息:
+----FineUIPro.RegionCollection 必须具有类型为“FineUIPro.Region”的项。“f:Tree”的类型为“FineUIPro.Tree”。
+----错误堆栈:
+       在 System.Web.UI.CollectionBuilder.GetChildControlType(String tagName, IDictionary attribs)
+       在 System.Web.UI.ControlBuilder.CreateChildBuilder(String filter, String tagName, IDictionary attribs, TemplateParser parser, ControlBuilder parentBuilder, String id, Int32 line, VirtualPath virtualPath, Type& childType, Boolean defaultProperty)
+       在 System.Web.UI.TemplateParser.ProcessBeginTag(Match match, String inputText)
+       在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
+出错时间:01/30/2024 10:33:19
+出错文件:http://localhost:8579/Transfer/Chart/Instrumentation.aspx
+IP地址:::1
+
+出错时间:01/30/2024 10:33:19
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
+   在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 67
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+----错误类型:Win32Exception
+----错误信息:
+----等待的操作过时。
+----错误堆栈:
+    出错时间:01/30/2024 10:40:32
+出错文件:http://localhost:8579/common/main_new.aspx
+IP地址:127.0.0.1
+操作人员:JT
+
+出错时间:01/30/2024 10:40:32
+
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
+   在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 67
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+----错误类型:Win32Exception
+----错误信息:
+----等待的操作过时。
+----错误堆栈:
+    出错时间:01/30/2024 10:41:13
+出错文件:http://localhost:8579/common/main_new.aspx
+IP地址:127.0.0.1
+操作人员:JT
+
+出错时间:01/30/2024 10:41:13
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f8ca7c7a..c4484e3e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index b8290120..05366324 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -5,12 +5,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title></title>
 </head>
 <body>
     <form id="form1" runat="server">
-       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
 
         <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
             <Regions>
@@ -22,7 +22,7 @@
                                 <f:FormRow>
                                     <Items>
                                         <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
-                                       
+
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
 
                                         <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
@@ -40,6 +40,8 @@
                                         </f:CheckBox>--%>
 
                                         <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
+
+
                                     </Items>
                                 </f:FormRow>
                             </Rows>
@@ -62,11 +64,22 @@
                                         </f:ContentPanel>
                                     </Items>
 
-                                   <Items>
-                                      <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
-                                            Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px">
+                                    <Items>
+                                        <%--  <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
+                                            Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px" 
+                                          OnNodeCommand="tvControlItem_NodeCommand"
+                                           AutoLeafIdentification="true">
+                                        </f:Tree>--%>
+                                        <%--<f:Tree ID="Tree1" IsFluid="true" EnableCollapse="false"  ShowHeader="false"
+                                            OnNodeCommand="tvControlItem_NodeCommand"  CssStyle="width:200px; height:600px"
+                                            runat="server">
+                                        </f:Tree>--%>
+                                         <f:Tree ID="trRectify" Width="200px" EnableCollapse="true" ShowHeader="true"
+                                             CssStyle="width:200px; height:600px"
+                                            OnNodeCommand="trRectify_NodeCommand" AutoLeafIdentification="true" runat="server">
                                         </f:Tree>
-                                   </Items>
+                                        
+                                    </Items>
                                 </f:Tab>
                             </Tabs>
                         </f:TabStrip>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index e6051bf0..c096b319 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -52,6 +52,12 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </summary>
         private void AnalyseData()
         {
+            if (string.IsNullOrEmpty(ProjectId))
+            {
+                Alert.ShowInTop("项目未获取到，请刷新页面。", MessageBoxIcon.Warning);
+                return;
+            }
+
             var sTime = DateTime.Now.AddDays(-7);
             var eTime = DateTime.Now; ;
 
@@ -64,8 +70,9 @@ namespace FineUIPro.Web.Transfer.Chart
             }
              
             //查询当前日期中的system的具体数目，去除重复
-            var list = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
-               && x.Test_Package_FINISH >= sTime && x.Test_Package_FINISH <= eTime).ToList();
+            var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+               && x.FDate >= sTime && x.FDate <= eTime).ToList();
+
             var SystemList = (from x in list select x.SystemName).Distinct();
 
             //先加载左侧system 树菜单
@@ -87,39 +94,63 @@ namespace FineUIPro.Web.Transfer.Chart
                 Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
                 rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
                 //根据日期查询当前system的数量
-                var systemListbyDate = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
-                && x.Test_Package_FINISH >= Convert.ToDateTime(rowTime["日期"]) 
-                && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                && x.FDate >= Convert.ToDateTime(rowTime["日期"]) 
+                && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
 
-                //具体的system 去重
-                var systemList = (from x in systemListbyDate select x.SystemName).Distinct();
-                if (systemList.ToList().Count>0)
+                //查询TestPackage 去重
+                var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+
+                if (testpackageList.ToList().Count>0)
                 {
                     systemBol = true;
                 }
-                foreach (var item in systemList)
+                foreach (var item in testpackageList)
                 {
-                    //查询当前日期每个system的数量
-                    var systemSumCount = systemListbyDate.Where(x => x.SystemName == item).ToList().Count;
+                    //查询当前日期每个testpackage的数量
+                    var systemSumCount = systemListbyDate.Where(x => x.TestPackage == item).ToList().Count;
+
                     //子系统中完成的数量
-                    var subSystemSumCount = systemListbyDate.Where(x => x.SystemName == item &&
-                    x.FINAL_Status.ToLower() == "finished").ToList().Count;
+                    var subSystemSumCount = systemListbyDate.Where(x => x.TestPackage == item &&
+                    x.Status.ToLower() == "finished").ToList().Count;
 
                     //子系统中没完成的情况
-                    var subSystemSumNotStartCount = systemListbyDate.Where(x => x.SystemName == item &&
-                    x.FINAL_Status.ToLower() == "not start").ToList().Count;
+                    var subSystemSumNotStartCount = systemListbyDate.Where(x => x.TestPackage == item &&
+                    (x.Status.ToLower() == "not start"|| x.Status=="" || x.Status==null )).ToList().Count;
 
+                    //如果总数量等于完成的数量，完成量+1
                     if (systemSumCount == subSystemSumCount)
                     {
-                        finishedCount += 1;
+                        //如果都是完成，需要最后 12表 test packge 必须是Finished才能是完成
+                        var punchlistFromList= Funs.DB.Transfer_PunchlistFrom.Where(x=>x.ProjectId==ProjectId
+                        && x.Test_Package==item
+                        && x.PUNCH_ITEM_FINISH_DATE>= Convert.ToDateTime(rowTime["日期"])
+                        && x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                finishedCount += 1;
+                            }
+                            else {
+                                inProgress += 1;
+                            }
+                        }
+                        else {
+                            inProgress += 1;
+                        }
                     }
+                    //如果总数量等于not start，未开始量+1
                     else if (systemSumCount== subSystemSumNotStartCount)
                     {
                         notStart += 1;
                     }
                     else { 
                         inProgress += 1;
-
                     }
                 }
                 rowTime["Finished"] = finishedCount;
@@ -130,7 +161,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             if (systemBol)
             {
-                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "Instrumentation PROGRESS", this.drpChartType.SelectedValue, 1100, 600, false));
+                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
             }
             
 
@@ -161,75 +192,158 @@ namespace FineUIPro.Web.Transfer.Chart
 
         private void LoadData(IEnumerable<String> list)
         {
-            Tree1.Nodes.Clear();
-            // 模拟从数据库返回数据表
-            DataTable table = CreateDataTable(list);
-
-            DataSet ds = new DataSet();
-            ds.Tables.Add(table);
-            ds.Relations.Add("TreeRelation", ds.Tables[0].Columns["Id"], ds.Tables[0].Columns["ParentId"]);
-
-            foreach (DataRow row in ds.Tables[0].Rows)
+            this.trRectify.Nodes.Clear();
+            this.trRectify.ShowBorder = false;
+            this.trRectify.ShowHeader = false;
+            this.trRectify.EnableIcons = true;
+            this.trRectify.AutoScroll = true;
+            this.trRectify.EnableSingleClickExpand = true;
+            TreeNode rootNode = new TreeNode
             {
-                if (row.IsNull("ParentId"))
-                {
-                    TreeNode node = new TreeNode();
-                    node.Text = row["Text"].ToString();
-                    Tree1.Nodes.Add(node);
-
-                    ResolveSubTree(row, node);
-                }
-            }
+                Text = "全部",
+                NodeID = "ALL",
+                EnableClickEvent = true,
+                Expanded = true
+            };
+            this.trRectify.Nodes.Add(rootNode);
+            BoundTree(rootNode.Nodes, list);
         }
 
-        private void ResolveSubTree(DataRow dataRow, TreeNode treeNode)
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        /// <param name="nodes"></param>
+        /// <param name="menuId"></param>
+        private void BoundTree(TreeNodeCollection nodes, IEnumerable<String> list)
         {
-            DataRow[] rows = dataRow.GetChildRows("TreeRelation");
-            if (rows.Length > 0)
-            {
-                // 如果是目录，则默认展开
-                treeNode.Expanded = true;
-                foreach (DataRow row in rows)
-                {
-                    TreeNode node = new TreeNode();
-                    node.Text = row["Text"].ToString();
-                    treeNode.Nodes.Add(node);
-
-                    ResolveSubTree(row, node);
-                }
-            }
-        }
-
-        #region CreateDataTable
-
-        private DataTable CreateDataTable(IEnumerable<String> list)
-        {
-            DataTable table = new DataTable();
-            DataColumn column1 = new DataColumn("Id", typeof(string));
-            DataColumn column2 = new DataColumn("Text", typeof(String));
-            DataColumn column3 = new DataColumn("ParentId", typeof(string));
-            table.Columns.Add(column1);
-            table.Columns.Add(column2);
-            table.Columns.Add(column3);
-
-            DataRow row = table.NewRow();
-            row[0] = "ALL";
-            row[1] = "全部";
-            row[2] = DBNull.Value;
-            table.Rows.Add(row);
-
+            TreeNode tn = null;
             foreach (var item in list)
             {
-                row = table.NewRow();
-                row[0] = item.ToString();
-                row[1] = item.ToString();
-                row[2] = "ALL";
-                table.Rows.Add(row);
+                tn = new TreeNode
+                {
+                    Text = item.ToString(),
+                    NodeID = item.ToString(),
+                    EnableClickEvent = true
+                };
+                nodes.Add(tn);
             }
-            return table;
         }
 
+       
 
+       
+
+        #region 点击树节点
+        protected void trRectify_NodeCommand(object sender, TreeCommandEventArgs e) { 
+            var SystemName = this.trRectify.SelectedNodeID;
+            if (SystemName == "ALL")
+            {
+                AnalyseData();
+            }
+            else
+            {
+                var sTime = DateTime.Now.AddDays(-7);
+                var eTime = DateTime.Now; ;
+
+                //如果没有填写日期，则是七天内的
+                if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
+                {
+                    sTime = Convert.ToDateTime(txtStarTime.Text);
+                    eTime = Convert.ToDateTime(txtEndTime.Text);
+
+                }
+                DataTable dtTime = new DataTable();
+                dtTime.Columns.Add("日期", typeof(string));
+                dtTime.Columns.Add("Finished", typeof(string));
+                dtTime.Columns.Add("In Progress", typeof(string));
+                dtTime.Columns.Add("Not Start", typeof(string));
+
+                var systemBol = false;
+                for (var i = sTime; i <= eTime; i = i.AddDays(1))
+                {
+                    var finishedCount = 0;
+                    var inProgress = 0;
+                    var notStart = 0;
+                    DataRow rowTime = dtTime.NewRow();
+                    Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
+                    rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
+                    //根据日期查询当前system的数量
+                    var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId && x.SystemName == SystemName
+                    && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                    && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+
+                    //查询TestPackage 去重
+                    var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+
+                    if (testpackageList.ToList().Count > 0)
+                    {
+                        systemBol = true;
+                    }
+                    foreach (var item in testpackageList)
+                    {
+                        //查询当前日期每个testpackage的数量
+                        var systemSumCount = systemListbyDate.Where(x => x.TestPackage == item).ToList().Count;
+
+                        //子系统中完成的数量
+                        var subSystemSumCount = systemListbyDate.Where(x => x.TestPackage == item &&
+                        x.Status.ToLower() == "finished").ToList().Count;
+
+                        //子系统中没完成的情况
+                        var subSystemSumNotStartCount = systemListbyDate.Where(x => x.TestPackage == item &&
+                        (x.Status.ToLower() == "not start" || x.Status == "" || x.Status == null)).ToList().Count;
+
+                        //如果总数量等于完成的数量，完成量+1
+                        if (systemSumCount == subSystemSumCount)
+                        {
+                            //如果都是完成，需要最后 12表 test packge 必须是Finished才能是完成
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.SystemName==SystemName
+                             && x.Test_Package == item
+                             && x.PUNCH_ITEM_FINISH_DATE >= Convert.ToDateTime(rowTime["日期"])
+                             && x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    finishedCount += 1;
+                                }
+                                else
+                                {
+                                    inProgress += 1;
+                                }
+                            }
+                            else
+                            {
+                                inProgress += 1;
+                            }
+                        }
+                        //如果总数量等于not start，未开始量+1
+                        else if (systemSumCount == subSystemSumNotStartCount)
+                        {
+                            notStart += 1;
+                        }
+                        else
+                        {
+                            inProgress += 1;
+                        }
+                    }
+                    rowTime["Finished"] = finishedCount;
+                    rowTime["In Progress"] = inProgress;
+                    rowTime["Not Start"] = notStart;
+                    dtTime.Rows.Add(rowTime);
+
+                }
+                if (systemBol)
+                {
+                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                }
+            }
+
+        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
index e9e5e8af..2be7ed02 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -141,12 +141,12 @@ namespace FineUIPro.Web.Transfer.Chart
         protected global::Web.Controls.ChartControl ChartUc;
 
         /// <summary>
-        /// Tree1 控件。
+        /// trRectify 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.Tree Tree1;
+        protected global::FineUIPro.Tree trRectify;
     }
 }
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
index d7472dc3..bdb57aa1 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -329,41 +329,44 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Civil_Structure> list = new List<Model.Transfer_Civil_Structure>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Civil_Structure.FirstOrDefault(x => x.Civil_Structure == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly==null)
-                    {
-                        Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
index add980dc..9fd99938 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
@@ -180,7 +180,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -328,41 +328,44 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Electrical> list = new List<Model.Transfer_Electrical>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_Electrical model = new Model.Transfer_Electrical();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Electrical model = new Model.Transfer_Electrical();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
index 25961140..aeb83cbf 100644
--- a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -329,40 +329,43 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Firefighting> list = new List<Model.Transfer_Firefighting>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Firefighting == pds.Rows[i][0].ToString().Trim() && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
                     {
-                        Model.Transfer_Firefighting model = new Model.Transfer_Firefighting();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.Firefighting = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Firefighting == pds.Rows[i][0].ToString().Trim() && x.ProjectId == CurrUser.LoginProjectId);
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Firefighting model = new Model.Transfer_Firefighting();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.Firefighting = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
index 3b779322..09b7148a 100644
--- a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
@@ -180,7 +180,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -328,41 +328,44 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_HVAC> list = new List<Model.Transfer_HVAC>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_HVAC.FirstOrDefault(x => x.HVAC == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_HVAC.FirstOrDefault(x => x.HVAC == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_HVAC model = new Model.Transfer_HVAC();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.HVAC = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_HVAC model = new Model.Transfer_HVAC();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.HVAC = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.HVAC = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.HVAC = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index afe7ca2f..af824d08 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.Transfer
                 oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
                 oleDBConnString += "Data Source=";
                 oleDBConnString += fileName;
-                oleDBConnString += ";Extended Properties=Excel 8.0;";
+                oleDBConnString += ";Extended Properties='Excel 8.0';";
                 OleDbConnection oleDBConn = null;
                 OleDbDataAdapter oleAdMaster = null;
                 DataTable m_tableName = new DataTable();
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -329,40 +329,46 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Instrumentation> list = new List<Model.Transfer_Instrumentation>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
-                    && x.ProjectId==CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
                     {
-                        Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
+                        && x.ProjectId == CurrUser.LoginProjectId);
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
+
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
+
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else {
-                        //修改
-                        modelOnly.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
index 1a358706..3974b8f4 100644
--- a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -329,41 +329,44 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Plumbing> list = new List<Model.Transfer_Plumbing>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Plumbing == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Plumbing == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.Plumbing = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.Plumbing = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs
index 6922c30a..39924624 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFromDataIn.aspx.cs
@@ -317,57 +317,60 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_PunchlistFrom> list = new List<Model.Transfer_PunchlistFrom>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][1].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
 
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
 
-                        model.Item_No = pds.Rows[i][0].ToString().Trim();
-                        model.Punch_No = pds.Rows[i][1].ToString().Trim();
-                        model.SystemName = pds.Rows[i][2].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][3].ToString().Trim();
+                            model.Item_No = pds.Rows[i][0].ToString().Trim();
+                            model.Punch_No = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][3].ToString().Trim();
 
-                        model.Test_Package = pds.Rows[i][4].ToString().Trim();
-                        model.Discipline = pds.Rows[i][5].ToString().Trim();
-                        model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
-                        model.Identified = pds.Rows[i][7].ToString().Trim();
-                        model.Category = pds.Rows[i][8].ToString().Trim();
-                        DateTime t1;
-                        if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
-                            model.PUNCH_ITEM_FINISH_DATE = t1;
-                        
+                            model.Test_Package = pds.Rows[i][4].ToString().Trim();
+                            model.Discipline = pds.Rows[i][5].ToString().Trim();
+                            model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
+                            model.Identified = pds.Rows[i][7].ToString().Trim();
+                            model.Category = pds.Rows[i][8].ToString().Trim();
+                            DateTime t1;
+                            if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
+                                model.PUNCH_ITEM_FINISH_DATE = t1;
 
-                        model.Action_By = pds.Rows[i][10].ToString().Trim();
-                        model.Required_By = pds.Rows[i][11].ToString().Trim();
-                        model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
-                        model.Comments = pds.Rows[i][13].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
-                        modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
-                        modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
-                        modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
-                        modelOnly.Category = pds.Rows[i][8].ToString().Trim();
-                        DateTime t1;
-                        if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
-                            modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
-                        modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
-                        modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
-                        modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
-                        modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+
+                            model.Action_By = pds.Rows[i][10].ToString().Trim();
+                            model.Required_By = pds.Rows[i][11].ToString().Trim();
+                            model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
+                            model.Comments = pds.Rows[i][13].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
+                            modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
+                            modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
+                            modelOnly.Category = pds.Rows[i][8].ToString().Trim();
+                            DateTime t1;
+                            if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
+                                modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
+                            modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
+                            modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
+                            modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
+                            modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
index bc640cba..2475a6b4 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.Transfer
                         }
                     }
                     string row5 = pds.Rows[i][5].ToString();
-                    if (!string.IsNullOrEmpty(row4))
+                    if (!string.IsNullOrEmpty(row5))
                     {
                         try
                         {
@@ -329,41 +329,44 @@ namespace FineUIPro.Web.Transfer
                 List<Model.Transfer_Telecom> list = new List<Model.Transfer_Telecom>();
                 for (int i = 1; i < ir; i++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
-                    var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
-                    {
-                        Model.Transfer_Telecom model = new Model.Transfer_Telecom();
-                        model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
-                        model.Telecom = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                        if (modelOnly == null)
+                        {
+                            Model.Transfer_Telecom model = new Model.Transfer_Telecom();
+                            model.Id = Guid.NewGuid().ToString();
+                            model.ProjectId = CurrUser.LoginProjectId;
+                            model.Telecom = pds.Rows[i][0].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                model.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
-                    }
-                    else
-                    {
-                        //修改
-                        modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            list.Add(model);
+                        }
+                        else
+                        {
+                            //修改
+                            modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            DateTime t1, t2;
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                                modelOnly.Test_Package_START = t1;
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                                modelOnly.Test_Package_FINISH = t2;
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 5dd4914b..58334a96 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="connectionstring" value="server=desktop-1qitk9e\mssqlserver2;database=sggldb;integrated security=false;user id=sa;password=123;multipleactiveresultsets=true;connect timeout=1200"/>
    <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 4586e54c657624d3beef973d4b69333f3db75664 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Tue, 30 Jan 2024 17:19:33 +0800
Subject: [PATCH 17/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestRun/DriverRun/DriverRunPlan.aspx.cs   |  2 +-
 .../TestRun/DriverRun/DriverRunPlanEdit.aspx  | 14 ++++---
 .../DriverRun/DriverRunPlanEdit.aspx.cs       | 38 +++++++++++++++++++
 .../DriverRunPlanEdit.aspx.designer.cs        | 18 +++++++++
 4 files changed, 66 insertions(+), 6 deletions(-)

diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx.cs
index e4cd5075..a550a026 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlan.aspx.cs
@@ -41,7 +41,7 @@ namespace FineUIPro.Web.TestRun.DriverRun
                                      (CASE WHEN driverRun.IsAcceptInvite=1 THEN '是' ELSE '否' END) AS IsAcceptInvite,
                                      driverRun.AttachUrl,
                                      driverRun.Remark,
-                                     Unit.UnitName AS SubUnitName"
+                                     Unit.UnitName AS UnitName"
                             + @" FROM DriverRun_DriverRunPlan AS driverRun"
                             + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = driverRun.UnitId WHERE driverRun.ProjectId=@projectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx
index d7305912..d97d5e98 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx
@@ -4,12 +4,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>编辑开车保运计划</title>
 </head>
 <body>
     <form id="form1" runat="server">
-        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" OnCustomEvent="PageManager1_CustomEvent"/>
         <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
             BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
             <Toolbars>
@@ -47,7 +47,7 @@
                                     </f:FormRow>
                                     <f:FormRow>
                                         <Items>
-                                            <f:DropDownList ID="drpUnitWorkIds" runat="server" Label="意向保运装置或单元" LabelAlign="Right" LabelWidth="150px" EnableMultiSelect="true" EnableCheckBoxSelect="true" ></f:DropDownList>
+                                            <f:DropDownList ID="drpUnitWorkIds" runat="server" Label="意向保运装置或单元" LabelAlign="Right" LabelWidth="150px" EnableMultiSelect="true" EnableCheckBoxSelect="true"></f:DropDownList>
                                         </Items>
                                     </f:FormRow>
                                     <f:FormRow>
@@ -78,7 +78,11 @@
                                                     <f:Label ID="lblAttach" runat="server" Label="上传附件"
                                                         LabelWidth="150px">
                                                     </f:Label>
-                                                    <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
+                                                    <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="保运合同" ToolTip="上传保运合同" runat="server" OnClick="btnAttach_Click">
+                                                    </f:Button>
+                                                    <f:Button ID="btnAttachK" Icon="TableCell" EnablePostBack="true" Text="保运考勤表" ToolTip="上传保运考勤表" runat="server" OnClick="btnAttachK_Click">
+                                                    </f:Button>
+                                                    <f:Button ID="btnDownLoad" runat="server" Icon="ApplicationGo" ToolTip="下载保运考勤表模板" OnClick="btnDownLoad_Click" Text="下载保运考勤表模板">
                                                     </f:Button>
                                                 </Items>
                                             </f:Panel>
@@ -97,4 +101,4 @@
         </f:Window>
     </form>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
index 9658a7fe..1c31201e 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
@@ -1,5 +1,6 @@
 using BLL;
 using System;
+using System.IO;
 
 namespace FineUIPro.Web.TestRun.DriverRun
 {
@@ -65,6 +66,43 @@ namespace FineUIPro.Web.TestRun.DriverRun
         }
         #endregion
 
+        #region 下载模板
+        /// <summary>
+        /// 下载模板按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnDownLoad_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Confirm.GetShowReference("确定下载模板吗？", String.Empty, MessageBoxIcon.Question, PageManager1.GetCustomEventReference(false, "Confirm_OK"), PageManager1.GetCustomEventReference("Confirm_Cancel")));
+        }
+
+        /// <summary>
+        /// 下载导入模板
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void PageManager1_CustomEvent(object sender, CustomEventArgs e)
+        {
+            if (e.EventArgument == "Confirm_OK")
+            {
+                string rootPath = Server.MapPath("~/");
+                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\CivilStructure导入模板.xls";
+                string filePath = "File\\Excel\\DataIn\\CivilStructure导入模板.xls";
+                string fileName = Path.GetFileName(filePath);
+                FileInfo info = new FileInfo(uploadfilepath);
+                long fileSize = info.Length;
+                Response.ClearContent();
+                Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+                Response.ContentType = "excel/plain";
+                Response.ContentEncoding = System.Text.Encoding.UTF8;
+                Response.AddHeader("Content-Length", fileSize.ToString().Trim());
+                Response.TransmitFile(uploadfilepath, 0, fileSize);
+                Response.End();
+            }
+        }
+        #endregion
+
         #region 保存
         /// <summary>
         /// 保存按钮
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.designer.cs
index 026c7e3b..adba39d4 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.designer.cs
@@ -192,6 +192,24 @@ namespace FineUIPro.Web.TestRun.DriverRun {
         /// </remarks>
         protected global::FineUIPro.Button btnAttach;
         
+        /// <summary>
+        /// btnAttachK 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachK;
+        
+        /// <summary>
+        /// btnDownLoad 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnDownLoad;
+        
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>

From df9bf75f24f95fd64b978883d6e809683a10d391 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 31 Jan 2024 16:32:26 +0800
Subject: [PATCH 18/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestRun/DriverRun/DriverRunPlanService.cs |   7 +-
 SGGL/FineUIPro.Web/ErrLog.txt                 | 200 ++++++++++++++++++
 .../File/Excel/TestRun/保运考勤表模板.xls     | Bin 0 -> 36352 bytes
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../DriverRun/DriverRunPlanEdit.aspx.cs       |  18 +-
 .../FineUIPro.Web/common/mainProject2.aspx.cs |   2 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 7 files changed, 222 insertions(+), 9 deletions(-)
 create mode 100644 SGGL/FineUIPro.Web/File/Excel/TestRun/保运考勤表模板.xls

diff --git a/SGGL/BLL/TestRun/DriverRun/DriverRunPlanService.cs b/SGGL/BLL/TestRun/DriverRun/DriverRunPlanService.cs
index 3da39a96..ec51bda1 100644
--- a/SGGL/BLL/TestRun/DriverRun/DriverRunPlanService.cs
+++ b/SGGL/BLL/TestRun/DriverRun/DriverRunPlanService.cs
@@ -83,10 +83,9 @@ namespace BLL
             Model.DriverRun_DriverRunPlan newDriverRunPlan = Funs.DB.DriverRun_DriverRunPlan.FirstOrDefault(e => e.DriverRunPlanId == driverRunPlanId);
             if (newDriverRunPlan != null)
             {
-                if (!string.IsNullOrEmpty(newDriverRunPlan.AttachUrl))
-                {
-                    UploadAttachmentService.DeleteFile(Funs.RootPath, newDriverRunPlan.AttachUrl);
-                }
+                ////删除附件表
+                BLL.CommonService.DeleteAttachFileById(newDriverRunPlan.DriverRunPlanId);
+                BLL.CommonService.DeleteAttachFileById(newDriverRunPlan.DriverRunPlanId + "K");
                 Funs.DB.DriverRun_DriverRunPlan.DeleteOnSubmit(newDriverRunPlan);
                 Funs.DB.SubmitChanges();
             }
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 518e3c1a..0ebc5b3d 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -975,3 +975,203 @@ IP地址:::1
 出错时间:01/30/2024 14:11:42
 出错时间:01/30/2024 14:11:42
 
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/31/2024 12:06:18
+出错时间:01/31/2024 12:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/31/2024 12:06:18
+出错时间:01/31/2024 12:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/31/2024 12:06:18
+出错时间:01/31/2024 12:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/31/2024 12:06:18
+出错时间:01/31/2024 12:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
+出错时间:01/31/2024 14:06:18
+出错时间:01/31/2024 14:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
+出错时间:01/31/2024 14:06:18
+出错时间:01/31/2024 14:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
+出错时间:01/31/2024 14:06:18
+出错时间:01/31/2024 14:06:18
+
+
+错误信息开始=====>
+错误类型:ArgumentException
+错误信息:提供的 URI 方案“http”无效，应为“https”。
+参数名: via
+错误堆栈:
+   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
+   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannel()
+   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
+   在 System.ServiceModel.ClientBase`1.get_Channel()
+   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
+出错时间:01/31/2024 14:06:18
+出错时间:01/31/2024 14:06:18
+
diff --git a/SGGL/FineUIPro.Web/File/Excel/TestRun/保运考勤表模板.xls b/SGGL/FineUIPro.Web/File/Excel/TestRun/保运考勤表模板.xls
new file mode 100644
index 0000000000000000000000000000000000000000..0c9967966cb3a7f852de2d6f6ef4192f8afd6150
GIT binary patch
literal 36352
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
QTls$g`Bzc?C(HkT033bZ@c;k-

literal 0
HcmV?d00001

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c4484e3e..f8ca7c7a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
index 1c31201e..9408a891 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverRun/DriverRunPlanEdit.aspx.cs
@@ -64,6 +64,20 @@ namespace FineUIPro.Web.TestRun.DriverRun
             }
             PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverRun/DriverRunPlan&menuId={1}", this.hdId.Text, BLL.Const.DriverRunPlanMenuId)));
         }
+
+        /// <summary>
+        /// 附件上传
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachK_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(this.hdId.Text))   //新增记录
+            {
+                this.hdId.Text = SQLHelper.GetNewID(typeof(Model.DriverRun_DriverRunPlan));
+            }
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/TestRun/DriverRun/DriverRunPlan&menuId={1}", this.hdId.Text+"K", BLL.Const.DriverRunPlanMenuId)));
+        }
         #endregion
 
         #region 下载模板
@@ -87,8 +101,8 @@ namespace FineUIPro.Web.TestRun.DriverRun
             if (e.EventArgument == "Confirm_OK")
             {
                 string rootPath = Server.MapPath("~/");
-                string uploadfilepath = rootPath + "File\\Excel\\DataIn\\CivilStructure导入模板.xls";
-                string filePath = "File\\Excel\\DataIn\\CivilStructure导入模板.xls";
+                string uploadfilepath = rootPath + "File\\Excel\\TestRun\\保运考勤表模板.xls";
+                string filePath = "File\\Excel\\TestRun\\保运考勤表模板.xls";
                 string fileName = Path.GetFileName(filePath);
                 FileInfo info = new FileInfo(uploadfilepath);
                 long fileSize = info.Length;
diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
index 878e59cc..111078dd 100644
--- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
@@ -100,7 +100,7 @@ namespace FineUIPro.Web.common
                 //质量培训人员
                 DateTime date = DateTime.Now.AddDays(-1);
                 int CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
-                                 where x.IsTrain == true && x.CompileDate.Value.Year == date.Year && x.CompileDate.Value.Month == date.Month && x.CompileDate.Value.Day == date.Day
+                                 where x.IsTrain == true && x.ProjectId == ProjectId
                                  select x).Count();
                 divCqmsPxNum.InnerHtml = CqmsPxNum.ToString();
 
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 6bc24ada..4edb5e0f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 0948804eb288dc2f873407115b1c7b382b877c4a Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 31 Jan 2024 17:27:00 +0800
Subject: [PATCH 19/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx    | 4 ++--
 SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx b/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx
index 860fb31f..90c631d0 100644
--- a/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx
@@ -15,8 +15,8 @@
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
                     runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
-                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="CommissioningSystem"
-                    SortDirection="DESC" OnSort="Grid1_Sort"
+                    ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="SortIndex"
+                    SortDirection="ASC" OnSort="Grid1_Sort"
                     AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                     EnableTextSelection="true">
                     <Toolbars>
diff --git a/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx.cs
index 61c8f241..8cb60289 100644
--- a/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ProjectSetup.aspx.cs
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.Transfer
         /// </summary>
         public void BindGrid()
         {
-            string strSql = @"select * from Transfer_ProjectSetup C 
+            string strSql = @"select *,isnull(CAST(SN as int),0) as SortIndex from Transfer_ProjectSetup C 
                               where C.ProjectId = @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));

From 60dfd8ee8d3b7aedd10d69be0c2a3c819016c2aa Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 1 Feb 2024 10:50:03 +0800
Subject: [PATCH 20/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2024-02-01-gaofei.sql  |    2 +
 SGGL/FineUIPro.Web/ErrLog.txt                 | 1177 -----------------
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |    2 +-
 SGGL/FineUIPro.Web/Web.config                 |    4 +-
 SGGL/WebAPI/WebAPI.csproj.user                |    2 +-
 5 files changed, 6 insertions(+), 1181 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-01-gaofei.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-01-gaofei.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-01-gaofei.sql
new file mode 100644
index 00000000..793147ec
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-01-gaofei.sql
@@ -0,0 +1,2 @@
+alter table Transfer_PunchlistFrom alter column DESCRIPTION nvarchar(500) null
+GO
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 0ebc5b3d..e69de29b 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -1,1177 +0,0 @@
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
-出错时间:01/23/2024 12:21:40
-出错时间:01/23/2024 12:21:40
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
-出错时间:01/23/2024 12:21:41
-出错时间:01/23/2024 12:21:41
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
-出错时间:01/23/2024 12:21:41
-出错时间:01/23/2024 12:21:41
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
-出错时间:01/23/2024 12:21:41
-出错时间:01/23/2024 12:21:41
-
-
-错误信息开始=====>
-错误类型:HttpParseException
-错误信息:基类包括字段“txtRemark”，但其类型(FineUIPro.TextBox)与控件(FineUIPro.TextArea)的类型不兼容。
-错误堆栈:
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildFieldDeclaration(ControlBuilder builder)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.BaseTemplateCodeDomTreeGenerator.BuildSourceDataTreeFromBuilder(ControlBuilder builder, Boolean fInTemplate, Boolean topLevelControlInTemplate, PropertyEntry pse)
-   在 System.Web.Compilation.TemplateControlCodeDomTreeGenerator.BuildMiscClassMembers()
-   在 System.Web.Compilation.PageCodeDomTreeGenerator.BuildMiscClassMembers()
-   在 System.Web.Compilation.BaseCodeDomTreeGenerator.BuildSourceDataTree()
-   在 System.Web.Compilation.BaseCodeDomTreeGenerator.GetCodeDomTree(CodeDomProvider codeDomProvider, StringResourceBuilder stringResourceBuilder, VirtualPath virtualPath)
-   在 System.Web.Compilation.BaseTemplateBuildProvider.GenerateCode(AssemblyBuilder assemblyBuilder)
-   在 System.Web.Compilation.AssemblyBuilder.AddBuildProvider(BuildProvider buildProvider)
-出错时间:01/24/2024 19:37:42
-出错文件:http://localhost:8579/TestRun/PersonTrain/TrainContractEdit.aspx?id=684accf8-74c8-4ba7-817f-914011ab0a03
-IP地址:::1
-
-出错时间:01/24/2024 19:37:42
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetSupervise_SubUnitReportListToSUB() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14204
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2181
-出错时间:01/25/2024 12:39:51
-出错时间:01/25/2024 12:39:51
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckInfo_Table8ItemListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14228
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2046
-出错时间:01/25/2024 12:39:51
-出错时间:01/25/2024 12:39:51
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetCheck_CheckRectifyListToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14220
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1942
-出错时间:01/25/2024 12:39:51
-出错时间:01/25/2024 12:39:51
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEService.HSSEServiceClient.GetInformation_UrgeReportToSUB(String unitId) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\Service References\CNCECHSSEService\Reference.cs:行号 14020
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1884
-出错时间:01/25/2024 12:39:51
-出错时间:01/25/2024 12:39:51
-
-
-错误信息开始=====>
-错误类型:FileNotFoundException
-错误信息:未能找到文件“E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\Menu_Transfer.xml”。
-错误堆栈:
-   在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath)
-   在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost)
-   在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
-   在 System.Web.UI.Control.OpenFileAndGetDependency(VirtualPath virtualPath, String physicalPath, CacheDependency& dependency)
-   在 System.Web.UI.WebControls.XmlDataSource.GetReader(String path, String content, CacheDependency& cacheDependency)
-   在 System.Web.UI.WebControls.XmlDataSource.PopulateXmlDocument(XmlDocument document, CacheDependency& dataCacheDependency, CacheDependency& transformCacheDependency)
-   在 System.Web.UI.WebControls.XmlDataSource.GetXmlDocument()
-   在 FineUIPro.Web.indexProject.InitTreeMenu() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 102
-   在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 728
-   在 FineUIPro.Web.indexProject.btnTransfer_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 786
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:01/26/2024 09:14:17
-出错文件:http://localhost:8579/indexProject.aspx?projectId=05a4f675-0caa-4e9e-b171-fc2b7d7ba025
-IP地址:::1
-操作人员:JT
-
-出错时间:01/26/2024 09:14:17
-
-
-错误信息开始=====>
-错误类型:FileNotFoundException
-错误信息:未能找到文件“E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\Menu_Transfer.xml”。
-错误堆栈:
-   在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath)
-   在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost)
-   在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share)
-   在 System.Web.UI.Control.OpenFileAndGetDependency(VirtualPath virtualPath, String physicalPath, CacheDependency& dependency)
-   在 System.Web.UI.WebControls.XmlDataSource.GetReader(String path, String content, CacheDependency& cacheDependency)
-   在 System.Web.UI.WebControls.XmlDataSource.PopulateXmlDocument(XmlDocument document, CacheDependency& dataCacheDependency, CacheDependency& transformCacheDependency)
-   在 System.Web.UI.WebControls.XmlDataSource.GetXmlDocument()
-   在 FineUIPro.Web.indexProject.InitTreeMenu() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 102
-   在 FineUIPro.Web.indexProject.MenuSwitchMethod(String type) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 728
-   在 FineUIPro.Web.indexProject.btnTransfer_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\indexProject.aspx.cs:行号 786
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:01/26/2024 09:14:20
-出错文件:http://localhost:8579/indexProject.aspx?projectId=05a4f675-0caa-4e9e-b171-fc2b7d7ba025
-IP地址:::1
-操作人员:JT
-
-出错时间:01/26/2024 09:14:20
-
-
-错误信息开始=====>
-错误类型:HttpException
-错误信息:文件“/common/mainMenu_Transfer.aspx”不存在。
-错误堆栈:
-   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:01/26/2024 09:42:36
-出错文件:http://localhost:8579/common/mainMenu_Transfer.aspx
-IP地址:::1
-
-出错时间:01/26/2024 09:42:36
-
-
-错误信息开始=====>
-错误类型:HttpException
-错误信息:文件“/common/mainMenu_Transfer.aspx”不存在。
-错误堆栈:
-   在 System.Web.UI.Util.CheckVirtualFileExists(VirtualPath virtualPath)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate)
-   在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound)
-   在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp)
-   在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath)
-   在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path)
-   在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute()
-   在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step)
-   在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously)
-出错时间:01/26/2024 09:47:07
-出错文件:http://localhost:8579/common/mainMenu_Transfer.aspx
-IP地址:::1
-
-出错时间:01/26/2024 09:47:07
-
-
-错误信息开始=====>
-错误类型:HttpParseException
-错误信息:未能加载类型“FineUIPro.Web.common.mainMenu_Transfer”。
-错误堆栈:
-   在 System.Web.UI.TemplateParser.ProcessException(Exception ex)
-   在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding)
-   在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding)
-----错误类型:HttpException
-----错误信息:
-----未能加载类型“FineUIPro.Web.common.mainMenu_Transfer”。
-----错误堆栈:
-       在 System.Web.UI.TemplateParser.GetType(String typeName, Boolean ignoreCase, Boolean throwOnError)
-       在 System.Web.UI.TemplateParser.ProcessInheritsAttribute(String baseTypeName, String codeFileBaseTypeName, String src, Assembly assembly)
-       在 System.Web.UI.TemplateParser.PostProcessMainDirectiveAttributes(IDictionary parseData)
-出错时间:01/26/2024 09:47:58
-出错文件:http://localhost:8579/common/mainMenu_Transfer.aspx
-IP地址:::1
-
-出错时间:01/26/2024 09:47:58
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/26/2024 12:55:46
-出错时间:01/26/2024 12:55:46
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/26/2024 12:55:46
-出错时间:01/26/2024 12:55:46
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/26/2024 12:55:46
-出错时间:01/26/2024 12:55:46
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/26/2024 12:55:46
-出错时间:01/26/2024 12:55:46
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/29/2024 11:51:59
-出错时间:01/29/2024 11:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/29/2024 11:51:59
-出错时间:01/29/2024 11:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/29/2024 11:51:59
-出错时间:01/29/2024 11:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/29/2024 11:51:59
-出错时间:01/29/2024 11:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/29/2024 13:51:58
-出错时间:01/29/2024 13:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/29/2024 13:51:59
-出错时间:01/29/2024 13:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/29/2024 13:51:59
-出错时间:01/29/2024 13:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/29/2024 13:51:59
-出错时间:01/29/2024 13:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/29/2024 15:51:58
-出错时间:01/29/2024 15:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/29/2024 15:51:59
-出错时间:01/29/2024 15:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/29/2024 15:51:59
-出错时间:01/29/2024 15:51:59
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/29/2024 15:51:59
-出错时间:01/29/2024 15:51:59
-
-
-错误信息开始=====>
-错误类型:NullReferenceException
-错误信息:未将对象引用设置到对象的实例。
-错误堆栈:
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFrom.AnalyseData() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFrom.aspx.cs:行号 41
-   在 FineUIPro.Web.Transfer.Chart.PunchlistFrom.BtnAnalyse_Click(Object sender, EventArgs e) 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Chart\PunchlistFrom.aspx.cs:行号 33
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:01/30/2024 10:36:38
-出错文件:http://localhost:8579/Transfer/Chart/PunchlistFrom.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:01/30/2024 10:36:38
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/30/2024 12:11:43
-出错时间:01/30/2024 12:11:43
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/30/2024 12:11:43
-出错时间:01/30/2024 12:11:43
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/30/2024 12:11:43
-出错时间:01/30/2024 12:11:43
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/30/2024 12:11:43
-出错时间:01/30/2024 12:11:43
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/30/2024 14:11:42
-出错时间:01/30/2024 14:11:42
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/30/2024 14:11:42
-出错时间:01/30/2024 14:11:42
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/30/2024 14:11:42
-出错时间:01/30/2024 14:11:42
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/30/2024 14:11:42
-出错时间:01/30/2024 14:11:42
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/31/2024 12:06:18
-出错时间:01/31/2024 12:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/31/2024 12:06:18
-出错时间:01/31/2024 12:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/31/2024 12:06:18
-出错时间:01/31/2024 12:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/31/2024 12:06:18
-出错时间:01/31/2024 12:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2180
-出错时间:01/31/2024 14:06:18
-出错时间:01/31/2024 14:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckInfo_Table8Item() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 2045
-出错时间:01/31/2024 14:06:18
-出错时间:01/31/2024 14:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getCheck_CheckRectify() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1941
-出错时间:01/31/2024 14:06:18
-出错时间:01/31/2024 14:06:18
-
-
-错误信息开始=====>
-错误类型:ArgumentException
-错误信息:提供的 URI 方案“http”无效，应为“https”。
-参数名: via
-错误堆栈:
-   在 System.ServiceModel.Channels.TransportChannelFactory`1.ValidateScheme(Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.ValidateCreateChannelParameters(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.HttpsChannelFactory`1.OnCreateChannelCore(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.HttpChannelFactory`1.OnCreateChannel(EndpointAddress remoteAddress, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.InternalCreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ChannelFactoryBase`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.ServiceChannelFactoryOverRequest.CreateInnerChannelBinder(EndpointAddress to, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateServiceChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.Channels.ServiceChannelFactory.CreateChannel(Type channelType, EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel(EndpointAddress address, Uri via)
-   在 System.ServiceModel.ChannelFactory`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannel()
-   在 System.ServiceModel.ClientBase`1.CreateChannelInternal()
-   在 System.ServiceModel.ClientBase`1.get_Channel()
-   在 BLL.CNCECHSSEWebService.getInformation_UrgeReport() 位置 E:\工作\五环施工平台\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1883
-出错时间:01/31/2024 14:06:18
-出错时间:01/31/2024 14:06:18
-
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f8ca7c7a..c4484e3e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index d7e4dff0..8206b76c 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -12,7 +12,7 @@
   <appSettings>
     <!--连接字符串-->
     <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
-   <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
+    <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 8782bbff79e370854d9274203cb4c40c65ae3a48 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 1 Feb 2024 11:01:07 +0800
Subject: [PATCH 21/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
index aa3fe84b..bd8431ca 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.Transfer.Chart
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
                         rowTime["Discipline"] = item.Discipline;
-                        var types = forms.Where(x => x.Discipline == item.Discipline);
+                        var types = forms.Where(x => x.Discipline == item.Discipline || x.Discipline==item.DisciplineCode);
                         rowTime["总数量"] = types.Count();
                         rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
                         rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.Transfer.Chart
                         DataRow rowTime = dtTime.NewRow();
                         Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
                         rowTime["Discipline"] = item.Discipline;
-                        var types = forms.Where(x => x.Discipline == item.Discipline);
+                        var types = forms.Where(x => x.Discipline == item.Discipline || x.Discipline == item.DisciplineCode);
                         rowTime["总数量"] = types.Count();
                         dtTime.Rows.Add(rowTime);
                     }

From 8276d5e70af78176a022d2d0164bc86c352a23ce Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Thu, 1 Feb 2024 16:28:37 +0800
Subject: [PATCH 22/31] =?UTF-8?q?=E6=8C=89=E5=B9=B4=E6=9C=88=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Transfer/Chart/Instrumentation.aspx       |  27 ++-
 .../Transfer/Chart/Instrumentation.aspx.cs    | 183 +++++++++++++++---
 .../Chart/Instrumentation.aspx.designer.cs    |  27 +++
 3 files changed, 206 insertions(+), 31 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index 05366324..fe64043c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -14,6 +14,7 @@
 
         <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
             <Regions>
+                   
                 <f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
                     BodyPadding="0 5 0 0" Width="200px" Layout="Fit" runat="server" EnableCollapse="true">
                     <Items>
@@ -21,14 +22,24 @@
                             <Rows>
                                 <f:FormRow>
                                     <Items>
-                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
+                                        <f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
+                                            <f:ListItem Value="0" Text="按年月"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="1" Text="按日期"></f:ListItem>
+                                        </f:DropDownList>
 
-                                        <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
 
                                         <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
-                                            <f:ListItem Value="Column" Text="柱形图"></f:ListItem>
-                                            <f:ListItem Value="Line" Text="折线图" Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Line" Text="折线图"></f:ListItem>
                                         </f:DropDownList>
 
                                         <%--<f:DropDownList ID="drpChartType" runat="server" LabelWidth="80px" Label="图形类型"
@@ -48,13 +59,13 @@
                         </f:Form>
                     </Items>
                 </f:Region>
-                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox"
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox" AutoScroll="true" 
                     BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
                     <Items>
                         <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="800px" ShowBorder="true"
                             TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
                             <Tabs>
-                                <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark"
+                                <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" AutoScroll="true"
                                     runat="server" TitleToolTip="按图形显示">
                                     <Items>
                                         <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0" CssStyle="margin-left:200px">
@@ -74,8 +85,8 @@
                                             OnNodeCommand="tvControlItem_NodeCommand"  CssStyle="width:200px; height:600px"
                                             runat="server">
                                         </f:Tree>--%>
-                                         <f:Tree ID="trRectify" Width="200px" EnableCollapse="true" ShowHeader="true"
-                                             CssStyle="width:200px; height:600px"
+                                         <f:Tree ID="trRectify" Width="200px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" 
+                                             CssStyle="width:200px;" 
                                             OnNodeCommand="trRectify_NodeCommand" AutoLeafIdentification="true" runat="server">
                                         </f:Tree>
                                         
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index c096b319..5ef02520 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -41,11 +41,29 @@ namespace FineUIPro.Web.Transfer.Chart
                     this.ProjectId = Request.Params["projectId"];
                 }
                
-                this.AnalyseData();
+                //this.AnalyseData();
             }
         }
         #endregion
 
+        protected void drpdateType_SelectedIndexChanged(object sender, EventArgs e) {
+            if (drpdateType.SelectedValue == "0")
+            {
+                txtStarTime.Hidden = false;
+                txtEndTime.Hidden = false;
+
+                txtStarTime1.Hidden = true;
+                txtEndTime1.Hidden = true;
+            }
+            else {
+                txtStarTime1.Hidden = false;
+                txtEndTime1.Hidden = false;
+
+                txtStarTime.Hidden = true;
+                txtEndTime.Hidden = true;
+            }
+        }
+
         #region 统计
         /// <summary>
         /// 统计方法
@@ -57,17 +75,42 @@ namespace FineUIPro.Web.Transfer.Chart
                 Alert.ShowInTop("项目未获取到，请刷新页面。", MessageBoxIcon.Warning);
                 return;
             }
-
             var sTime = DateTime.Now.AddDays(-7);
             var eTime = DateTime.Now; ;
 
-            //如果没有填写日期，则是七天内的
-            if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
-             {
-                 sTime = Convert.ToDateTime(txtStarTime.Text);
-                 eTime = Convert.ToDateTime(txtEndTime.Text);
+            if (drpdateType.SelectedValue == "0")
+            {
+                if (string.IsNullOrEmpty(txtStarTime.Text) || string.IsNullOrEmpty(txtEndTime.Text))
+                {
+                    Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                    return;
+                }
+                else {
+                    sTime = Convert.ToDateTime(txtStarTime.Text);
 
+                    eTime = Convert.ToDateTime(txtEndTime.Text).AddMonths(1).AddDays(-1);
+                }
             }
+            else {
+                if (string.IsNullOrEmpty(txtStarTime1.Text) || string.IsNullOrEmpty(txtEndTime1.Text))
+                {
+                    Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                    return;
+                }
+                else {
+                    sTime = Convert.ToDateTime(txtStarTime1.Text);
+                    eTime = Convert.ToDateTime(txtEndTime1.Text);
+                }
+            }
+
+           
+
+            ////如果没有填写日期，则是七天内的
+            //if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
+            // {
+                
+
+            //}
              
             //查询当前日期中的system的具体数目，去除重复
             var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
@@ -85,18 +128,36 @@ namespace FineUIPro.Web.Transfer.Chart
             dtTime.Columns.Add("Not Start", typeof(string));
 
             var systemBol = false;
-            for (var i = sTime; i <= eTime; i=i.AddDays(1))
+            for (var i = sTime; i <= eTime; i=returnDay(i))
             {
                 var finishedCount = 0;
                 var inProgress = 0;
                 var notStart = 0;
                 DataRow rowTime = dtTime.NewRow();
                 Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
+
+                //按年月
+                if (drpdateType.SelectedValue == "0")
+                {
+                    rowTime["日期"] = string.Format("{0:yyyy-MM}", i);
+                }
+                else {
+                    rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i);
+                }
+
+                
                 //根据日期查询当前system的数量
                 var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
                 && x.FDate >= Convert.ToDateTime(rowTime["日期"]) 
                 && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                //如果按年月
+                if (drpdateType.SelectedValue == "0")
+                {
+                    systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                    && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                                    && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)).ToList();
+                }
+
 
                 //查询TestPackage 去重
                 var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
@@ -124,10 +185,18 @@ namespace FineUIPro.Web.Transfer.Chart
                         //如果都是完成，需要最后 12表 test packge 必须是Finished才能是完成
                         var punchlistFromList= Funs.DB.Transfer_PunchlistFrom.Where(x=>x.ProjectId==ProjectId
                         && x.Test_Package==item
-                        && x.PUNCH_ITEM_FINISH_DATE>= Convert.ToDateTime(rowTime["日期"])
-                        && x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
-                        //如果查到
-                        if (punchlistFromList.Count > 0)
+                        ).ToList();
+
+                        ////如果按年月
+                        //if (drpdateType.SelectedValue == "0") {
+                        //    punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                        // && x.Test_Package == item
+                        // && x.PUNCH_ITEM_FINISH_DATE >= Convert.ToDateTime(rowTime["日期"])
+                        // && x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)).ToList();
+                        //}
+
+                      //如果查到
+                       if (punchlistFromList.Count > 0)
                         {
                             //12表当前日期完成的数量
                             var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
@@ -141,7 +210,7 @@ namespace FineUIPro.Web.Transfer.Chart
                             }
                         }
                         else {
-                            inProgress += 1;
+                            finishedCount += 1;
                         }
                     }
                     //如果总数量等于not start，未开始量+1
@@ -168,6 +237,20 @@ namespace FineUIPro.Web.Transfer.Chart
             
         }
 
+        public DateTime returnDay(DateTime x) {
+            //按年月
+            if (drpdateType.SelectedValue == "0")
+            {
+                x = x.AddMonths(1);
+                return x;
+            }
+            else
+            {
+                x = x.AddDays(1);
+                return x;
+            }
+        }
+
         public class CheckAnalysisModel
         {
             public string itemType { get; set; }
@@ -207,6 +290,7 @@ namespace FineUIPro.Web.Transfer.Chart
             };
             this.trRectify.Nodes.Add(rootNode);
             BoundTree(rootNode.Nodes, list);
+            this.trRectify.AutoScroll = true;
         }
 
         /// <summary>
@@ -245,13 +329,45 @@ namespace FineUIPro.Web.Transfer.Chart
                 var sTime = DateTime.Now.AddDays(-7);
                 var eTime = DateTime.Now; ;
 
-                //如果没有填写日期，则是七天内的
-                if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
+                if (drpdateType.SelectedValue == "0")
                 {
-                    sTime = Convert.ToDateTime(txtStarTime.Text);
-                    eTime = Convert.ToDateTime(txtEndTime.Text);
+                    if (string.IsNullOrEmpty(txtStarTime.Text) || string.IsNullOrEmpty(txtEndTime.Text))
+                    {
+                        Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                        return;
+                    }
+                    else
+                    {
+                        sTime = Convert.ToDateTime(txtStarTime.Text);
 
+                        eTime = Convert.ToDateTime(txtEndTime.Text).AddMonths(1).AddDays(-1);
+                    }
                 }
+                else
+                {
+                    if (string.IsNullOrEmpty(txtStarTime1.Text) || string.IsNullOrEmpty(txtEndTime1.Text))
+                    {
+                        Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                        return;
+                    }
+                    else
+                    {
+                        sTime = Convert.ToDateTime(txtStarTime1.Text);
+                        eTime = Convert.ToDateTime(txtEndTime1.Text);
+                    }
+                }
+                //var sTime = DateTime.Now.AddDays(-7);
+                //var eTime = DateTime.Now; ;
+
+                ////如果没有填写日期，则是七天内的
+                //if (!string.IsNullOrEmpty(txtStarTime.Text) && !string.IsNullOrEmpty(txtEndTime.Text))
+                //{
+                //    sTime = Convert.ToDateTime(txtStarTime.Text);
+                //    eTime = Convert.ToDateTime(txtEndTime.Text);
+
+                //}
+
+
                 DataTable dtTime = new DataTable();
                 dtTime.Columns.Add("日期", typeof(string));
                 dtTime.Columns.Add("Finished", typeof(string));
@@ -259,19 +375,38 @@ namespace FineUIPro.Web.Transfer.Chart
                 dtTime.Columns.Add("Not Start", typeof(string));
 
                 var systemBol = false;
-                for (var i = sTime; i <= eTime; i = i.AddDays(1))
+                for (var i = sTime; i <= eTime; i = returnDay(i))
                 {
                     var finishedCount = 0;
                     var inProgress = 0;
                     var notStart = 0;
                     DataRow rowTime = dtTime.NewRow();
                     Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
-                    rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i); ;
+
+                    //按年月
+                    if (drpdateType.SelectedValue == "0")
+                    {
+                        rowTime["日期"] = string.Format("{0:yyyy-MM}", i);
+                    }
+                    else
+                    {
+                        rowTime["日期"] = string.Format("{0:yyyy-MM-dd}", i);
+                    }
+
                     //根据日期查询当前system的数量
                     var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId && x.SystemName == SystemName
                     && x.FDate >= Convert.ToDateTime(rowTime["日期"])
                     && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
 
+                    //如果按年月
+                    if (drpdateType.SelectedValue == "0")
+                    {
+                        systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId && x.SystemName == SystemName
+                                        && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                                        && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)).ToList();
+                    }
+
+
                     //查询TestPackage 去重
                     var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
 
@@ -299,8 +434,10 @@ namespace FineUIPro.Web.Transfer.Chart
                             var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
                              && x.SystemName==SystemName
                              && x.Test_Package == item
-                             && x.PUNCH_ITEM_FINISH_DATE >= Convert.ToDateTime(rowTime["日期"])
-                             && x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                            ).ToList();
+
+                             //&& x.PUNCH_ITEM_FINISH_DATE >= Convert.ToDateTime(rowTime["日期"])
+                             //&& x.PUNCH_ITEM_FINISH_DATE < Convert.ToDateTime(rowTime["日期"]).AddDays(1)
                             //如果查到
                             if (punchlistFromList.Count > 0)
                             {
@@ -318,7 +455,7 @@ namespace FineUIPro.Web.Transfer.Chart
                             }
                             else
                             {
-                                inProgress += 1;
+                                finishedCount += 1;
                             }
                         }
                         //如果总数量等于not start，未开始量+1
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
index 2be7ed02..7669478c 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -59,6 +59,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.Form Form2;
 
+        /// <summary>
+        /// drpdateType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpdateType;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -77,6 +86,24 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
 
+        /// <summary>
+        /// txtStarTime1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime1;
+
+        /// <summary>
+        /// txtEndTime1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime1;
+
         /// <summary>
         /// drpChartType 控件。
         /// </summary>

From 79d027245565765a93acaf1ea8f5c88e7de86cf4 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 1 Feb 2024 16:50:35 +0800
Subject: [PATCH 23/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../Transfer/Chart/Instrumentation.aspx.cs    |   2 +-
 .../Transfer/Chart/PunchlistFrom.aspx.cs      |  20 +++-
 .../FineUIPro.Web/Transfer/PunchlistFrom.aspx |  41 ++++---
 .../Transfer/PunchlistFrom.aspx.cs            |  30 +++++
 .../Transfer/PunchlistFrom.aspx.designer.cs   | 105 ++++++++++++++----
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 SGGL/WebAPI/WebAPI.csproj.user                |   2 +-
 8 files changed, 158 insertions(+), 46 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index c4484e3e..f8ca7c7a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index c096b319..26f6af68 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -72,7 +72,7 @@ namespace FineUIPro.Web.Transfer.Chart
             //查询当前日期中的system的具体数目，去除重复
             var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
                && x.FDate >= sTime && x.FDate <= eTime).ToList();
-
+             
             var SystemList = (from x in list select x.SystemName).Distinct();
 
             //先加载左侧system 树菜单
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
index bd8431ca..4296ebdc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.cs
@@ -62,6 +62,9 @@ namespace FineUIPro.Web.Transfer.Chart
                     dtTime.Columns.Add("A数量", typeof(string));
                     dtTime.Columns.Add("B数量", typeof(string));
                     dtTime.Columns.Add("C数量", typeof(string));
+                    dtTime.Columns.Add("Finished", typeof(string));
+                    dtTime.Columns.Add("In Progress", typeof(string));
+                    dtTime.Columns.Add("Not Start", typeof(string));
                     foreach (var item in list)
                     {
                         DataRow rowTime = dtTime.NewRow();
@@ -72,9 +75,12 @@ namespace FineUIPro.Web.Transfer.Chart
                         rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
                         rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
                         rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
+                        rowTime["Finished"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Finished").Count();
+                        rowTime["In Progress"] = types.Where(x => x.PUNCH_ITEM_STATUS == "In Progress").Count();
+                        rowTime["Not Start"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Not Start").Count();
                         dtTime.Rows.Add(rowTime);
                     }
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
                 }
                 else   //饼形图
                 {
@@ -90,7 +96,7 @@ namespace FineUIPro.Web.Transfer.Chart
                         rowTime["总数量"] = types.Count();
                         dtTime.Rows.Add(rowTime);
                     }
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1130, 550, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
                 }
                 #endregion
             }
@@ -107,6 +113,9 @@ namespace FineUIPro.Web.Transfer.Chart
                     dtTime.Columns.Add("A数量", typeof(string));
                     dtTime.Columns.Add("B数量", typeof(string));
                     dtTime.Columns.Add("C数量", typeof(string));
+                    dtTime.Columns.Add("Finished", typeof(string));
+                    dtTime.Columns.Add("In Progress", typeof(string));
+                    dtTime.Columns.Add("Not Start", typeof(string));
                     foreach (var item in disciplines)
                     {
                         DataRow rowTime = dtTime.NewRow();
@@ -117,10 +126,13 @@ namespace FineUIPro.Web.Transfer.Chart
                         rowTime["A数量"] = types.Where(x => x.Category == "A").Count();
                         rowTime["B数量"] = types.Where(x => x.Category == "B").Count();
                         rowTime["C数量"] = types.Where(x => x.Category == "C").Count();
+                        rowTime["Finished"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Finished").Count();
+                        rowTime["In Progress"] = types.Where(x => x.PUNCH_ITEM_STATUS == "In Progress").Count();
+                        rowTime["Not Start"] = types.Where(x => x.PUNCH_ITEM_STATUS == "Not Start").Count();
                         dtTime.Rows.Add(rowTime);
                     }
 
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
                 }
                 else   //饼形图
                 {
@@ -138,7 +150,7 @@ namespace FineUIPro.Web.Transfer.Chart
                         dtTime.Rows.Add(rowTime);
                     }
 
-                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1100, 550, this.ckbShow.Checked));
+                    this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "尾项分析", this.drpChartType.SelectedValue, 1300, 550, this.ckbShow.Checked));
                 }
                 #endregion
             }
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
index 363c2786..43d86694 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
@@ -22,10 +22,11 @@
                         <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 
-                                <f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px"  LabelAlign="Right"></f:TextBox>
-
+                                <f:TextBox runat="server" ID="txtPunch_No" Label="Punch_No" LabelWidth="80px"  LabelAlign="Right" Width="150px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSYSTEM" Label="SYSTEM" LabelWidth="80px"  LabelAlign="Right" Width="150px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtSUBSYSTEM" Label="SUBSYSTEM" LabelWidth="100px"  LabelAlign="Right" Width="170px"></f:TextBox>
                                 <f:DatePicker runat="server" Label="PUNCH_ITEM_FINISH_DATE" ID="txtStarTime" LabelAlign="Right" LabelWidth="200px"
-                                     Width="280px">
+                                     Width="320px">
                                 </f:DatePicker>
                                 <f:Label ID="Label1" runat="server" Text="至">
                                 </f:Label>
@@ -43,6 +44,14 @@
                                 </f:Button>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox runat="server" ID="txtTestPackage" Label="Test Package" LabelWidth="105px"  LabelAlign="Right" Width="300px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtDiscipline" Label="Discipline" LabelWidth="80px"  LabelAlign="Right" Width="150px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtIdentified" Label="Identified during/by" LabelWidth="150px"  LabelAlign="Right" Width="300px"></f:TextBox>
+                                <f:TextBox runat="server" ID="txtCategory" Label="Select Punch List Category" LabelWidth="220px"  LabelAlign="Right" Width="300px"></f:TextBox>
+                            </Items>
+                        </f:Toolbar>
                     </Toolbars>
                     <Columns>
                       
@@ -50,33 +59,33 @@
                             <Columns>
                                 <f:BoundField Width="80px"  TextAlign="Center"  ColumnID="Item_No" DataField="Item_No" HeaderText="Item No." />
 
-                                <f:BoundField Width="100px"  TextAlign="Center"  ColumnID="Punch_No" DataField="Punch_No" HeaderText="Punch No" />
+                                <f:BoundField Width="90px"  TextAlign="Center"  ColumnID="Punch_No" DataField="Punch_No" HeaderText="Punch No" />
 
-                                <f:BoundField Width="120px"  TextAlign="Center"  ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" />
+                                <f:BoundField Width="80px"  TextAlign="Center"  ColumnID="SystemName" DataField="SystemName" HeaderText="SYSTEM" />
 
-                                <f:BoundField Width="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="SUBSYSTEM" TextAlign="Center"/>
+                                <f:BoundField Width="108px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="SUBSYSTEM" TextAlign="Center"/>
 
-                                 <f:BoundField Width="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
+                                 <f:BoundField Width="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
 
-                                 <f:BoundField Width="150px" ColumnID="Discipline" DataField="Discipline" HeaderText="Discipline" TextAlign="Center"/>
+                                 <f:BoundField Width="85px" ColumnID="Discipline" DataField="Discipline" HeaderText="Discipline" TextAlign="Center"/>
 
                                 <f:BoundField Width="250px" ColumnID="DESCRIPTION" DataField="DESCRIPTION" HeaderText="PUNCH LIST ITEM DESCRIPTION" TextAlign="Center"/>
                             
-                                <f:BoundField Width="180px" ColumnID="Identified" DataField="Identified" HeaderText="Identified during/by" TextAlign="Center"/>
+                                <f:BoundField Width="145px" ColumnID="Identified" DataField="Identified" HeaderText="Identified during/by" TextAlign="Center"/>
 
-                                <f:BoundField Width="250px" ColumnID="Category" DataField="Category" HeaderText="Select Punch List Category" TextAlign="Center"/>
+                                <f:BoundField Width="110px" ColumnID="Category" DataField="Category" HeaderText="Select Punch<br/>List Category" TextAlign="Center"/>
 
-                                 <f:RenderField Width="200px" ColumnID="PUNCH_ITEM_FINISH_DATE" DataField="PUNCH_ITEM_FINISH_DATE"
-                                     HeaderText="PUNCH ITEM FINISH DATE"  TextAlign="Center"
+                                 <f:RenderField Width="110px" ColumnID="PUNCH_ITEM_FINISH_DATE" DataField="PUNCH_ITEM_FINISH_DATE"
+                                     HeaderText="PUNCH ITEM<br/>FINISH DATE"  TextAlign="Center"
                                     FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"/>
 
-                                  <f:BoundField Width="150px" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" TextAlign="Center"/>
+                                  <f:BoundField Width="100px" ColumnID="Action_By" DataField="Action_By" HeaderText="Action By" TextAlign="Center"/>
 
-                                <f:BoundField Width="150px" ColumnID="Required_By" DataField="Required_By" HeaderText="Required By" TextAlign="Center"/>
+                                <f:BoundField Width="100px" ColumnID="Required_By" DataField="Required_By" HeaderText="Required By" TextAlign="Center"/>
 
-                                <f:BoundField Width="250px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM STATUS" TextAlign="Center"/>
+                                <f:BoundField Width="110px" ColumnID="PUNCH_ITEM_STATUS" DataField="PUNCH_ITEM_STATUS" HeaderText="PUNCH ITEM<br/>STATUS" TextAlign="Center"/>
                                 
-                                 <f:BoundField Width="250px" ColumnID="Comments" DataField="Comments" HeaderText="Comments" TextAlign="Center"/>
+                                 <f:BoundField Width="150px" ColumnID="Comments" DataField="Comments" HeaderText="Comments" TextAlign="Center"/>
                             </Columns>
                         </f:GroupField>
                        
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
index 81f69bd4..111e8a0c 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
@@ -40,6 +40,16 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Punch_No like @Punch_No";
                 listStr.Add(new SqlParameter("@Punch_No", "%" + this.txtPunch_No.Text.Trim() + "%"));
             }
+            if (!string.IsNullOrEmpty(this.txtSYSTEM.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSYSTEM.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtSUBSYSTEM.Text.Trim()))
+            {
+                strSql += " AND Subsystem like @Subsystem";
+                listStr.Add(new SqlParameter("@Subsystem", "%" + this.txtSUBSYSTEM.Text.Trim() + "%"));
+            }
             if (!string.IsNullOrEmpty(txtStarTime.Text.Trim()))
             {
                 strSql += " AND PUNCH_ITEM_FINISH_DATE >= @InspectionDateA";
@@ -50,6 +60,26 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND PUNCH_ITEM_FINISH_DATE <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtTestPackage.Text.Trim()))
+            {
+                strSql += " AND Test_Package like @Test_Package";
+                listStr.Add(new SqlParameter("@Test_Package", "%" + this.txtTestPackage.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtDiscipline.Text.Trim()))
+            {
+                strSql += " AND Discipline like @Discipline";
+                listStr.Add(new SqlParameter("@Discipline", "%" + this.txtDiscipline.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtIdentified.Text.Trim()))
+            {
+                strSql += " AND Identified like @Identified";
+                listStr.Add(new SqlParameter("@Identified", "%" + this.txtIdentified.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtCategory.Text.Trim()))
+            {
+                strSql += " AND Category like @Category";
+                listStr.Add(new SqlParameter("@Category", "%" + this.txtCategory.Text.Trim() + "%"));
+            }
             strSql += " order by Punch_No ";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
index ac2dc2ef..80f55cb7 100644
--- a/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs
@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Transfer
-{
-
-
-    public partial class PunchlistFrom
-    {
-
+namespace FineUIPro.Web.Transfer {
+    
+    
+    public partial class PunchlistFrom {
+        
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-
+        
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-
+        
         /// <summary>
         /// txtPunch_No 控件。
         /// </summary>
@@ -67,7 +65,25 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPunch_No;
-
+        
+        /// <summary>
+        /// txtSYSTEM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSYSTEM;
+        
+        /// <summary>
+        /// txtSUBSYSTEM 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSUBSYSTEM;
+        
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -76,7 +92,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-
+        
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -85,7 +101,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-
+        
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -94,7 +110,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-
+        
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -103,7 +119,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-
+        
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -112,7 +128,52 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-
+        
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtTest Package 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTestPackage;
+        
+        /// <summary>
+        /// txtDiscipline 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDiscipline;
+        
+        /// <summary>
+        /// txtIdentified 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtIdentified;
+        
+        /// <summary>
+        /// txtCategory 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtCategory;
+        
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -121,7 +182,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-
+        
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -130,7 +191,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-
+        
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -139,7 +200,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-
+        
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -148,7 +209,7 @@ namespace FineUIPro.Web.Transfer
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-
+        
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 8206b76c..b8efca33 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.6.1"/>
+    <compilation debug="false" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 6bc24ada..4edb5e0f 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 1d8bb0be876af4c592323c665fec182835d4cf6d Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Fri, 2 Feb 2024 09:35:41 +0800
Subject: [PATCH 24/31] =?UTF-8?q?=E4=B8=BA=E7=A7=BB=E4=BA=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_2024-02-02-phf.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-02-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-02-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-02-phf.sql
new file mode 100644
index 00000000..d2dbe410
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-02-phf.sql
@@ -0,0 +1,10 @@
+alter table Transfer_Piping add CompleteTime datetime null;
+alter table Transfer_StaticEquipment add CompleteTime datetime null;
+alter table Transfer_RotatingEquipment add CompleteTime datetime null;
+alter table Transfer_Instrumentation add CompleteTime datetime null;
+alter table Transfer_Electrical add CompleteTime datetime null;
+alter table Transfer_Civil_Structure add CompleteTime datetime null;
+alter table Transfer_Firefighting add CompleteTime datetime null;
+alter table Transfer_Telecom add CompleteTime datetime null;
+alter table Transfer_Plumbing add CompleteTime datetime null;
+alter table Transfer_HVAC add CompleteTime datetime null;
\ No newline at end of file

From 8fc9080a18ee352c0262fdefc27ee875c6d70793 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 2 Feb 2024 09:41:18 +0800
Subject: [PATCH 25/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/Model/Model.cs | 242 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 241 insertions(+), 1 deletion(-)

diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 29f8b692..d3e90202 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -368487,6 +368487,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -368509,6 +368511,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Civil_Structure()
@@ -368696,6 +368700,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -368741,6 +368765,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -368763,6 +368789,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Electrical()
@@ -368950,6 +368978,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -368995,6 +369043,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -369017,6 +369067,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Firefighting()
@@ -369204,6 +369256,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -369249,6 +369321,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -369271,6 +369345,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_HVAC()
@@ -369458,6 +369534,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -369503,6 +369599,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -369525,6 +369623,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Instrumentation()
@@ -369712,6 +369812,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -369761,6 +369881,8 @@ namespace Model
 		
 		private string _FinalTestFINISHED;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -369787,6 +369909,8 @@ namespace Model
     partial void OnPreTestFINISHEDChanged();
     partial void OnFinalTestFINISHEDChanging(string value);
     partial void OnFinalTestFINISHEDChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Piping()
@@ -370014,6 +370138,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -370059,6 +370203,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -370081,6 +370227,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Plumbing()
@@ -370268,6 +370416,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -370928,7 +371096,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DESCRIPTION", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DESCRIPTION", DbType="NVarChar(500)")]
 		public string DESCRIPTION
 		{
 			get
@@ -371133,6 +371301,8 @@ namespace Model
 		
 		private string _MechanicalFINALStatus;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -371155,6 +371325,8 @@ namespace Model
     partial void OnTestPackageFINISHChanged();
     partial void OnMechanicalFINALStatusChanging(string value);
     partial void OnMechanicalFINALStatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_RotatingEquipment()
@@ -371342,6 +371514,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -371387,6 +371579,8 @@ namespace Model
 		
 		private string _MechanicalFINALStatus;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -371409,6 +371603,8 @@ namespace Model
     partial void OnTestPackageFINISHChanged();
     partial void OnMechanicalFINALStatusChanging(string value);
     partial void OnMechanicalFINALStatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_StaticEquipment()
@@ -371596,6 +371792,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -371641,6 +371857,8 @@ namespace Model
 		
 		private string _FINAL_Status;
 		
+		private System.Nullable<System.DateTime> _CompleteTime;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -371663,6 +371881,8 @@ namespace Model
     partial void OnTest_Package_FINISHChanged();
     partial void OnFINAL_StatusChanging(string value);
     partial void OnFINAL_StatusChanged();
+    partial void OnCompleteTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCompleteTimeChanged();
     #endregion
 		
 		public Transfer_Telecom()
@@ -371850,6 +372070,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompleteTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CompleteTime
+		{
+			get
+			{
+				return this._CompleteTime;
+			}
+			set
+			{
+				if ((this._CompleteTime != value))
+				{
+					this.OnCompleteTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CompleteTime = value;
+					this.SendPropertyChanged("CompleteTime");
+					this.OnCompleteTimeChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

From e384e322be445c40ee90c8cd3a2f0f5938472a7f Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Fri, 2 Feb 2024 10:48:40 +0800
Subject: [PATCH 26/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E9=80=92=E5=A2=9E?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../版本日志/SGGLDB_WH_2024-02-02-01-phf.sql  |  86 ++++++++++
 .../1-14移交管理图表（Menu_Transfer）.sql     |   4 +
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   8 +
 .../Transfer/Chart/TransferChart.aspx         |  96 +++++++++++
 .../Transfer/Chart/TransferChart.aspx.cs      | 155 ++++++++++++++++++
 .../Chart/TransferChart.aspx.designer.cs      | 134 +++++++++++++++
 .../Transfer/CivilStructureDataIn.aspx.cs     |   8 +
 .../Transfer/ElectricalDataIn.aspx.cs         |   9 +
 .../Transfer/FirefightingDataIn.aspx.cs       |   8 +
 .../FineUIPro.Web/Transfer/HVACDataIn.aspx.cs |   9 +
 .../Transfer/InstrumentationDataIn.aspx.cs    |   9 +
 .../Transfer/PipingDataIn.aspx.cs             |   9 +
 .../Transfer/PlumbingDataIn.aspx.cs           |   8 +
 .../Transfer/RotatingEquipmentDataIn.aspx.cs  |  10 ++
 .../Transfer/StaticEquipmentDataIn.aspx.cs    |   9 +
 .../Transfer/TelecomDataIn.aspx.cs            |   8 +
 SGGL/FineUIPro.Web/Web.config                 |   4 +-
 17 files changed, 572 insertions(+), 2 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
 create mode 100644 SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
new file mode 100644
index 00000000..5ab3c142
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-02-01-phf.sql
@@ -0,0 +1,86 @@
+Alter VIEW [dbo].[View_TransferDetail]  AS 
+/*�ƽ������б���ͼ*/
+
+select Projectid,SystemName,Subsystem,TestPackage,sDate,fDate,Status,aDate from (
+
+SELECT Projectid, SYSTEM as SystemName, Subsystem ,TestPackage,
+TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status,
+CompleteTime as aDate
+FROM Transfer_Piping
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status ,
+CompleteTime as aDate
+FROM Transfer_StaticEquipment
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status,
+CompleteTime as aDate 
+FROM Transfer_RotatingEquipment
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Instrumentation
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Electrical
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Civil_Structure
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Firefighting
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Telecom
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_Plumbing
+
+UNION ALL
+
+SELECT Projectid,SystemName, Subsystem ,Test_Package as TestPackage, Test_Package_START as sDate,
+Test_Package_FINISH as fDate,
+FINAL_Status as Status,
+CompleteTime as aDate 
+FROM Transfer_HVAC
+
+)f
+
+
+GO
\ No newline at end of file
diff --git a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
index fe41f3c9..7f28b592 100644
--- a/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
+++ b/DataBase/菜单初始化脚本/1-14移交管理图表（Menu_Transfer）.sql
@@ -12,5 +12,9 @@ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffi
 VALUES('C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0','Punchlist from',
 'Transfer/Chart/PunchlistFrom.aspx',20,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
 
+INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('F97BCF55-E450-4007-AD84-AB64B3496204','ȫ���ƽ�ͳ�Ƶ�����',
+'Transfer/Chart/TransferChart.aspx',15,'3517DBE2-9728-4BA0-9EA5-AE2147DB883B','Menu_Transfer',0,1,1)
+
 
 
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 45852f7d..e18797de 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1833,6 +1833,7 @@
     <Content Include="TestRun\TestRunManage\TestRunRecordUploadList.aspx" />
     <Content Include="Transfer\Chart\Instrumentation.aspx" />
     <Content Include="Transfer\Chart\PunchlistFrom.aspx" />
+    <Content Include="Transfer\Chart\TransferChart.aspx" />
     <Content Include="Transfer\CivilStructure.aspx" />
     <Content Include="Transfer\CivilStructureDataIn.aspx" />
     <Content Include="Transfer\Electrical.aspx" />
@@ -16378,6 +16379,13 @@
     <Compile Include="Transfer\Chart\PunchlistFrom.aspx.designer.cs">
       <DependentUpon>PunchlistFrom.aspx</DependentUpon>
     </Compile>
+    <Compile Include="Transfer\Chart\TransferChart.aspx.cs">
+      <DependentUpon>TransferChart.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="Transfer\Chart\TransferChart.aspx.designer.cs">
+      <DependentUpon>TransferChart.aspx</DependentUpon>
+    </Compile>
     <Compile Include="Transfer\CivilStructure.aspx.cs">
       <DependentUpon>CivilStructure.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
new file mode 100644
index 00000000..8b66772e
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
@@ -0,0 +1,96 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TransferChart.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.TransferChart" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>全厂移交统计递增表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAnalyse,divCheck" />
+
+        <f:RegionPanel ID="RegionPanel1" ShowBorder="false" runat="server" Margin="5px">
+            <Regions>
+                   
+                <f:Region ID="Region1" ShowBorder="false" ShowHeader="false" RegionPosition="Top"
+                    BodyPadding="0 5 0 0" Width="200px" Layout="Fit" runat="server" EnableCollapse="true">
+                    <Items>
+                        <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
+                            <Rows>
+                                <f:FormRow>
+                                    <Items>
+                                        <f:DropDownList ID="drpType" runat="server" Label="分类" AutoPostBack="true"
+                                             Width="100px" LabelWidth="80px">
+                                            <f:ListItem Value="" Text="全部"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Piping" Text="Piping"></f:ListItem>
+                                            <f:ListItem Value="Static Equipment" Text="Static Equipment"></f:ListItem>
+                                            <f:ListItem Value="Rotating Equipment" Text="Rotating Equipment"></f:ListItem>
+                                            <f:ListItem Value="Instrumentation" Text="Instrumentation"></f:ListItem>
+                                            <f:ListItem Value="Electrical" Text="Electrical"></f:ListItem>
+                                            <f:ListItem Value="Civil Structure" Text="Civil Structure"></f:ListItem>
+                                            <f:ListItem Value="Firefighting" Text="Firefighting"></f:ListItem>
+                                            <f:ListItem Value="Telecom" Text="Telecom"></f:ListItem>
+                                            <f:ListItem Value="Plumbing" Text="Plumbing"></f:ListItem>
+                                            <f:ListItem Value="HVAC" Text="HVAC"></f:ListItem>
+
+                                        </f:DropDownList>
+
+                                        <%--<f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
+                                            <f:ListItem Value="0" Text="按年月"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="1" Text="按日期"></f:ListItem>
+                                        </f:DropDownList>--%>
+
+                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+
+                                       <%-- <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
+
+                                        <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>--%>
+
+                                       <%-- <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                            OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
+                                            <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
+                                            <f:ListItem Value="Line" Text="折线图"></f:ListItem>
+                                        </f:DropDownList>--%>
+
+
+                                        <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
+
+
+                                    </Items>
+                                </f:FormRow>
+                            </Rows>
+                        </f:Form>
+                    </Items>
+                </f:Region>
+                <f:Region ID="Region2" ShowBorder="false" ShowHeader="false" Position="Center" Layout="VBox" AutoScroll="true" 
+                    BoxConfigAlign="Stretch" BoxConfigPosition="Left" runat="server">
+                    <Items>
+                        <f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="800px" ShowBorder="true"
+                            TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
+                            <Tabs>
+                                <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" AutoScroll="true"
+                                    runat="server" TitleToolTip="按图形显示">
+                                    <Items>
+                                        <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0" CssStyle="margin-left:200px">
+                                            <div id="divAnalyse">
+                                                <uc1:ChartControl ID="ChartUc" runat="server" />
+                                            </div>
+                                        </f:ContentPanel>
+                                    </Items>
+
+                                    
+                                </f:Tab>
+                            </Tabs>
+                        </f:TabStrip>
+                    </Items>
+                </f:Region>
+            </Regions>
+        </f:RegionPanel>
+    </form>
+</body>
+</html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
new file mode 100644
index 00000000..99add796
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Linq;
+using BLL;
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+    public partial class TransferChart : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载页面
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.ProjectId = this.CurrUser.LoginProjectId;
+                if (!string.IsNullOrEmpty(Request.Params["projectId"]))
+                {
+                    this.ProjectId = Request.Params["projectId"];
+                }
+
+                //this.AnalyseData();
+            }
+        }
+        #endregion
+
+        /// <summary>
+        /// 统计分析
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void BtnAnalyse_Click(object sender, EventArgs e)
+        {
+            this.AnalyseData();
+        }
+
+        #region 统计
+        private void AnalyseData() {
+            if (string.IsNullOrEmpty(ProjectId))
+            {
+                Alert.ShowInTop("项目未获取到，请刷新页面。", MessageBoxIcon.Warning);
+                return;
+            }
+            var sTime = DateTime.Now.AddDays(-7);
+            var eTime = DateTime.Now;
+            if (string.IsNullOrEmpty(txtStarTime.Text) || string.IsNullOrEmpty(txtEndTime.Text))
+            {
+                Alert.ShowInTop("请选择日期。", MessageBoxIcon.Warning);
+                return;
+            }
+            else
+            {
+                sTime = Convert.ToDateTime(txtStarTime.Text);
+
+                eTime = Convert.ToDateTime(txtEndTime.Text).AddMonths(1).AddDays(-1);
+            }
+            var AfinishedCountSum = 0;//总的实际完成数量
+            var PfinishedCountSum = 0;//总的计划完成数量
+            switch (drpType.SelectedValue)
+            {
+                #region 全部
+                case "":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                 && x.FDate >= sTime
+                                 && x.FDate < eTime
+                                 && x.Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList) {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    
+                    break;
+                    #endregion
+
+            }
+
+
+            DataTable dtTime = new DataTable();
+            dtTime.Columns.Add("日期", typeof(string));
+            dtTime.Columns.Add("Actual Finished", typeof(string));
+            dtTime.Columns.Add("Plan Finished", typeof(string));
+
+            for (var i = sTime; i <= eTime; i = i.AddMonths(1)) {
+                var AfinishedCount = 0;//实际完成数量
+                var PfinishedCount = 0;//计划完成数量
+                DataRow rowTime = dtTime.NewRow();
+                rowTime["日期"] = string.Format("{0:yyyy-MM}", i);
+                switch (drpType.SelectedValue)
+                {
+                    #region 全部
+                    case "":
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                     && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                                     && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.Status.ToLower()== "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList) { 
+                            
+                        }
+                     break;
+                    #endregion
+
+                }
+
+            }
+        }
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
new file mode 100644
index 00000000..dcc82d4a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
@@ -0,0 +1,134 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.Transfer.Chart
+{
+
+
+    public partial class TransferChart
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// RegionPanel1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.RegionPanel RegionPanel1;
+
+        /// <summary>
+        /// Region1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region1;
+
+        /// <summary>
+        /// Form2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form Form2;
+
+        /// <summary>
+        /// drpType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpType;
+
+        /// <summary>
+        /// txtStarTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtStarTime;
+
+        /// <summary>
+        /// txtEndTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DatePicker txtEndTime;
+
+        /// <summary>
+        /// BtnAnalyse 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button BtnAnalyse;
+
+        /// <summary>
+        /// Region2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Region Region2;
+
+        /// <summary>
+        /// TabStrip1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TabStrip TabStrip1;
+
+        /// <summary>
+        /// Tab2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tab Tab2;
+
+        /// <summary>
+        /// cpCostTime 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ContentPanel cpCostTime;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
index bdb57aa1..27aa40b4 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
                             list.Add(model);
                         }
                         else
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
index 9fd99938..210b4df8 100644
--- a/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
@@ -349,6 +349,11 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
+
                             list.Add(model);
                         }
                         else
@@ -364,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
index aeb83cbf..537d4feb 100644
--- a/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
@@ -349,6 +349,10 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
                             list.Add(model);
                         }
                         else
@@ -364,6 +368,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
index 09b7148a..9f190958 100644
--- a/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/HVACDataIn.aspx.cs
@@ -349,6 +349,11 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
+
                             list.Add(model);
                         }
                         else
@@ -364,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
index af824d08..04a129a9 100644
--- a/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
@@ -350,6 +350,11 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
+
                             list.Add(model);
                         }
                         else
@@ -365,6 +370,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
 
diff --git a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
index 6288b651..e6b99b72 100644
--- a/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
@@ -344,6 +344,11 @@ namespace FineUIPro.Web.Transfer
                             model.TestPackageFINISH = t2;
 
                         model.FINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (model.FINALStatus.ToLower()== "finished")
+                        {
+                            model.CompleteTime = DateTime.Now;
+                        }
+
                         model.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
                         model.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
                         list.Add(model);
@@ -361,6 +366,10 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         modelOnly.FINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (modelOnly.FINALStatus.ToLower() == "finished")
+                        {
+                            modelOnly.CompleteTime = DateTime.Now;
+                        }
                         modelOnly.PreTestFINISHED = pds.Rows[i][7].ToString().Trim();
                         modelOnly.FinalTestFINISHED = pds.Rows[i][8].ToString().Trim();
                         Funs.DB.SubmitChanges();
diff --git a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
index 3974b8f4..eac8c964 100644
--- a/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
                             list.Add(model);
                         }
                         else
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
index bdc66334..46d84158 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
@@ -344,6 +344,10 @@ namespace FineUIPro.Web.Transfer
                             model.TestPackageFINISH = t2;
 
                         model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (model.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            model.CompleteTime = DateTime.Now;
+                        }
                         list.Add(model);
                     }
                     else
@@ -359,6 +363,12 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+
+                        if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            modelOnly.CompleteTime = DateTime.Now;
+                        }
+
                         Funs.DB.SubmitChanges();
                     }
                 }
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
index f6476672..2746a5c5 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
@@ -344,6 +344,11 @@ namespace FineUIPro.Web.Transfer
                             model.TestPackageFINISH = t2;
 
                         model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (model.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            model.CompleteTime = DateTime.Now;
+                        }
+
                         list.Add(model);
                     }
                     else
@@ -359,6 +364,10 @@ namespace FineUIPro.Web.Transfer
                         if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                             modelOnly.TestPackageFINISH = t2;
                         modelOnly.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
+                        if (modelOnly.MechanicalFINALStatus.ToLower() == "finished")
+                        {
+                            modelOnly.CompleteTime = DateTime.Now;
+                        }
                         Funs.DB.SubmitChanges();
                     }
                 }
diff --git a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
index 2475a6b4..a67ffc19 100644
--- a/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
@@ -350,6 +350,10 @@ namespace FineUIPro.Web.Transfer
                                 model.Test_Package_FINISH = t2;
 
                             model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (model.FINAL_Status.ToLower() == "finished")
+                            {
+                                model.CompleteTime = DateTime.Now;
+                            }
                             list.Add(model);
                         }
                         else
@@ -365,6 +369,10 @@ namespace FineUIPro.Web.Transfer
                             if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
                                 modelOnly.Test_Package_FINISH = t2;
                             modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            if (modelOnly.FINAL_Status.ToLower() == "finished")
+                            {
+                                modelOnly.CompleteTime = DateTime.Now;
+                            }
                             Funs.DB.SubmitChanges();
                         }
                     }
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index b8efca33..6f9fe9f9 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -11,8 +11,8 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
+    <add key="ConnectionString" value="Server=DESKTOP-1QITK9E\MSSQLSERVER2;Database=SGGLDB;Integrated Security=False;User ID=sa;Password=123;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>

From 5074d801673cc2ced137ffec663dee2168134ed5 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Fri, 2 Feb 2024 10:52:45 +0800
Subject: [PATCH 27/31] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/Model/Model.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index d3e90202..a9281128 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -414982,6 +414982,8 @@ namespace Model
 		
 		private string _Status;
 		
+		private System.Nullable<System.DateTime> _ADate;
+		
 		public View_TransferDetail()
 		{
 		}
@@ -415097,6 +415099,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="aDate", Storage="_ADate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> ADate
+		{
+			get
+			{
+				return this._ADate;
+			}
+			set
+			{
+				if ((this._ADate != value))
+				{
+					this._ADate = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_WBS")]

From 68c7b95405e3231f471464c15b86fdefe8840e59 Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Fri, 2 Feb 2024 16:23:51 +0800
Subject: [PATCH 28/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E9=80=92=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/Common/ChartControlService.cs        |   44 +
 .../Controls/ChartControl.ascx.cs             |  142 ++
 SGGL/FineUIPro.Web/ErrLog.txt                 |   40 +
 .../Transfer/Chart/TransferChart.aspx         |    6 +-
 .../Transfer/Chart/TransferChart.aspx.cs      | 1654 ++++++++++++++++-
 .../Chart/TransferChart.aspx.designer.cs      |    9 +
 SGGL/FineUIPro.Web/common/Menu_HSSE.xml       |    4 +-
 SGGL/FineUIPro.Web/common/Menu_SysSet.xml     |    1 -
 SGGL/FineUIPro.Web/common/Menu_TestRun.xml    |    4 +-
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   |    1 +
 10 files changed, 1887 insertions(+), 18 deletions(-)

diff --git a/SGGL/BLL/Common/ChartControlService.cs b/SGGL/BLL/Common/ChartControlService.cs
index 32096b9d..e022e9fc 100644
--- a/SGGL/BLL/Common/ChartControlService.cs
+++ b/SGGL/BLL/Common/ChartControlService.cs
@@ -109,5 +109,49 @@
             return chart;
         }
         #endregion
+
+        /// <summary>
+        /// 给chart类赋值
+        /// </summary>
+        /// <param name="dt">数据源表值</param>
+        /// <param name="title">图标题</param>
+        /// <param name="type">图类型</param>
+        /// <param name="width">图显示宽度</param>
+        /// <param name="height">图显示高度</param>
+        /// <param name="isNotEnable3D">是否显示3D效果</param>
+        /// <returns>返回图</returns>
+        public static Model.DataSourceChart GetDataSourceChartByYijiao(DataTable dt, string title, string type, int width, int height, bool isNotEnable3D)
+        {
+            Model.DataSourceChart dataSourceChart = new Model.DataSourceChart
+            {
+                Width = width,
+                Height = height,
+                Title = title,
+                IsNotEnable3D = isNotEnable3D,
+                ChartType = GetChartType(type)
+            };
+            List<Model.DataSourceTeam> dataSourceTeams = new List<Model.DataSourceTeam>();
+            for (int i = 1; i < dt.Columns.Count; i++)
+            {
+                Model.DataSourceTeam dataSourceTeam = new Model.DataSourceTeam
+                {
+                    DataPointName = dt.Columns[i].ToString()
+                };
+                List<Model.DataSourcePoint> dataSourcePoints = new List<Model.DataSourcePoint>();
+                for (int j = 0; j < dt.Rows.Count; j++)
+                {
+                    Model.DataSourcePoint dataSourcePoint = new Model.DataSourcePoint
+                    {
+                        PointText = dt.Rows[j][0].ToString(),
+                        PointValue = dt.Rows[j][i].ToString()
+                    };
+                    dataSourcePoints.Add(dataSourcePoint);
+                }
+                dataSourceTeam.DataSourcePoints = dataSourcePoints;
+                dataSourceTeams.Add(dataSourceTeam);
+            }
+            dataSourceChart.DataSourceTeams = dataSourceTeams;
+            return dataSourceChart;
+        }
     }
 }
diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
index cb6c6d73..e0fc300b 100644
--- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
+++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
@@ -282,5 +282,147 @@ namespace Web.Controls
 
             Controls.Add(chart1);
         }
+
+        /// <summary>
+        /// 创建Chart图形百分比
+        /// </summary>
+        /// <param name="dataSourceChart">Chart类</param>
+        public void CreateChartBaifenbi(Model.DataSourceChart dataSourceChart)
+        {
+            Chart chart1 = new Chart
+            {
+                ID = "chart1",
+                BackColor = Color.WhiteSmoke,
+                ImageLocation = "~/Images/ChartPic_#SEQ(300,3)",
+                BorderlineDashStyle = ChartDashStyle.Solid,
+                Palette = ChartColorPalette.BrightPastel,
+                BackSecondaryColor = Color.White,
+                BackGradientStyle = GradientStyle.TopBottom,
+                BorderWidth = 2,
+                BorderColor = Color.FromArgb(26, 59, 105),
+                ImageType = ChartImageType.Png,
+
+                Width = dataSourceChart.Width,
+                Height = dataSourceChart.Height
+            };
+
+            Title title = new Title
+            {
+                Text = dataSourceChart.Title,
+                ShadowColor = Color.FromArgb(32, 0, 0, 0),
+                Font = new Font("Trebuchet MS", 10F, FontStyle.Bold),
+                ShadowOffset = 3,
+                ForeColor = Color.FromArgb(26, 59, 105)
+            };
+            chart1.Titles.Add(title);
+
+            Legend legend = new Legend
+            {
+                Name = dataSourceChart.Title,
+                TextWrapThreshold = 1,
+                Docking = Docking.Top,
+                Alignment = StringAlignment.Center,
+                BackColor = Color.Transparent,
+                Font = new Font(new FontFamily("Trebuchet MS"), 8),
+                LegendStyle = LegendStyle.Row,
+                IsEquallySpacedItems = true,
+                IsTextAutoFit = false
+            };
+            chart1.Legends.Add(legend);
+
+            ChartArea chartArea = new ChartArea
+            {
+                Name = dataSourceChart.Title,
+                BackColor = Color.Transparent
+            };
+            chartArea.AxisX.IsLabelAutoFit = false;
+            chartArea.AxisY.IsLabelAutoFit = false;
+            chartArea.AxisX.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
+            chartArea.AxisY.LabelStyle.Font = new Font("Verdana,Arial,Helvetica,sans-serif", 8F, FontStyle.Regular);
+            chartArea.AxisY.LineColor = Color.FromArgb(64, 64, 64, 64);
+            chartArea.AxisX.LineColor = Color.FromArgb(64, 64, 64, 64);
+            chartArea.AxisY.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
+            chartArea.AxisX.MajorGrid.LineColor = Color.FromArgb(64, 64, 64, 64);
+            chartArea.AxisX.Interval = 1;
+            chartArea.Area3DStyle.Enable3D = dataSourceChart.IsNotEnable3D;
+
+            chartArea.AxisY.LabelStyle.Format = " 0% "; // 格式化，为了显示百分号
+           
+
+            chart1.ChartAreas.Add(chartArea);
+
+            if (dataSourceChart.ChartType == SeriesChartType.Pie)
+            {
+                foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
+                {
+                    this.lblTotal.Text = "累计值为：";
+                    if (dataSourceTeam.DataPointName == "累计")
+                    {
+                        foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+                        {
+                            this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
+                        }
+                        if (this.lblTotal.Text != "累计值为：")
+                        {
+                            this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
+                        }
+                    }
+                    else
+                    {
+                        this.lblTotal.Visible = false;
+                        chart1.Series.Add(dataSourceTeam.DataPointName);
+                        chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
+                        chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
+                        chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
+                        chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
+                        chart1.Series[dataSourceTeam.DataPointName].Label = "#PERCENT{P1}";
+                        chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
+                        int m = 0;
+                        foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+                        {
+                            chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);
+                            chart1.Series[dataSourceTeam.DataPointName].Points[m].LegendText = dataSourcePoint.PointText + "#PERCENT{P1}";
+                            m++;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                foreach (Model.DataSourceTeam dataSourceTeam in dataSourceChart.DataSourceTeams)
+                {
+                    this.lblTotal.Text = "累计值为：";
+                    if (dataSourceTeam.DataPointName == "累计")
+                    {
+                        foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+                        {
+                            this.lblTotal.Text += (dataSourcePoint.PointText + "：" + dataSourcePoint.PointValue + ",");
+                        }
+                        if (this.lblTotal.Text != "累计值为：")
+                        {
+                            this.lblTotal.Text = this.lblTotal.Text.Substring(0, this.lblTotal.Text.LastIndexOf(","));
+                        }
+                    }
+                    else
+                    {
+                        this.lblTotal.Visible = false;
+                        chart1.Series.Add(dataSourceTeam.DataPointName);
+                        chart1.Series[dataSourceTeam.DataPointName].ChartType = dataSourceChart.ChartType;
+                        chart1.Series[dataSourceTeam.DataPointName].Name = dataSourceTeam.DataPointName;
+                        chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;
+                        chart1.Series[dataSourceTeam.DataPointName].BorderWidth = 2;
+                        chart1.Series[dataSourceTeam.DataPointName]["DrawingStyle"] = "Cylinder";
+
+                        chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观)
+                        chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签
+                        foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
+                        {
+                            chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);
+                        }
+                    }
+                }
+            }
+            Controls.Add(chart1);
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index e69de29b..4d24ae20 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -0,0 +1,40 @@
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.ExecuteReader()
+   在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult)
+   在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries)
+   在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
+   在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
+   在 System.Linq.Queryable.Count[TSource](IQueryable`1 source)
+   在 FineUIPro.Web.common.main_new.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\common\main_new.aspx.cs:行号 67
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+----错误类型:Win32Exception
+----错误信息:
+----等待的操作过时。
+----错误堆栈:
+    出错时间:02/02/2024 11:24:03
+出错文件:http://localhost:8579/common/main_new.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/02/2024 11:24:12
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
index 8b66772e..9a83c9cc 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TransferChart.aspx.cs" Inherits="FineUIPro.Web.Transfer.Chart.TransferChart" %>
-
+<%@ Register Src="~/Controls/ChartControl.ascx" TagName="ChartControl" TagPrefix="uc1" %>
 <!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -74,9 +74,9 @@
                             TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
                             <Tabs>
                                 <f:Tab ID="Tab2" Title="图表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" AutoScroll="true"
-                                    runat="server" TitleToolTip="按图形显示">
+                                    runat="server" TitleToolTip="图表">
                                     <Items>
-                                        <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0" CssStyle="margin-left:200px">
+                                        <f:ContentPanel ShowHeader="false" runat="server" ID="cpCostTime" Margin="0 0 0 0">
                                             <div id="divAnalyse">
                                                 <uc1:ChartControl ID="ChartUc" runat="server" />
                                             </div>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
index 99add796..0e62c056 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
@@ -78,6 +78,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             var AfinishedCountSum = 0;//总的实际完成数量
             var PfinishedCountSum = 0;//总的计划完成数量
+            //获取总的实际完成数量和总的计划完成数量
             switch (drpType.SelectedValue)
             {
                 #region 全部
@@ -85,7 +86,7 @@ namespace FineUIPro.Web.Transfer.Chart
                     //根据当前计划完成日期 查询总的计划完成的数量
                     var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
                                  && x.FDate >= sTime
-                                 && x.FDate < eTime
+                                 && x.FDate <= eTime
                                  && x.Status.ToLower() == "finished").ToList();
                     //查询TestPackage 去重
                     var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
@@ -112,17 +113,725 @@ namespace FineUIPro.Web.Transfer.Chart
 
                     }
 
-                    
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                 && x.ADate >= sTime
+                                 && x.ADate <= eTime
+                                 && x.Status.ToLower() == "finished").ToList();
+                    testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+
+                #region Piping
+
+                
+                case "Piping":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                     var systemListbyDate1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == ProjectId
+                                 && x.TestPackageFINISH >= sTime
+                                 && x.TestPackageFINISH <= eTime
+                                 && x.FINALStatus.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                     testpackageList = (from x in systemListbyDate1 select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == ProjectId
+                                 && x.CompleteTime >= sTime
+                                 && x.CompleteTime <= eTime
+                                 && x.FINALStatus.ToLower() == "finished").ToList();
+                    testpackageList = (from x in systemListbyDate1 select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Static Equipment
+
+               
+                case "Static Equipment":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == ProjectId
+                                && x.TestPackageFINISH >= sTime
+                                && x.TestPackageFINISH <= eTime
+                                && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate2 select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate2=Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == ProjectId
+                                && x.CompleteTime >= sTime
+                                && x.CompleteTime <= eTime
+                                && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                    testpackageList = (from x in systemListbyDate2 select x.TestPackage).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Rotating Equipment
+
+                
+                case "Rotating Equipment":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == ProjectId
+                                && x.TestPackageFINISH >= sTime
+                                && x.TestPackageFINISH <= eTime
+                                && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate3 select x.TestPackage).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == ProjectId
+                                  && x.CompleteTime >= sTime
+                                  && x.CompleteTime <= eTime
+                                  && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate3 select x.TestPackage).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Instrumentation
+
+               
+                case "Instrumentation":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate4 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate4 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Electrical
+
+              
+                case "Electrical":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate5 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate5 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Civil Structure
+
+               
+                case "Civil Structure":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate6 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate6 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Firefighting
+
+                
+                case "Firefighting":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate7 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate7 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate7 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Telecom
+
+              
+                case "Telecom":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate8 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate8 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate8 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region Plumbing
+
+               
+                case "Plumbing":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate9 = Funs.DB.Transfer_Plumbing.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate9 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate9 = Funs.DB.Transfer_Plumbing.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate9 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
+                    break;
+                #endregion
+                #region HVAC
+
+               
+                case "HVAC":
+                    //根据当前计划完成日期 查询总的计划完成的数量
+                    var systemListbyDate10 = Funs.DB.Transfer_HVAC.Where(x => x.ProjectId == ProjectId
+                                && x.Test_Package_FINISH >= sTime
+                                && x.Test_Package_FINISH <= eTime
+                                && x.FINAL_Status.ToLower() == "finished").ToList();
+                    //查询TestPackage 去重
+                    testpackageList = (from x in systemListbyDate10 select x.Test_Package).Distinct();
+
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                PfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            PfinishedCountSum += 1;
+                        }
+
+                    }
+
+                    //获取当前日期内实际完成的数量
+                    systemListbyDate10 = Funs.DB.Transfer_HVAC.Where(x => x.ProjectId == ProjectId
+                               && x.CompleteTime >= sTime
+                               && x.CompleteTime <= eTime
+                               && x.FINAL_Status.ToLower() == "finished").ToList();
+
+                    testpackageList = (from x in systemListbyDate10 select x.Test_Package).Distinct();
+                    foreach (var item in testpackageList)
+                    {
+                        //查询第12个表的数量
+                        var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                         && x.Test_Package == item
+                        ).ToList();
+                        //如果查到
+                        if (punchlistFromList.Count > 0)
+                        {
+                            //12表当前日期完成的数量
+                            var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                            //如果完成的数量等于总得数量，则是完成
+                            if (punchlistFromFinshCount == punchlistFromList.Count)
+                            {
+                                AfinishedCountSum += 1;
+                            }
+                        }
+                        else
+                        {
+                            AfinishedCountSum += 1;
+                        }
+
+                    }
                     break;
                     #endregion
-
             }
 
 
             DataTable dtTime = new DataTable();
             dtTime.Columns.Add("日期", typeof(string));
-            dtTime.Columns.Add("Actual Finished", typeof(string));
-            dtTime.Columns.Add("Plan Finished", typeof(string));
+            dtTime.Columns.Add("Actual Finished(%)", typeof(string));
+            dtTime.Columns.Add("Plan Finished(%)", typeof(string));
 
             for (var i = sTime; i <= eTime; i = i.AddMonths(1)) {
                 var AfinishedCount = 0;//实际完成数量
@@ -133,22 +842,949 @@ namespace FineUIPro.Web.Transfer.Chart
                 {
                     #region 全部
                     case "":
+                        //递增形式，开始日期就是选中的开始日期
                         //根据当前计划完成日期 查询完成的数量
                         var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
-                                     && x.FDate >= Convert.ToDateTime(rowTime["日期"])
+                                     && x.FDate >= sTime
                                      && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
                                      && x.Status.ToLower()== "finished").ToList();
                         //查询TestPackage的总数量，状态是完成的。
                         var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
-                        foreach (var item in testpackageList) { 
-                            
+                        foreach (var item in testpackageList) {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
                         }
-                     break;
+                        //完成的数量：xx完成/总的完成 *100
+                        var Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount==0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
+                                     && x.ADate >= sTime
+                                     && x.ADate < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        var Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                        if (AfinishedCount==0)
+                        {
+                            Acount = 0;
+                        }
+                        rowTime["Actual Finished(%)"] = Acount;
+                        dtTime.Rows.Add(rowTime);
+                        continue;
                     #endregion
 
+                    #region Piping
+                    case "Piping":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == ProjectId
+                                     && x.TestPackageFINISH >= sTime
+                                     && x.TestPackageFINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate1 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate1 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        
+                        continue;
+                    #endregion
+
+                    #region Static Equipment
+                    case "Static Equipment":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == ProjectId
+                                     && x.TestPackageFINISH >= sTime
+                                     && x.TestPackageFINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate2 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate2 = Funs.DB.Transfer_StaticEquipment.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate2 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Rotating Equipment
+                    case "Rotating Equipment":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == ProjectId
+                                     && x.TestPackageFINISH >= sTime
+                                     && x.TestPackageFINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate3 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate3 = Funs.DB.Transfer_RotatingEquipment.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.MechanicalFINALStatus.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate3 select x.TestPackage).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Instrumentation
+                    case "Transfer_Instrumentation":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate4 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate4 = Funs.DB.Transfer_Instrumentation.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate4 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Electrical
+                    case "Electrical":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate5 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate5 = Funs.DB.Transfer_Electrical.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate5 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Civil Structure
+                    case "Civil Structure":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate6 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate6 = Funs.DB.Transfer_Civil_Structure.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate6 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Firefighting
+                    case "Firefighting":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate8 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate8 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate8 = Funs.DB.Transfer_Firefighting.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate8 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Telecom
+                    case "Telecom":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate9 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate9 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate9 = Funs.DB.Transfer_Telecom.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate9 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region Plumbing
+                    case "Plumbing":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate10 = Funs.DB.Transfer_Plumbing.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate10 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate10 = Funs.DB.Transfer_Plumbing.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate10 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                    #endregion
+
+                    #region HVAC
+                    case "HVAC":
+                        //递增形式，开始日期就是选中的开始日期
+                        //根据当前计划完成日期 查询完成的数量
+                        var systemListbyDate11 = Funs.DB.Transfer_HVAC.Where(x => x.ProjectId == ProjectId
+                                     && x.Test_Package_FINISH >= sTime
+                                     && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate11 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    PfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                PfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        Pcount = ((Convert.ToDouble(PfinishedCount) / Convert.ToDouble(PfinishedCountSum)));
+                        if (PfinishedCount == 0)
+                        {
+                            Pcount = 0;
+                        }
+                        rowTime["Plan Finished(%)"] = Pcount;
+
+
+                        //实际的完成数量
+                        systemListbyDate11 = Funs.DB.Transfer_HVAC.Where(x => x.ProjectId == ProjectId
+                                     && x.CompleteTime >= sTime
+                                     && x.CompleteTime < Convert.ToDateTime(rowTime["日期"]).AddMonths(1)
+                                     && x.FINAL_Status.ToLower() == "finished").ToList();
+                        //查询TestPackage的总数量，状态是完成的。
+                        testpackageList = (from x in systemListbyDate11 select x.Test_Package).Distinct();
+                        foreach (var item in testpackageList)
+                        {
+                            //查询第12个表的数量
+                            var punchlistFromList = Funs.DB.Transfer_PunchlistFrom.Where(x => x.ProjectId == ProjectId
+                             && x.Test_Package == item
+                            ).ToList();
+                            //如果查到
+                            if (punchlistFromList.Count > 0)
+                            {
+                                //12表当前日期完成的数量
+                                var punchlistFromFinshCount = punchlistFromList.Where(x => x.PUNCH_ITEM_STATUS.ToLower() == "finished").ToList().Count();
+                                //如果完成的数量等于总得数量，则是完成
+                                if (punchlistFromFinshCount == punchlistFromList.Count)
+                                {
+                                    AfinishedCount += 1;
+                                }
+                            }
+                            else
+                            {
+                                AfinishedCount += 1;
+                            }
+                        }
+                        //完成的数量：xx完成/总的完成 *100
+                        if (AfinishedCount == 0)
+                        {
+                            Acount = 0;
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        else
+                        {
+                            Acount = ((Convert.ToDouble(AfinishedCount) / Convert.ToDouble(AfinishedCountSum)));
+                            rowTime["Actual Finished(%)"] = Acount;
+                            dtTime.Rows.Add(rowTime);
+                        }
+                        continue;
+                        #endregion
+
                 }
 
+
             }
+            this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false));
         }
         #endregion
     }
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
index dcc82d4a..0576a553 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
@@ -130,5 +130,14 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel cpCostTime;
+
+        /// <summary>
+        /// ChartUc 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::Web.Controls.ChartControl ChartUc;
     }
 }
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index 1544f676..f3c15865 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -20,7 +20,7 @@
 <TreeNode id="874B4232-E0AD-41CD-8C66-8A7FF2D79358" Text="项目安全协议清单" NavigateUrl="HSSE/QualityAudit/ProjectRecord.aspx"></TreeNode>
 </TreeNode>
 </TreeNode>
-<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="CQMS/Solution/ConstructSolution.aspx"></TreeNode>
+<TreeNode id="5FF7BBD8-3E0A-4C90-8976-AFF5CE7E17A5" Text="施工方案" NavigateUrl=""><TreeNode id="9B42977B-FA0B-48EF-8616-D53FC14E5127" Text="施工方案" NavigateUrl="HSSE/Solution/ConstructSolution.aspx"></TreeNode>
 <TreeNode id="5B3D3F7B-9B50-4927-B131-11D13D4D1C19" Text="危大工程施工方案清单" NavigateUrl="HSSE/Solution/LargerHazardList.aspx"></TreeNode>
 <TreeNode id="27DE7248-C4FF-4288-BBAC-11CB8741AD67" Text="专家论证清单" NavigateUrl="HSSE/Solution/ExpertArgumentList.aspx"></TreeNode>
 <TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
@@ -153,7 +153,7 @@
 <TreeNode id="C483220C-0FEE-4E45-9B78-BBBA857EFFB3" Text="安全数据" NavigateUrl="ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="0ED3E0CC-75E0-4FF3-8832-067217A6CD4D" Text="事故管理" NavigateUrl=""><TreeNode id="FB5C66FF-3BFB-490F-A14F-0DD5B5A4D110" Text="HSSE事故(对人员)记录" NavigateUrl="HSSE/Accident/AccidentPersonRecord.aspx"></TreeNode>
-<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
+<TreeNode id="9A9D6805-6C98-46E4-943E-130C4A3EB9A2" Text="HSSE事故(含未遂)处理" NavigateUrl="HSSE/Accident/AccidentHandle.aspx"></TreeNode>
 <TreeNode id="27C681E5-135A-414F-9FC2-D86D27805E6A" Text="事故报告登记" NavigateUrl="HSSE/Accident/AccidentReport.aspx"></TreeNode>
 <TreeNode id="B0A341A2-954A-4E24-BFC3-53D7F50628EE" Text="事故调查处理报告" NavigateUrl="HSSE/Accident/AccidentReportOther.aspx"></TreeNode>
 </TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
index 51a57bc0..753efb73 100644
--- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml
@@ -24,7 +24,6 @@
 <TreeNode id="D95CA72C-182C-4718-92A4-3F665E0FB660" Text="项目亮点类型定义" NavigateUrl="BaseInfo/PictureType.aspx"></TreeNode>
 <TreeNode id="3044D68E-5018-4B57-BFC4-FBE4BCCA8B8B" Text="问题类别定义" NavigateUrl="BaseInfo/QuestionType.aspx"></TreeNode>
 <TreeNode id="F0DF2F2B-7C12-4A0F-B7D4-0B00BADE1D64" Text="文档类别定义" NavigateUrl="BaseInfo/DocType.aspx"></TreeNode>
-<TreeNode id="D0850615-BF32-4CFA-84CA-EEA261676EA8" Text="移交专业设置" NavigateUrl="BaseInfo/TransferMajor.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="A93BA810-3511-4BB2-9C10-9663351DF79F" Text="质量设置" NavigateUrl=""><TreeNode id="24F9A1ED-0F4C-407C-8EB3-2A8711BB6ECC" Text="质量问题类别定义" NavigateUrl="BaseInfo/QualityQuestionType.aspx"></TreeNode>
 <TreeNode id="D00A978A-DDEE-4BFF-8872-FFF65A7BC0BC" Text="施工专业定义" NavigateUrl="BaseInfo/CNProfessional.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index 08203a41..a8df02b8 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -44,6 +44,7 @@
 <TreeNode id="B6A6EA7D-EDAB-40C8-920D-A106731D0E08" Text="检查表尾项管理" NavigateUrl="TestRun/BeforeTestRun/InspectTailTermList.aspx"></TreeNode>
 <TreeNode id="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="尾项处理" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="尾项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
+<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
 <TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表会签" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
 <TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
@@ -60,16 +61,13 @@
 <TreeNode id="CBF65CFF-6C5D-409C-A0B8-3C2283068ED4" Text="分子筛装填" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=6"></TreeNode>
 <TreeNode id="C76C79D5-ADD7-49AC-A577-820E7DAA2CFC" Text="电气调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=7"></TreeNode>
 <TreeNode id="04E072D1-5BD3-4F6C-9E81-1FE32A4851E9" Text="仪表调试" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=8"></TreeNode>
-<TreeNode id="A5D6EBB7-E7C8-48EE-8DBD-735117D3C62D" Text="单机试车" NavigateUrl="TestRun/BeforeTestRun/BeforeTestRun.aspx?type=1"></TreeNode>
 </TreeNode>
 <TreeNode id="0217CE50-3ABB-44F8-A38A-C9792C436639" Text="试车管理" NavigateUrl=""><TreeNode id="E3E38073-1DF4-4C02-AFC0-5C93EE7C23A8" Text="系统划分" NavigateUrl="TestRun/TestRunManage/DeviceRun.aspx"></TreeNode>
 <TreeNode id="4B964B32-D5CC-48A2-8750-48BC4460C264" Text="工作包设置" NavigateUrl="TestRun/TestRunManage/SetWorkPackage.aspx"></TreeNode>
 <TreeNode id="B6EE8E3B-77E2-416E-8985-3C78A2169B89" Text="工作包裁剪" NavigateUrl="TestRun/TestRunManage/SubSysWorkPackage.aspx"></TreeNode>
-<TreeNode id="AF2B0CAD-DE15-4F15-A5EE-C8FB558D00C8" Text="检查项分组信息" NavigateUrl="TestRun/TestRunManage/TemplateItemGroup.aspx"></TreeNode>
 <TreeNode id="545AACE6-34BE-4BAA-A495-B73198F1BDE2" Text="检查表模板" NavigateUrl="TestRun/TestRunManage/InspectTemplate.aspx"></TreeNode>
 <TreeNode id="086DBD12-5649-4330-807A-44ABB257495F" Text="联动试车管理" NavigateUrl="TestRun/TestRunManage/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="4041089F-5CC2-4070-9556-7DAB83CF6292" Text="检查表尾项管理" NavigateUrl="TestRun/TestRunManage/InspectTailTermList.aspx"></TreeNode>
-<TreeNode id="A593B611-82C1-40D8-BB6A-DD025DB62F8C" Text="联动试车确认" NavigateUrl="TestRun/TestRunManage/SubWorkInspect.aspx"></TreeNode>
 <TreeNode id="2232ED9A-EA3C-4CB5-A53C-D96D3F5E0527" Text="尾项处理" NavigateUrl="TestRun/TestRunManage/TailTermHandleList.aspx"></TreeNode>
 <TreeNode id="9489BD6A-1A95-43BC-85C0-A65751C2C85E" Text="尾项审核" NavigateUrl="TestRun/TestRunManage/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="26F8468D-4358-4E2A-895D-8720A6F1FA89" Text="检查表会签" NavigateUrl="TestRun/TestRunManage/InspectWanderAboutList.aspx"></TreeNode>
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 0cc40f8e..5180b459 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -14,6 +14,7 @@
 <TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
 <TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
 <TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
+<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
 <TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
 </TreeNode>
 </Tree>
\ No newline at end of file

From bfdd5b1b3b71eb343cf6017a206c05a5b4bcd9d9 Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Sun, 4 Feb 2024 10:35:09 +0800
Subject: [PATCH 29/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql      | 13 +++++++++++++
 SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs    |  7 +++++++
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user        |  2 +-
 .../Transfer/Chart/TransferChart.aspx.cs            |  2 +-
 SGGL/FineUIPro.Web/Transfer/Piping.aspx             |  2 +-
 SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx  |  2 +-
 SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx    |  2 +-
 SGGL/WebAPI/WebAPI.csproj.user                      |  2 +-
 8 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql
new file mode 100644
index 00000000..61d069b0
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-04-phf.sql
@@ -0,0 +1,13 @@
+--���µ���
+delete from Transfer_Piping;
+delete from Transfer_StaticEquipment;
+delete from Transfer_RotatingEquipment;
+
+--�޸�ʱ�����ʱ��
+update Transfer_Instrumentation set CompleteTime=getdate();
+update Transfer_Electrical set CompleteTime=getdate();
+update Transfer_Civil_Structure set CompleteTime=getdate();
+update Transfer_Firefighting set CompleteTime=getdate();
+update Transfer_Telecom set CompleteTime=getdate();
+update Transfer_Plumbing set CompleteTime=getdate();
+update Transfer_HVAC set CompleteTime=getdate();
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
index e0fc300b..b7c547ac 100644
--- a/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
+++ b/SGGL/FineUIPro.Web/Controls/ChartControl.ascx.cs
@@ -415,6 +415,13 @@ namespace Web.Controls
 
                         chart1.Series[dataSourceTeam.DataPointName].Label = "#VAL{P}";//设置标签文本 (在设计期通过属性窗口编辑更直观)
                         chart1.Series[dataSourceTeam.DataPointName].IsValueShownAsLabel = true;//显示标签
+                        if (dataSourceTeam.DataPointName == "Actual Finished(%)")
+                        {
+                            chart1.Series[dataSourceTeam.DataPointName].Color = Color.Red;
+                        }
+                        else {
+                            chart1.Series[dataSourceTeam.DataPointName].Color = Color.Blue;
+                        }
                         foreach (Model.DataSourcePoint dataSourcePoint in dataSourceTeam.DataSourcePoints)
                         {
                             chart1.Series[dataSourceTeam.DataPointName].Points.AddXY(dataSourcePoint.PointText, dataSourcePoint.PointValue);
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f8ca7c7a..c4484e3e 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
index 0e62c056..198d4252 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.cs
@@ -1784,7 +1784,7 @@ namespace FineUIPro.Web.Transfer.Chart
 
 
             }
-            this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1100, 600, false));
+            this.ChartUc.CreateChartBaifenbi(BLL.ChartControlService.GetDataSourceChartByYijiao(dtTime, "PROGRESS REPORT", "Line", 1300, 600, false));
         }
         #endregion
     }
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index e0049131..bc004f71 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -63,7 +63,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index e37b9a0e..28a6a36f 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -63,7 +63,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 3c49f100..32e177f0 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -63,7 +63,7 @@
                                     HeaderTextAlign="Center" Width="120px">
                                 </f:RenderField>
                                 <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Test Package" TextAlign="Center"
-                                    HeaderTextAlign="Center" Width="120px">
+                                    HeaderTextAlign="Center" Width="200px">
                                 </f:RenderField>
                             </Columns>
                         </f:GroupField>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

From 9d7679a283a86d89937e9ae9329650d86d9d1c4f Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Sun, 4 Feb 2024 10:47:46 +0800
Subject: [PATCH 30/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/ErrLog.txt                 | 37 ++++++++++
 .../Transfer/Chart/Instrumentation.aspx       |  2 +-
 .../Transfer/Chart/TransferChart.aspx         |  7 +-
 .../Chart/TransferChart.aspx.designer.cs      |  9 +++
 .../Transfer/CivilStructure.aspx              |  2 +
 .../Transfer/CivilStructure.aspx.cs           |  6 ++
 .../Transfer/CivilStructure.aspx.designer.cs  |  9 +++
 SGGL/FineUIPro.Web/Transfer/Electrical.aspx   |  2 +
 .../FineUIPro.Web/Transfer/Electrical.aspx.cs |  6 ++
 .../Transfer/Electrical.aspx.designer.cs      |  9 +++
 SGGL/FineUIPro.Web/Transfer/Firefighting.aspx |  2 +
 .../Transfer/Firefighting.aspx.cs             |  5 ++
 .../Transfer/Firefighting.aspx.designer.cs    |  9 +++
 SGGL/FineUIPro.Web/Transfer/HVAC.aspx         |  2 +
 SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs      |  6 ++
 .../Transfer/HVAC.aspx.designer.cs            |  9 +++
 .../Transfer/Instrumentation.aspx             |  2 +
 .../Transfer/Instrumentation.aspx.cs          |  6 ++
 .../Transfer/Instrumentation.aspx.designer.cs |  9 +++
 SGGL/FineUIPro.Web/Transfer/Piping.aspx       |  2 +
 SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs    |  5 ++
 .../Transfer/Piping.aspx.designer.cs          | 67 +++++++++++--------
 SGGL/FineUIPro.Web/Transfer/Plumbing.aspx     |  2 +
 SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs  |  5 ++
 .../Transfer/Plumbing.aspx.designer.cs        |  9 +++
 .../Transfer/RotatingEquipment.aspx           |  2 +
 .../Transfer/RotatingEquipment.aspx.cs        |  5 ++
 .../RotatingEquipment.aspx.designer.cs        | 65 ++++++++++--------
 .../Transfer/StaticEquipment.aspx             |  2 +
 .../Transfer/StaticEquipment.aspx.cs          |  6 ++
 .../Transfer/StaticEquipment.aspx.designer.cs | 65 ++++++++++--------
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx      |  2 +
 SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs   |  5 ++
 .../Transfer/Telecom.aspx.designer.cs         |  9 +++
 34 files changed, 304 insertions(+), 86 deletions(-)

diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index 4d24ae20..479c4756 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -38,3 +38,40 @@ IP地址:::1
 
 出错时间:02/02/2024 11:24:12
 
+
+错误信息开始=====>
+错误类型:SqlException
+错误信息:参数化查询 '(@ProjectId nvarchar(4000))select * from Transfer_Piping C 
+   ' 需要参数 '@ProjectId'，但未提供该参数。
+错误堆栈:
+   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
+   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
+   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
+   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
+   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
+   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
+   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
+   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
+   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
+   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
+   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\BLL\SQLHelper.cs:行号 311
+   在 FineUIPro.Web.Transfer.Piping.BindGrid() 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Piping.aspx.cs:行号 58
+   在 FineUIPro.Web.Transfer.Piping.Page_Load(Object sender, EventArgs e) 位置 E:\2023公司项目\五环新\CNCEC_SUBQHSE_WUHUAN\SGGL\FineUIPro.Web\Transfer\Piping.aspx.cs:行号 24
+   在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+   在 System.EventHandler.Invoke(Object sender, EventArgs e)
+   在 System.Web.UI.Control.OnLoad(EventArgs e)
+   在 System.Web.UI.Control.LoadRecursive()
+   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:02/04/2024 10:42:45
+出错文件:http://localhost:8579/Transfer/Piping.aspx
+IP地址:::1
+操作人员:JT
+
+出错时间:02/04/2024 10:42:45
+
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index fe64043c..8c21f332 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -28,7 +28,7 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>
 
-                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
index 9a83c9cc..5933171b 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx
@@ -19,7 +19,7 @@
                     <Items>
                         <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
                             <Rows>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="30%  20% 3% 20% 15%">
                                     <Items>
                                         <f:DropDownList ID="drpType" runat="server" Label="分类" AutoPostBack="true"
                                              Width="100px" LabelWidth="80px">
@@ -43,8 +43,9 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>--%>
 
-                                        <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
-
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="50px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                         <f:Label ID="Label3" runat="server" Text="至" Width="5px">
+                                </f:Label>
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                        <%-- <f:DatePicker runat="server" Label="完成时间" ID="txtStarTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
index 0576a553..fe4095aa 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/TransferChart.aspx.designer.cs
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
 
+        /// <summary>
+        /// Label3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label Label3;
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
index e31a2e4d..eae82268 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtCivil_Structure" Label="Structure/Civil/Architecture" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
index b9844950..24c855b6 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
@@ -50,6 +50,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by  Civil_Structure ";
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
diff --git a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
index 783a843e..4fbe8adf 100644
--- a/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtCivil_Structure;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
index 66d65ca6..22689192 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtELECTRICAL" Label="ELECTRICAL" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
index 0c674ca9..12d64925 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
@@ -51,6 +51,12 @@ namespace FineUIPro.Web.Transfer
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
 
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by ELECTRICAL ";
 
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
index 07ce47f3..da5c48b7 100644
--- a/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtELECTRICAL;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
index c342ea2e..110128f9 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtFirefighting" Label="Firefighting" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
index e31ff404..c18a64d4 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.cs
@@ -50,6 +50,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Firefighting "; 
 
diff --git a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
index f8080d74..fe469cc9 100644
--- a/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Firefighting.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtFirefighting;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx
index 0705d0af..752f6115 100644
--- a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx
@@ -25,6 +25,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtHVAC" Label="HVAC" LabelWidth="80px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs
index 2c981fe7..eb9cc132 100644
--- a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.cs
@@ -50,6 +50,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by HVAC ";
             
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.designer.cs
index b796f0e3..95a07ad2 100644
--- a/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/HVAC.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtHVAC;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
index ca15bdec..6ce2465d 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="INSTRUMENTATION" LabelWidth="150px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
index 00eb6ea4..2d7a5239 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
@@ -51,6 +51,12 @@ namespace FineUIPro.Web.Transfer
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
 
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             strSql += " order by INSTRUMENTATION ";
 
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
index e7fd10a4..5272a8ec 100644
--- a/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtINSTRUMENTATION;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
index bc004f71..09bf59a1 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx
@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="PIPINGLINENUMBER" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
index dc32495c..f1f900ba 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.cs
@@ -49,6 +49,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
index 9ddaec3f..282fb9a7 100644
--- a/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Transfer {
-    
-    
-    public partial class Piping {
-        
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class Piping
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// txtPIPINGLINENUMBER 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPIPINGLINENUMBER;
-        
+
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// g1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g1;
-        
+
         /// <summary>
         /// g2 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g2;
-        
+
         /// <summary>
         /// g3 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g3;
-        
+
         /// <summary>
         /// g4 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g4;
-        
+
         /// <summary>
         /// g5 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g5;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
index 5a7dcf8c..08a9ed31 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtPlumbing" Label="Plumbing" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
index f1873d04..cd19d616 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.cs
@@ -51,6 +51,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Plumbing ";
             SqlParameter[] parameter = listStr.ToArray();
diff --git a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
index d79c6e0c..ae747e36 100644
--- a/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Plumbing.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtPlumbing;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
index 28a6a36f..661b0b79 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Rotating Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                 <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
index 806cdd01..62633b6e 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
@@ -49,6 +49,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
index ca6bd24d..a623f720 100644
--- a/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Transfer {
-    
-    
-    public partial class RotatingEquipment {
-        
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class RotatingEquipment
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// txtRotatingEquipment 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRotatingEquipment;
-        
+
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// g1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g1;
-        
+
         /// <summary>
         /// g2 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g2;
-        
+
         /// <summary>
         /// g3 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g3;
-        
+
         /// <summary>
         /// g5 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g5;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
index 32e177f0..df506ba3 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
@@ -24,6 +24,8 @@
                             <Items>
                                 <f:TextBox runat="server" ID="txtStaticEquipment" Label="Static Equipment" LabelWidth="180px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
index e774e6bc..107c96d2 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
@@ -49,6 +49,12 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND TestPackageSTART <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SYSTEM like @SYSTEM";
+                listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
+
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
index e428de06..5c8b69a6 100644
--- a/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.Transfer {
-    
-    
-    public partial class StaticEquipment {
-        
+namespace FineUIPro.Web.Transfer
+{
+
+
+    public partial class StaticEquipment
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// ToolSearch 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar ToolSearch;
-        
+
         /// <summary>
         /// txtStaticEquipment 控件。
         /// </summary>
@@ -65,7 +67,16 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtStaticEquipment;
-        
+
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>
@@ -74,7 +85,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStarTime;
-        
+
         /// <summary>
         /// Label1 控件。
         /// </summary>
@@ -83,7 +94,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label Label1;
-        
+
         /// <summary>
         /// txtEndTime 控件。
         /// </summary>
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime;
-        
+
         /// <summary>
         /// btnSearch 控件。
         /// </summary>
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSearch;
-        
+
         /// <summary>
         /// btnImport 控件。
         /// </summary>
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnImport;
-        
+
         /// <summary>
         /// lblPageIndex 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblPageIndex;
-        
+
         /// <summary>
         /// g1 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g1;
-        
+
         /// <summary>
         /// g2 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g2;
-        
+
         /// <summary>
         /// g3 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g3;
-        
+
         /// <summary>
         /// g5 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.GroupField g5;
-        
+
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-        
+
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-        
+
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.Transfer {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-        
+
         /// <summary>
         /// btnMenuDel 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
index 91edfec2..4868ebb4 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx
@@ -24,6 +24,8 @@
                                 
                                 <f:TextBox runat="server" ID="txtTelecom" Label="Telecom" LabelWidth="120px"  LabelAlign="Right"></f:TextBox>
 
+                                <f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px"  LabelAlign="Right"></f:TextBox>
+
                                 <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
                                      Width="280px">
                                 </f:DatePicker>
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
index 767658f8..2043236e 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
@@ -51,6 +51,11 @@ namespace FineUIPro.Web.Transfer
                 strSql += " AND Test_Package_START <= @InspectionDateZ";
                 listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
             }
+            if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
+            {
+                strSql += " AND SystemName like @SystemName";
+                listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
+            }
 
             strSql += " order by Telecom ";
 
diff --git a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
index 815afe32..4518bcf3 100644
--- a/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs
@@ -68,6 +68,15 @@ namespace FineUIPro.Web.Transfer
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelecom;
 
+        /// <summary>
+        /// txtSystem 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSystem;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>

From df83f9713ff80d10c70283bcdb77a01b1c89fd1e Mon Sep 17 00:00:00 2001
From: panhf <754998852@qq.com>
Date: Sun, 4 Feb 2024 11:11:43 +0800
Subject: [PATCH 31/31] =?UTF-8?q?=E7=A7=BB=E4=BA=A4=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Transfer/Chart/Instrumentation.aspx       | 16 ++++++++---
 .../Transfer/Chart/Instrumentation.aspx.cs    | 26 ++++++++++++++++--
 .../Chart/Instrumentation.aspx.designer.cs    | 27 ++++++++++++-------
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
index 8c21f332..fed1ca4d 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx
@@ -20,7 +20,7 @@
                     <Items>
                         <f:Form ID="Form2" ShowHeader="false" ShowBorder="false" runat="server">
                             <Rows>
-                                <f:FormRow>
+                                <f:FormRow ColumnWidths="20% 20% 20% 10% 10%">
                                     <Items>
                                         <f:DropDownList ID="drpdateType" runat="server" Label="日期类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpdateType_SelectedIndexChanged" Width="100px" LabelWidth="80px">
@@ -28,7 +28,7 @@
                                             <f:ListItem Value="1" Text="按日期"></f:ListItem>
                                         </f:DropDownList>
 
-                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
+                                        <f:DatePicker runat="server" Label="时间" ID="txtStarTime" EnableEdit="true" LabelWidth="50px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
                                         <f:DatePicker runat="server" ID="txtEndTime" EnableEdit="true" LabelWidth="80px" DateFormatString="yyyy-MM" DisplayType="Month"></f:DatePicker>
 
@@ -36,11 +36,11 @@
 
                                         <f:DatePicker runat="server" ID="txtEndTime1" EnableEdit="true" LabelWidth="80px" Hidden="true"></f:DatePicker>
 
-                                        <f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
+                                        <%--<f:DropDownList ID="drpChartType" runat="server" Label="图形类型" AutoPostBack="true"
                                             OnSelectedIndexChanged="drpChartType_SelectedIndexChanged" Width="300px" LabelWidth="80px">
                                             <f:ListItem Value="Column" Text="柱形图"  Selected="true"></f:ListItem>
                                             <f:ListItem Value="Line" Text="折线图"></f:ListItem>
-                                        </f:DropDownList>
+                                        </f:DropDownList>--%>
 
                                         <%--<f:DropDownList ID="drpChartType" runat="server" LabelWidth="80px" Label="图形类型"
                                             AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
@@ -52,6 +52,9 @@
 
                                         <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie" runat="server" OnClick="BtnAnalyse_Click"></f:Button>
 
+                                        <f:Button ID="btnAttachUrl" Text="附件" ToolTip="附件上传及查看" Icon="TableCell" runat="server"
+                                            OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
+                                        </f:Button>
 
                                     </Items>
                                 </f:FormRow>
@@ -98,6 +101,11 @@
                 </f:Region>
             </Regions>
         </f:RegionPanel>
+
+         <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+        Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px"
+        Height="500px">
+    </f:Window>
     </form>
 </body>
 </html>
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
index 1a99e158..52903623 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.cs
@@ -230,7 +230,7 @@ namespace FineUIPro.Web.Transfer.Chart
             }
             if (systemBol)
             {
-                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "PROGRESS REPORT", "Column", 1100, 600, false));
             }
             
 
@@ -476,11 +476,33 @@ namespace FineUIPro.Web.Transfer.Chart
                 }
                 if (systemBol)
                 {
-                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", this.drpChartType.SelectedValue, 1100, 600, false));
+                    this.ChartUc.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "SYSTEM PROGRESS REPORT", "Column", 1100, 600, false));
                 }
             }
 
         }
         #endregion
+
+        #region 附件上传
+        /// <summary>
+        /// 上传附件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAttachUrl_Click(object sender, EventArgs e)
+        {
+            //必须点击系统
+            var SystemName = this.trRectify.SelectedNodeID;
+            if (SystemName=="ALL"|| SystemName=="")
+            {
+                Alert.ShowInTop("请选择系统。", MessageBoxIcon.Warning);
+                return;
+            }
+            var toKeyId = "D142B96F-4D36-429D-AB08-FA0D7C30BB69" + SystemName;
+            PageContext.RegisterStartupScript(WindowAtt.GetShowReference
+                (String.Format("~/AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/Trancfer&menuId={1}",
+                toKeyId, "E6F5125D-DD94-4978-B7EB-D9C26694D86D")));
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
index 7669478c..d6ed0495 100644
--- a/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/Transfer/Chart/Instrumentation.aspx.designer.cs
@@ -104,15 +104,6 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndTime1;
 
-        /// <summary>
-        /// drpChartType 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpChartType;
-
         /// <summary>
         /// BtnAnalyse 控件。
         /// </summary>
@@ -122,6 +113,15 @@ namespace FineUIPro.Web.Transfer.Chart
         /// </remarks>
         protected global::FineUIPro.Button BtnAnalyse;
 
+        /// <summary>
+        /// btnAttachUrl 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAttachUrl;
+
         /// <summary>
         /// Region2 控件。
         /// </summary>
@@ -175,5 +175,14 @@ namespace FineUIPro.Web.Transfer.Chart
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree trRectify;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
     }
 }