全厂移交统计表

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)

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','仪表','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

DataBase/版本日志/SGGLDB_WH_2024-01-30-phf.sql

@@ -0,0 +1,76 @@
+Create VIEW [dbo].[View_TransferDetail]  AS 
+/*Òƽ»¹ÜÀíÁбíÊÓͼ*/
+
+select Projectid,SystemName,Subsystem,TestPackage,sDate,fDate,Status from (
+
+SELECT Projectid, SYSTEM as SystemName, Subsystem ,TestPackage,
+TestPackageSTART as sDate,TestPackageFINISH as fDate,FINALStatus as Status 
+FROM Transfer_Piping
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status 
+FROM Transfer_StaticEquipment
+
+UNION ALL
+
+SELECT Projectid,SYSTEM as SystemName, Subsystem ,TestPackage,TestPackageSTART as sDate,
+TestPackageFINISH as fDate,
+MechanicalFINALStatus as Status 
+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 
+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 
+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 
+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 
+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 
+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 
+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 
+FROM Transfer_HVAC
+
+)f
+
+
+GO

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)

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" />

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();
+        }
+    }
+}

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 质量基础信息

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>

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        
+    }
+}

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;
+    }
+}

SGGL/FineUIPro.Web/ErrLog.txt

@@ -455,3 +455,426 @@ 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
+
+
+错误信息开始=====>
+错误类型: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
+

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" />
@@ -6476,6 +6477,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>

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>

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;
                 }
             }

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>

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>
@@ -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>
+                                    <Items>
-                                      <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
+                                        <%--  <f:Tree ID="Tree1" IsFluid="true" ShowHeader="true" EnableCollapse="false"
-                                            Title="System" runat="server" Width="400px" CssStyle="width:200px; height:600px">
+                                            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>

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
+            var list = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
-               && x.Test_Package_FINISH >= sTime && x.Test_Package_FINISH <= eTime).ToList();
+               && 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
+                var systemListbyDate = Funs.DB.View_TransferDetail.Where(x => x.Projectid == ProjectId
-                && x.Test_Package_FINISH >= Convert.ToDateTime(rowTime["日期"]) 
+                && x.FDate >= Convert.ToDateTime(rowTime["日期"]) 
-                && x.Test_Package_FINISH < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
+                && x.FDate < Convert.ToDateTime(rowTime["日期"]).AddDays(1)).ToList();
 
-                //具体的system 去重
+                //查询TestPackage 去重
-                var systemList = (from x in systemListbyDate select x.SystemName).Distinct();
+                var testpackageList = (from x in systemListbyDate select x.TestPackage).Distinct();
-                if (systemList.ToList().Count>0)
+
+                if (testpackageList.ToList().Count>0)
                 {
                     systemBol = true;
                 }
-                foreach (var item in systemList)
+                foreach (var item in testpackageList)
                 {
-                    //查询当前日期每个system的数量
+                    //查询当前日期每个testpackage的数量
-                    var systemSumCount = systemListbyDate.Where(x => x.SystemName == item).ToList().Count;
+                    var systemSumCount = systemListbyDate.Where(x => x.TestPackage == item).ToList().Count;
+
                     //子系统中完成的数量
-                    var subSystemSumCount = systemListbyDate.Where(x => x.SystemName == item &&
+                    var subSystemSumCount = systemListbyDate.Where(x => x.TestPackage == item &&
-                    x.FINAL_Status.ToLower() == "finished").ToList().Count;
+                    x.Status.ToLower() == "finished").ToList().Count;
 
                     //子系统中没完成的情况
-                    var subSystemSumNotStartCount = systemListbyDate.Where(x => x.SystemName == item &&
+                    var subSystemSumNotStartCount = systemListbyDate.Where(x => x.TestPackage == item &&
-                    x.FINAL_Status.ToLower() == "not start").ToList().Count;
+                    (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();
+            this.trRectify.Nodes.Clear();
-            // 模拟从数据库返回数据表
+            this.trRectify.ShowBorder = false;
-            DataTable table = CreateDataTable(list);
+            this.trRectify.ShowHeader = false;
-
+            this.trRectify.EnableIcons = true;
-            DataSet ds = new DataSet();
+            this.trRectify.AutoScroll = true;
-            ds.Tables.Add(table);
+            this.trRectify.EnableSingleClickExpand = true;
-            ds.Relations.Add("TreeRelation", ds.Tables[0].Columns["Id"], ds.Tables[0].Columns["ParentId"]);
+            TreeNode rootNode = new TreeNode
-
-            foreach (DataRow row in ds.Tables[0].Rows)
             {
-                if (row.IsNull("ParentId"))
+                Text = "全部",
-                {
+                NodeID = "ALL",
-                    TreeNode node = new TreeNode();
+                EnableClickEvent = true,
-                    node.Text = row["Text"].ToString();
+                Expanded = true
-                    Tree1.Nodes.Add(node);
+            };
-
+            this.trRectify.Nodes.Add(rootNode);
-                    ResolveSubTree(row, node);
+            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");
+            TreeNode tn = null;
-            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();
+                tn = new TreeNode
-                row[0] = item.ToString();
+                {
-                row[1] = item.ToString();
+                    Text = item.ToString(),
-                row[2] = "ALL";
+                    NodeID = item.ToString(),
-                table.Rows.Add(row);
+                    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
     }
 }

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;
     }
 }

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>
+       <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="RegionPanel1" AjaxAspnetControls="divAccidentUnit,divAccidentTime" />
-        </div>
+    <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>

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 BLL;
-using System.Web.UI;
-using System.Web.UI.WebControls;
 
 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
     }
 }

SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFrom.aspx.designer.cs

@@ -1,17 +1,16 @@
 //------------------------------------------------------------------------------
-// <auto-generated>
+// <自动生成>
 //     此代码由工具生成。
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
+//     对此文件的更改可能导致不正确的行为，如果
-//     重新生成代码，这些更改将会丢失。
+//     重新生成代码，则所做更改将丢失。
-// </auto-generated>
+// </自动生成>
 //------------------------------------------------------------------------------
 
+namespace FineUIPro.Web.Transfer.Chart {
     
-namespace FineUIPro.Web.Transfer.Chart
+    
-{
+    public partial class PunchlistFrom {
-    public partial class PunchlistFrom
-    {
         
         /// <summary>
         /// form1 控件。
@@ -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;
     }
 }

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    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()
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        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)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
+                            Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                            model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
+                                model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Civil_Structure = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    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()
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Electrical.FirstOrDefault(x => x.ELECTRICAL == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_Electrical model = new Model.Transfer_Electrical();
+                            Model.Transfer_Electrical model = new Model.Transfer_Electrical();
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                            model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
+                                model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
-                    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();
+                        var modelOnly = Funs.DB.Transfer_Firefighting.FirstOrDefault(x => x.Firefighting == pds.Rows[i][0].ToString().Trim() && x.ProjectId == CurrUser.LoginProjectId);
-                        model.ProjectId = CurrUser.LoginProjectId;
+                        if (modelOnly == null)
-                        model.Firefighting = pds.Rows[i][0].ToString().Trim();
+                        {
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            Model.Transfer_Firefighting model = new Model.Transfer_Firefighting();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        DateTime t1, t2;
+                            model.Firefighting = pds.Rows[i][0].ToString().Trim();
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                            model.Test_Package_START = t1;
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                            model.Test_Package_FINISH = t2;
+                            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();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Firefighting = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    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()
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_HVAC.FirstOrDefault(x => x.HVAC == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_HVAC model = new Model.Transfer_HVAC();
+                            Model.Transfer_HVAC model = new Model.Transfer_HVAC();
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        model.HVAC = pds.Rows[i][0].ToString().Trim();
+                            model.HVAC = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
+                                model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.HVAC = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.HVAC = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    if (!string.IsNullOrEmpty(pds.Rows[i][0].ToString().Trim()))
-                    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();
+                        var modelOnly = Funs.DB.Transfer_Instrumentation.FirstOrDefault(x => x.INSTRUMENTATION == pds.Rows[i][0].ToString().Trim()
-                        model.ProjectId = CurrUser.LoginProjectId;
+                        && x.ProjectId == CurrUser.LoginProjectId);
-                        model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
+                        if (modelOnly == null)
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                        {
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Id = Guid.NewGuid().ToString();
-                        DateTime t1, t2;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
-                            model.Test_Package_START = t1;
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                            model.Test_Package_FINISH = t2;
+                            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)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    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()
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Plumbing.FirstOrDefault(x => x.Plumbing == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
+                            Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        model.Plumbing = pds.Rows[i][0].ToString().Trim();
+                            model.Plumbing = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
+                                model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Plumbing = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    if (!string.IsNullOrEmpty(pds.Rows[i][1].ToString().Trim()))
-                    var modelOnly = Funs.DB.Transfer_PunchlistFrom.FirstOrDefault(x => x.Punch_No == pds.Rows[i][0].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)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
+                            Model.Transfer_PunchlistFrom model = new Model.Transfer_PunchlistFrom();
 
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
 
-                        model.Item_No = pds.Rows[i][0].ToString().Trim();
+                            model.Item_No = pds.Rows[i][0].ToString().Trim();
-                        model.Punch_No = pds.Rows[i][1].ToString().Trim();
+                            model.Punch_No = pds.Rows[i][1].ToString().Trim();
-                        model.SystemName = pds.Rows[i][2].ToString().Trim();
+                            model.SystemName = pds.Rows[i][2].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][3].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][3].ToString().Trim();
 
-                        model.Test_Package = pds.Rows[i][4].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][4].ToString().Trim();
-                        model.Discipline = pds.Rows[i][5].ToString().Trim();
+                            model.Discipline = pds.Rows[i][5].ToString().Trim();
-                        model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
+                            model.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
-                        model.Identified = pds.Rows[i][7].ToString().Trim();
+                            model.Identified = pds.Rows[i][7].ToString().Trim();
-                        model.Category = pds.Rows[i][8].ToString().Trim();
+                            model.Category = pds.Rows[i][8].ToString().Trim();
-                        DateTime t1;
+                            DateTime t1;
-                        if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
-                            model.PUNCH_ITEM_FINISH_DATE = t1;
+                                model.PUNCH_ITEM_FINISH_DATE = t1;
 
 
-                        model.Action_By = pds.Rows[i][10].ToString().Trim();
+                            model.Action_By = pds.Rows[i][10].ToString().Trim();
-                        model.Required_By = pds.Rows[i][11].ToString().Trim();
+                            model.Required_By = pds.Rows[i][11].ToString().Trim();
-                        model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
+                            model.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
-                        model.Comments = pds.Rows[i][13].ToString().Trim();
+                            model.Comments = pds.Rows[i][13].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Item_No = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.Punch_No = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][3].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][4].ToString().Trim();
-                        modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
+                            modelOnly.Discipline = pds.Rows[i][5].ToString().Trim();
-                        modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.DESCRIPTION = pds.Rows[i][6].ToString().Trim();
-                        modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
+                            modelOnly.Identified = pds.Rows[i][7].ToString().Trim();
-                        modelOnly.Category = pds.Rows[i][8].ToString().Trim();
+                            modelOnly.Category = pds.Rows[i][8].ToString().Trim();
-                        DateTime t1;
+                            DateTime t1;
-                        if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][9].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][9].ToString()))
-                            modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
+                                modelOnly.PUNCH_ITEM_FINISH_DATE = t1;
-                        modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
+                            modelOnly.Action_By = pds.Rows[i][10].ToString().Trim();
-                        modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
+                            modelOnly.Required_By = pds.Rows[i][11].ToString().Trim();
-                        modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
+                            modelOnly.PUNCH_ITEM_STATUS = pds.Rows[i][12].ToString().Trim();
-                        modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
+                            modelOnly.Comments = pds.Rows[i][13].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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++)
                 {
-                    //查询第一列，没查到的情况下作导入处理
+                    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()
+                    {
+                        //查询第一列，没查到的情况下作导入处理
+                        var modelOnly = Funs.DB.Transfer_Telecom.FirstOrDefault(x => x.Telecom == pds.Rows[i][0].ToString().Trim()
                     && x.ProjectId == CurrUser.LoginProjectId);
-                    if (modelOnly == null)
+                        if (modelOnly == null)
-                    {
+                        {
-                        Model.Transfer_Telecom model = new Model.Transfer_Telecom();
+                            Model.Transfer_Telecom model = new Model.Transfer_Telecom();
-                        model.Id = Guid.NewGuid().ToString();
+                            model.Id = Guid.NewGuid().ToString();
-                        model.ProjectId = CurrUser.LoginProjectId;
+                            model.ProjectId = CurrUser.LoginProjectId;
-                        model.Telecom = pds.Rows[i][0].ToString().Trim();
+                            model.Telecom = pds.Rows[i][0].ToString().Trim();
-                        model.SystemName = pds.Rows[i][1].ToString().Trim();
+                            model.SystemName = pds.Rows[i][1].ToString().Trim();
-                        model.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            model.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        model.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            model.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            model.Test_Package_START = t1;
+                                model.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            model.Test_Package_FINISH = t2;
+                                model.Test_Package_FINISH = t2;
 
-                        model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            model.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        list.Add(model);
+                            list.Add(model);
-                    }
+                        }
-                    else
+                        else
-                    {
+                        {
-                        //修改
+                            //修改
-                        modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
+                            modelOnly.Telecom = pds.Rows[i][0].ToString().Trim();
-                        modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
+                            modelOnly.SystemName = pds.Rows[i][1].ToString().Trim();
-                        modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
+                            modelOnly.Subsystem = pds.Rows[i][2].ToString().Trim();
-                        modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
+                            modelOnly.Test_Package = pds.Rows[i][3].ToString().Trim();
-                        DateTime t1, t2;
+                            DateTime t1, t2;
-                        if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
-                            modelOnly.Test_Package_START = t1;
+                                modelOnly.Test_Package_START = t1;
-                        if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
+                            if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
-                            modelOnly.Test_Package_FINISH = t2;
+                                modelOnly.Test_Package_FINISH = t2;
-                        modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
+                            modelOnly.FINAL_Status = pds.Rows[i][6].ToString().Trim();
-                        Funs.DB.SubmitChanges();
+                            Funs.DB.SubmitChanges();
+                        }
                     }
                 }
                 if (list.Count > 0)

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=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"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

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>

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>

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>

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
@@ -9751,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
@@ -37855,6 +37874,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
 	{
@@ -414547,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
 	{