20240911 WBS分部分项划分

2024-09-11 15:51:01 +08:00 · 2024-09-11 15:51:01 +08:00 · 77b8c9640e
parent 092da5bf50
commit 77b8c9640e
25 changed files with 2969 additions and 987 deletions
--- a/DataBase/版本日志/SGGLDB_WH_V2024-09-11-bwj.sql
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-09-11-bwj.sql
@ -0,0 +1,111 @@
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('FB94A120-921B-4AAB-B54F-EC11B6F561FD','单位分部分项工程划分、裁剪','CQMS/WBS/Control/DivisionDivideAndCrop.aspx',15,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,1,1)
+go
+	insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+	values('3829D89E-BFDE-4956-BC25-E00729DFCE62','FB94A120-921B-4AAB-B54F-EC11B6F561FD','保存',1)
+	go
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('BA250432-492B-49A3-8BB6-D04BF74D2EDD','单位分部分项工程划分表','CQMS/WBS/Control/DivisionDivideList.aspx',16,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,1,1)
+go
+
+CREATE TABLE [dbo].[WBS_DivisionDivide](
+	[DivisionDivideId] [nvarchar](50) NOT NULL,
+	[ProjectId] [nvarchar](50) NULL,
+	[UnitWorkId] [nvarchar](50) NULL,
+	[DivisionId] [varchar](50) NULL,
+ CONSTRAINT [PK_Division_DivisionDivide] PRIMARY KEY CLUSTERED 
+(
+	[DivisionDivideId] 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
+
+ALTER TABLE [dbo].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_Base_Project] FOREIGN KEY([ProjectId])
+REFERENCES [dbo].[Base_Project] ([ProjectId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_Base_Project]
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_Division_SubProjects] FOREIGN KEY([DivisionId])
+REFERENCES [dbo].[Division_SubProjects] ([DivisionId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_Division_SubProjects]
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide]  WITH CHECK ADD  CONSTRAINT [FK_WBS_DivisionDivide_WBS_UnitWork] FOREIGN KEY([UnitWorkId])
+REFERENCES [dbo].[WBS_UnitWork] ([UnitWorkId])
+GO
+
+ALTER TABLE [dbo].[WBS_DivisionDivide] CHECK CONSTRAINT [FK_WBS_DivisionDivide_WBS_UnitWork]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'DivisionDivideId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'ProjectId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'单位工程/子单位工程Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'UnitWorkId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'分部分项' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'WBS_DivisionDivide', @level2type=N'COLUMN',@level2name=N'DivisionId'
+GO
+
+
+CREATE VIEW View_WBS_DivisionDivide
+AS
+/*********单位分部分项工程划分表*********/
+SELECT 
+DD.DivisionDivideId,
+DD.ProjectId,
+DD.UnitWorkId,
+DD.DivisionId,
+SupUW.UnitWorkCode AS SupUnitWorkCode,
+SupUW.UnitWorkName AS SupUnitWorkName,
+NULL AS ChildUnitWorkCode,
+NULL AS ChildUnitWorkName,
+SupUW.SuperUnitWork,
+SP.BranchEngineeringCode,
+SP.BranchEngineeringName,
+SP.SubBranchEngineeringName,
+SP.ProEngineeringCode,
+SP.ProEngineeringName,
+SP.ProEngineeringNum,
+SP.DivisionLevel,
+SP.Sort,
+SP.ParentId
+FROM WBS_DivisionDivide DD 
+LEFT JOIN WBS_UnitWork AS SupUW ON SupUW.UnitWorkId=DD.UnitWorkId
+LEFT JOIN WBS_UnitWork AS ChildUW ON ChildUW.SuperUnitWork = SupUW.UnitWorkId
+LEFT JOIN Division_SubProjects AS SP ON SP.DivisionId = DD.DivisionId
+WHERE (SupUW.SuperUnitWork='0' or SupUW.SuperUnitWork is null)
+
+UNION 
+
+SELECT 
+DD.DivisionDivideId,
+DD.ProjectId,
+DD.UnitWorkId,
+DD.DivisionId,
+SupUW.UnitWorkCode AS SupUnitWorkCode,
+SupUW.UnitWorkName AS SupUnitWorkName,
+ChildUW.UnitWorkCode AS ChildUnitWorkCode,
+ChildUW.UnitWorkName AS ChildUnitWorkName,
+ChildUW.SuperUnitWork,
+SP.BranchEngineeringCode,
+SP.BranchEngineeringName,
+SP.SubBranchEngineeringName,
+SP.ProEngineeringCode,
+SP.ProEngineeringName,
+SP.ProEngineeringNum,
+SP.DivisionLevel,
+SP.Sort,
+SP.ParentId
+FROM WBS_DivisionDivide DD 
+LEFT JOIN WBS_UnitWork AS ChildUW ON ChildUW.UnitWorkId = DD.UnitWorkId
+LEFT JOIN WBS_UnitWork AS SupUW ON SupUW.UnitWorkId=ChildUW.SuperUnitWork
+LEFT JOIN Division_SubProjects AS SP ON SP.DivisionId = DD.DivisionId
+WHERE ChildUW.SuperUnitWork <> '0' AND  ChildUW.SuperUnitWork IS NOT NULL
+Go
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@ -291,6 +291,7 @@
    <Compile Include="CQMS\WBS\ControlItemAndCycleService.cs" />
    <Compile Include="CQMS\WBS\ControlItemInitService.cs" />
    <Compile Include="CQMS\WBS\ControlItemProjectService.cs" />
+    <Compile Include="CQMS\WBS\DivisionDivideService.cs" />
    <Compile Include="CQMS\WBS\DivisionProjectService.cs" />
    <Compile Include="CQMS\WBS\DivisionService.cs" />
    <Compile Include="CQMS\WBS\ForeignBreakdownProjectService.cs" />
--- a/SGGL/BLL/CQMS/WBS/DivisionDivideService.cs
+++ b/SGGL/BLL/CQMS/WBS/DivisionDivideService.cs
@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class DivisionDivideService
+    {
+        /// <summary>
+        /// 根据DivisionId获取分部分项工程划分
+        /// </summary>
+        /// <param name="divisionDivideId"></param>
+        /// <returns></returns>
+        public static Model.WBS_DivisionDivide GetDivisionDivideByDivisionId(string unitWorkId, string divisionId)
+        {
+            return Funs.DB.WBS_DivisionDivide.FirstOrDefault(e => e.UnitWorkId == unitWorkId && e.DivisionId == divisionId);
+        }
+
+        /// <summary>
+        /// 添加单位分部分项工程划分、裁剪
+        /// </summary>
+        /// <param name="divide"></param>
+        public static void AddDivisionDivide(Model.WBS_DivisionDivide divide)
+        {
+            Model.WBS_DivisionDivide newDivide = new Model.WBS_DivisionDivide
+            {
+                DivisionDivideId = divide.DivisionDivideId,
+                ProjectId = divide.ProjectId,
+                DivisionId = divide.DivisionId,
+                UnitWorkId = divide.UnitWorkId
+            };
+            Funs.DB.WBS_DivisionDivide.InsertOnSubmit(newDivide);
+            Funs.DB.SubmitChanges();
+        }
+
+        /// <summary>
+        /// 根据分项Id删除
+        /// </summary>
+        /// <param name="divisionId"></param>
+        public static void DeleteDivisionDivideByDivisionId(string divisionId)
+        {
+            Model.WBS_DivisionDivide divisionDivide = Funs.DB.WBS_DivisionDivide.FirstOrDefault(e => e.DivisionId == divisionId);
+            if (divisionDivide!=null)
+            {
+                Funs.DB.WBS_DivisionDivide.DeleteOnSubmit(divisionDivide);
+                Funs.DB.SubmitChanges();
+            }
+        }
+
+        /// <summary>
+        /// 根据单位工程/子单位工程删除
+        /// </summary>
+        /// <param name="unitWorkId"></param>
+        public static void DeleteDivisionDivideByUnitWorkId(string unitWorkId)
+        {
+            var div = (from x in Funs.DB.WBS_DivisionDivide where x.UnitWorkId == unitWorkId select x).ToList();
+            if (div != null)
+            {
+                Funs.DB.WBS_DivisionDivide.DeleteAllOnSubmit(div);
+                Funs.DB.SubmitChanges();
+            }
+        }
+    }
+}
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@ -3778,6 +3778,16 @@ namespace BLL
        /// </summary>
        public const string ControlItemAndCycleShowMenuId = "94217974-201A-4D4F-A832-D9477ACD63A5";

+        /// <summary>
+        /// 单位分部分项工程划分、裁剪
+        /// </summary>
+        public const string DivisionDivideAndCropMenuId = "FB94A120-921B-4AAB-B54F-EC11B6F561FD";
+
+        /// <summary>
+        /// 单位分部分项工程划分表
+        /// </summary>
+        public const string DivisionDivideListMenuId = "BA250432-492B-49A3-8BB6-D04BF74D2EDD";
+
        #endregion

        #region 工序验收
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx
@ -0,0 +1,86 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionDivideAndCrop.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionDivideAndCrop" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>单位分部分项工程划分、裁剪</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" CssClass="blockpanel" Margin="5px" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
+            <Items>
+                <f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true" EnableCollapse="true" Layout="Fit"
+                    RegionPercent="20%" Title="单位工程/子单位工程" TitleToolTip="单位工程/子单位工程" ShowBorder="true" ShowHeader="true"
+                    BodyPadding="10px">
+                    <Items>
+                        <f:Tree ID="trUnitWork" EnableCollapse="true" ShowHeader="true" OnlyLeafCheck="true" OnNodeExpand="trUnitWork_NodeExpand" AutoLeafIdentification="true"
+                            runat="server" OnNodeCommand="trUnitWork_NodeCommand">
+                        </f:Tree>
+                        <%--  <f:HiddenField runat="server" ID="hdSelectId">
+                        </f:HiddenField>
+                        <f:HiddenField runat="server" ID="hdUnitWorkId">
+                        </f:HiddenField>--%>
+                    </Items>
+                </f:Panel>
+                <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" Layout="Fit"
+                    Title="中间面板" ShowBorder="true" ShowHeader="false" BodyPadding="10px">
+                    <Items>
+                        <f:Grid ID="Grid1" Width="870px" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
+                            runat="server" BoxFlex="1" DataKeyNames="DivisionId" AllowSorting="true" EnableColumnLines="true"
+                            SortField="Sort" SortDirection="ASC" AllowCellEditing="true" ClicksToEdit="1" EnableCheckBoxSelect="true" KeepCurrentSelection="true"
+                            ForceFit="true" ShowSelectedCell="true" DataIDField="DivisionId" >
+                        <Toolbars>
+                                <f:Toolbar ID="Toolbar4" Position="Top" runat="server" ToolbarAlign="Right">
+                                    <Items>
+                                        <f:ToolbarFill runat="server"></f:ToolbarFill>
+                                        <f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server" Text="保存" Hidden="true"
+                                            OnClick="btnSave_Click">
+                                        </f:Button>
+                                    </Items>
+                                </f:Toolbar>
+                            </Toolbars>
+                            <Columns>
+                                <f:RowNumberField HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                                <f:RenderField ColumnID="BranchEngineeringCode" ExpandUnusedSpace="true" Width="100px" DataField="BranchEngineeringCode" HeaderText="分部工程编号">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="BranchEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="BranchEngineeringName" HeaderText="分部工程名称">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="SubBranchEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="SubBranchEngineeringName" HeaderText="子分部工程名称">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringName" ExpandUnusedSpace="true" Width="150px" DataField="ProEngineeringName" HeaderText="分项工程名称">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringCode" ExpandUnusedSpace="true" Width="100px" DataField="ProEngineeringCode" HeaderText="分项工程编号">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="ProEngineeringNum" ExpandUnusedSpace="true" Width="100px" DataField="ProEngineeringNum" HeaderText="分部分项码">
+                                </f:RenderField>
+                                <f:RenderField ColumnID="DivisionLevel" ExpandUnusedSpace="true" Width="100px" DataField="DivisionLevel" HeaderText="级别">
+                                </f:RenderField>
+                                <f:RenderField Width="50px" ColumnID="Sort" DataField="Sort" HeaderText="排序">
+                                </f:RenderField>
+                            </Columns>
+                            <%--<Listeners>
+                                <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
+                            </Listeners>--%>
+                            <%--<PageItems>
+                                <f:ToolbarSeparator ID="ToolbarSeparator2" runat="server">
+                                </f:ToolbarSeparator>
+                                <f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
+                                </f:ToolbarText>
+                                <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
+                                    OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
+                                    <f:ListItem Text="100" Value="100" />
+                                    <f:ListItem Text="500" Value="500" />
+                                </f:DropDownList>
+                            </PageItems>--%>
+                        </f:Grid>
+                    </Items>
+                </f:Panel>
+            </Items>
+        </f:Panel>
+    </form>
+
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.cs
@ -0,0 +1,297 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionDivideAndCrop : PageBase
+    {
+        #region 定义变量
+        /// <summary>
+        /// 被选择项列表
+        /// </summary>
+        public List<string> SelectedList
+        {
+            get
+            {
+                return (List<string>)ViewState["SelectedList"];
+            }
+            set
+            {
+                ViewState["SelectedList"] = value;
+            }
+        }
+
+        /// <summary>
+        /// 未被选择项列表
+        /// </summary>
+        public List<string> NoSelectedList
+        {
+            get
+            {
+                return (List<string>)ViewState["NoSelectedList"];
+            }
+            set
+            {
+                ViewState["NoSelectedList"] = value;
+            }
+        }
+        #endregion
+
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.SelectedList = new List<string>();
+                this.NoSelectedList = new List<string>();
+                GetButtonPower();
+                InitTreeMenu();
+                BindGrid();
+            }
+        }
+        #endregion
+
+        #region  加载树
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.trUnitWork.Nodes.Clear();
+            this.trUnitWork.ShowBorder = false;
+            this.trUnitWork.ShowHeader = false;
+            this.trUnitWork.EnableIcons = true;
+            this.trUnitWork.AutoScroll = true;
+            this.trUnitWork.EnableSingleClickExpand = true;
+            List<Model.WBS_UnitWork> supUnitWorkList = BLL.UnitWorkService.GetUnitWorkLists(this.CurrUser.LoginProjectId);
+            if (supUnitWorkList.Count() > 0)
+            {
+                foreach (var item in supUnitWorkList)
+                {
+                    TreeNode node = new TreeNode();
+                    node.Text = item.UnitWorkName;
+                    node.NodeID = item.UnitWorkId;
+                    node.CommandName = "supUnitWork";
+                    node.EnableClickEvent = true;
+                    node.EnableExpandEvent = true;
+                    this.trUnitWork.Nodes.Add(node);
+                    TreeNode emptyNode = new TreeNode();
+                    emptyNode.Text = "";
+                    emptyNode.NodeID = "";
+                    node.Nodes.Add(emptyNode);
+                }
+            }
+        }
+        #endregion
+
+        #region  展开树
+        /// <summary>
+        /// 展开树
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trUnitWork_NodeExpand(object sender, TreeNodeEventArgs e)
+        {
+            e.Node.Nodes.Clear();
+            if (e.Node.CommandName == "supUnitWork")  //展开单位工程节点
+            {
+                var unitWorks = from x in Funs.DB.WBS_UnitWork
+                                where x.SuperUnitWork == e.Node.NodeID
+                                orderby x.UnitWorkCode
+                                select x;
+                foreach (var unitWork in unitWorks)
+                {
+                    TreeNode newNode = new TreeNode();
+                    newNode.Text = unitWork.UnitWorkName;
+                    newNode.NodeID = unitWork.UnitWorkId;
+                    newNode.CommandName = "unitWork";
+                    newNode.EnableExpandEvent = true;
+                    newNode.EnableClickEvent = true;
+                    e.Node.Nodes.Add(newNode);
+                    var installation3s = from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == unitWork.UnitWorkId orderby x.UnitWorkCode select x;
+                    if (installation3s.Count() > 0)
+                    {
+                        TreeNode emptyNode = new TreeNode();
+                        emptyNode.Text = "";
+                        emptyNode.NodeID = "";
+                        newNode.Nodes.Add(emptyNode);
+                    }
+                }
+            }
+        }
+        #endregion
+
+        #region 节点选择事件
+        /// <summary>
+        /// tv节点选中事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void trUnitWork_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            for (int i = 0; i < this.Grid1.Rows.Count; i++)
+            {
+                if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
+                {
+                    SelectedList.Add(this.Grid1.Rows[i].RowID);
+                }
+                else
+                {
+                    NoSelectedList.Add(this.Grid1.Rows[i].RowID);
+                }
+            }
+            BindGrid();
+        }
+        #endregion
+
+        #region 数据绑定和事件
+
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        public void BindGrid()
+        {
+            string strSql = @"select * from(select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a where isnull(a.ProjectId,'')='' ";
+            string strSql1 = @"select a.DivisionId,a.ProjectId,a.ParentId,a.DivisionLevel,a.BranchEngineeringCode,a.BranchEngineeringName,a.SubBranchEngineeringName,a.ProEngineeringCode,a.ProEngineeringName,a.ProEngineeringNum,a.Remark,a.AddUser,a.OperateTime,a.Sort,a.Status from Division_SubProjects as a inner join Base_Project as b on a.ProjectId=b.ProjectId where a.ProjectId=@ProjectId ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            SqlParameter[] parameter = listStr.ToArray();
+            var zxsql = strSql + " union all " + strSql1 + " ) as t order by t.Sort,t.DivisionLevel asc";
+            DataTable tb = SQLHelper.GetDataTableRunText(zxsql, parameter);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+
+            var selectIds = (from x in Funs.DB.WBS_DivisionDivide where x.UnitWorkId == this.trUnitWork.SelectedNodeID select x.DivisionId).ToList();
+            if (selectIds.Count() > 0)
+            {
+                this.Grid1.SelectedRowIDArray = selectIds.ToArray();
+            }
+        }
+
+        /// <summary>
+        /// 改变页索引
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        //protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        //{
+        //    Grid1.PageIndex = e.NewPageIndex;
+        //    BindGrid();
+        //}
+
+        /// <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 btnSave_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.trUnitWork.SelectedNodeID))
+            {
+                SelectedList.Clear();
+                NoSelectedList.Clear();
+                for (int i = 0; i < this.Grid1.Rows.Count; i++)
+                {
+                    if (this.Grid1.SelectedRowIDArray.Contains(this.Grid1.Rows[i].RowID))
+                    {
+                        SelectedList.Add(this.Grid1.Rows[i].RowID);
+                    }
+                    else
+                    {
+                        NoSelectedList.Add(this.Grid1.Rows[i].RowID);
+                    }
+                }
+                foreach (var item in SelectedList.Distinct())
+                {
+                    Model.WBS_DivisionDivide divisionDivide = BLL.DivisionDivideService.GetDivisionDivideByDivisionId(this.trUnitWork.SelectedNodeID, item);
+                    if (divisionDivide == null)
+                    {
+                        Model.WBS_DivisionDivide newdivisiondivide = new Model.WBS_DivisionDivide();
+                        newdivisiondivide.DivisionDivideId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionDivide));
+                        newdivisiondivide.ProjectId = this.CurrUser.LoginProjectId;
+                        newdivisiondivide.UnitWorkId = this.trUnitWork.SelectedNodeID;
+                        newdivisiondivide.DivisionId = item;
+                        BLL.DivisionDivideService.AddDivisionDivide(newdivisiondivide);
+                    }
+                }
+                NoSelectedList = NoSelectedList.Distinct().ToList();
+                var q = NoSelectedList.Distinct().ToList();
+                foreach (var item in q)
+                {
+                    foreach (var i in SelectedList.Distinct())
+                    {
+                        if (item == i)
+                        {
+                            NoSelectedList.Remove(item);
+                        }
+                    }
+                }
+                foreach (var item in NoSelectedList)
+                {
+                    Model.WBS_DivisionDivide divisionDivide = BLL.DivisionDivideService.GetDivisionDivideByDivisionId(this.trUnitWork.SelectedNodeID,item);
+                    if (divisionDivide != null)
+                    {
+                        BLL.DivisionDivideService.DeleteDivisionDivideByDivisionId(item);
+                    }
+                }
+                ShowNotify("保存成功！", MessageBoxIcon.Success);
+            }
+            else
+            {
+                Alert.ShowInTop("请先选择单位工程/子单位工程！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+
+        #region 获取按钮权限
+        /// <summary>
+        /// 获取按钮权限
+        /// </summary>
+        /// <param name="button"></param>
+        /// <returns></returns>
+        private void GetButtonPower()
+        {
+            if (Request.Params["value"] == "0")
+            {
+                return;
+            }
+            var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DivisionDivideAndCropMenuId);
+            if (buttonList.Count() > 0)
+            {
+                if (buttonList.Contains(BLL.Const.BtnSave))
+                {
+                    this.btnSave.Hidden = false;
+                }
+            }
+        }
+        #endregion
+
+        
+    }
+}
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideAndCrop.aspx.designer.cs
@ -0,0 +1,96 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionDivideAndCrop {
+        
+        /// <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>
+        /// panelLeftRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelLeftRegion;
+        
+        /// <summary>
+        /// trUnitWork 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Tree trUnitWork;
+        
+        /// <summary>
+        /// panelCenterRegion 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Panel panelCenterRegion;
+        
+        /// <summary>
+        /// Grid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Grid Grid1;
+        
+        /// <summary>
+        /// Toolbar4 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar4;
+        
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+    }
+}
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx
@ -0,0 +1,57 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DivisionDivideList.aspx.cs" Inherits="FineUIPro.Web.CQMS.WBS.Control.DivisionDivideList" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>单位分部分项工程划分表</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
+        <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" ShowHeader="false" Layout="VBox" AutoScroll="true" BoxConfigAlign="Stretch">
+            <Items>
+                <f:Grid ID="Grid1" IsFluid="true" ShowBorder="true" ShowHeader="false" Title="单位分部分项工程划分表"
+                    runat="server" EnableCollapse="true" DataKeyNames="DivisionDivideId"
+                    DataIDField="DivisionDivideId" AllowPaging="false" AllowCellEditing="false" ExpandAllTreeNodes="true">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar1" runat="server">
+                            <Items>
+                                <f:TextBox ID="txtUnitWorkName" runat="server" Label="单位工程名称" EmptyText="输入查询条件" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
+                                <f:TextBox ID="txtBranchEngineeringName" runat="server" Label="分部工程名称" EmptyText="输入查询条件" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
+                                <f:Button ID="btnSearch" runat="server" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
+                            </Items>
+                        </f:Toolbar>
+                    </Toolbars>
+                    <Columns>
+                        <f:RowNumberField HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" />
+                        <f:RenderField ColumnID="SupUnitWorkCode" DataField="SupUnitWorkCode" Width="110px" HeaderText="单位工程编码" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SupUnitWorkName" DataField="SupUnitWorkName" Width="150px" HeaderText="单位工程名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ChildUnitWorkCode" DataField="ChildUnitWorkCode" Width="120px" HeaderText="子单位工程编码" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ChildUnitWorkName" DataField="ChildUnitWorkName" Width="150px" HeaderText="子单位工程名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BranchEngineeringCode" DataField="BranchEngineeringCode" Width="110px" HeaderText="分部工程编号" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="BranchEngineeringName" DataField="BranchEngineeringName" Width="150px" HeaderText="分部工程名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="SubBranchEngineeringName" DataField="SubBranchEngineeringName" Width="150px" HeaderText="子分部工程名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringCode" DataField="ProEngineeringCode" Width="110px" HeaderText="分项工程编号" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringName" DataField="ProEngineeringName" Width="150px" HeaderText="分项工程名称" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="ProEngineeringNum" DataField="ProEngineeringNum" Width="100px" HeaderText="分部分项码" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField ColumnID="DivisionLevel" DataField="DivisionLevel" Width="80px" HeaderText="级别" HeaderTextAlign="Center">
+                        </f:RenderField>
+                    </Columns>
+                </f:Grid>
+            </Items>
+        </f:Panel>
+    </form>
+</body>
+</html>
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.cs
@ -0,0 +1,71 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.CQMS.WBS.Control
+{
+    public partial class DivisionDivideList : PageBase
+    {
+        #region 加载
+        /// <summary>
+        /// 加载页面
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                BindGrid();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindGrid()
+        {
+            string strSql = @"SELECT * FROM View_WBS_DivisionDivide WHERE ProjectId = @projectId";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
+            if (!string.IsNullOrEmpty(this.txtUnitWorkName.Text.Trim()))
+            {
+                strSql += " AND SupUnitWorkName LIKE @unitWorkName ";
+                listStr.Add(new SqlParameter("@unitWorkName", "%" + this.txtUnitWorkName.Text.Trim() + "%"));
+            }
+            if (!string.IsNullOrEmpty(this.txtBranchEngineeringName.Text.Trim()))
+            {
+                strSql += " AND BranchEngineeringName LIKE @BranchEngineeringName ";
+                listStr.Add(new SqlParameter("@BranchEngineeringName", "%" + this.txtBranchEngineeringName.Text.Trim() + "%"));
+            }
+            strSql += " ORDER BY SupUnitWorkCode,ChildUnitWorkCode,Sort,DivisionLevel ";
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+          
+            Grid1.RecordCount = tb.Rows.Count;
+            //tb = GetFilteredTable(Grid1.FilteredData, tb);
+            //var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = tb;
+            Grid1.DataBind();
+        }
+        #endregion
+
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+        #endregion
+    }
+}
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionDivideList.aspx.designer.cs
@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionDivideList {
+        
+        /// <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>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+        
+        /// <summary>
+        /// txtUnitWorkName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtUnitWorkName;
+        
+        /// <summary>
+        /// txtBranchEngineeringName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtBranchEngineeringName;
+        
+        /// <summary>
+        /// btnSearch 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSearch;
+    }
+}
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx
@ -24,7 +24,7 @@
                    <Toolbars>
                        <f:Toolbar ID="Toolbar1" runat="server">
                            <Items>
-                                <f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>
+                                <%--<f:Button ID="btnSearch" Icon="SystemSearch" ToolTip="搜索" EnablePostBack="true" runat="server" OnClick="btnSearch_Click"></f:Button>--%>
                                <f:ToolbarFill runat="server"></f:ToolbarFill>
                                <f:Button ID="btnAdd" Icon="Add" ToolTip="新增" Text="新增" runat="server" OnClick="btnAdd_Click"></f:Button>
                                <f:Button ID="btnParentAdd" Icon="Add" ToolTip="新增子级别" Text="新增子级别" runat="server" OnClick="btnParentAdd_Click"></f:Button>
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.cs
@ -74,10 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// <summary>
        /// 搜索
        /// </summary>
-        protected void btnSearch_Click(object sender, EventArgs e)
-        {
-            DataBrid();
-        }
+        //protected void btnSearch_Click(object sender, EventArgs e)
+        //{
+        //    DataBrid();
+        //}

        /// <summary>
        /// 删除
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjects.aspx.designer.cs
@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------

-namespace FineUIPro.Web.CQMS.WBS.Control
-{
-
-
-    public partial class DivisionSubProjects
-    {
-
+namespace FineUIPro.Web.CQMS.WBS.Control {
+    
+    
+    public partial class DivisionSubProjects {
+        
        /// <summary>
        /// form1 控件。
        /// </summary>
@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
        /// <summary>
        /// PageManager1 控件。
        /// </summary>
@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.PageManager PageManager1;
-
+        
        /// <summary>
        /// Panel1 控件。
        /// </summary>
@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Panel Panel1;
-
+        
        /// <summary>
        /// Grid1 控件。
        /// </summary>
@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Grid Grid1;
-
+        
        /// <summary>
        /// Toolbar1 控件。
        /// </summary>
@ -58,16 +56,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Toolbar Toolbar1;
-
-        /// <summary>
-        /// btnSearch 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.Button btnSearch;
-
+        
        /// <summary>
        /// btnAdd 控件。
        /// </summary>
@ -76,7 +65,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnAdd;
-
+        
        /// <summary>
        /// btnParentAdd 控件。
        /// </summary>
@ -85,7 +74,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnParentAdd;
-
+        
        /// <summary>
        /// btnEdit 控件。
        /// </summary>
@ -94,7 +83,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnEdit;
-
+        
        /// <summary>
        /// btnDelete 控件。
        /// </summary>
@ -103,7 +92,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Button btnDelete;
-
+        
        /// <summary>
        /// Window1 控件。
        /// </summary>
@ -112,7 +101,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Window Window1;
-
+        
        /// <summary>
        /// Menu1 控件。
        /// </summary>
@ -121,7 +110,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.Menu Menu1;
-
+        
        /// <summary>
        /// btnMenuModify 控件。
        /// </summary>
@ -130,7 +119,7 @@ namespace FineUIPro.Web.CQMS.WBS.Control
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::FineUIPro.MenuButton btnMenuModify;
-
+        
        /// <summary>
        /// btnMenuParentAdd 控件。
        /// </summary>
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/DivisionSubProjectsEdit.aspx
@ -71,7 +71,7 @@
                                    </f:FormRow>
                                    <f:FormRow>
                                        <Items>
-                                            <f:NumberBox runat="server" Label="排序" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="150"></f:NumberBox>
+                                            <f:NumberBox runat="server" Label="排序" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="200px"></f:NumberBox>
                                        </Items>
                                    </f:FormRow>
                                </Rows>
--- a/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/Control/PointCroppingEdit.aspx
@ -99,7 +99,7 @@
                                    </f:FormRow>
                                    <f:FormRow>
                                        <Items>
-                                            <f:NumberBox runat="server" Label="排序" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="150"></f:NumberBox>
+                                            <f:NumberBox runat="server" Label="排序" ID="txtSort" LabelAlign="Right" Required="true" LabelWidth="200px"></f:NumberBox>
                                        </Items>
                                    </f:FormRow>

@ -107,7 +107,7 @@
                                        <Items>
                                            <f:Panel ID="Panel1" ShowHeader="false" ShowBorder="false" Layout="Column" runat="server">
                                                <Items>
-                                                    <f:Label runat="server" Text="附件：" CssStyle="padding-left:25px" Width="150px" CssClass="marginr" ShowLabel="false"></f:Label>
+                                                    <f:Label runat="server" Label="附件" CssStyle="padding-left:25px" CssClass="marginr" LabelWidth="180px"></f:Label>
                                                    <f:Button ID="BtnFile" Text="附件" ToolTip="附件" Icon="TableCell" runat="server"
                                                        OnClick="BtnFile_Click">
                                                    </f:Button>
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@ -1,37 +0,0 @@
-
-错误信息开始=====>
-错误类型:SqlException
-错误信息:无法绑定由多个部分组成的标识符 "D.UnitWorkId"。
-错误堆栈:
-   在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction)
-   在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose)
-   在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady)
-   在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData()
-   在 System.Data.SqlClient.SqlDataReader.get_MetaData()
-   在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry)
-   在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method)
-   在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior)
-   在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior)
-   在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable)
-   在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311
-   在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 83
-   在 FineUIPro.Web.CQMS.ProcessControl.InspectionNotice.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionNotice.aspx.cs:行号 135
-   在 FineUIPro.Button.OnClick(EventArgs e)
-   在 (Button , EventArgs )
-   在 FineUIPro.Button.RaisePostBackEvent(String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument)
-   在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData)
-   在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:09/02/2024 10:32:29
-出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionNotice.aspx
-IP地址:::1
-操作人员:JT
-
-出错时间:09/02/2024 10:32:29
-
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@ -603,6 +603,8 @@
    <Content Include="CQMS\WBS\ControlItemInitSet.aspx" />
    <Content Include="CQMS\WBS\ControlItemProjectEdit.aspx" />
    <Content Include="CQMS\WBS\ControlPoint.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx" />
+    <Content Include="CQMS\WBS\Control\DivisionDivideList.aspx" />
    <Content Include="CQMS\WBS\Control\DivisionSubProjects.aspx" />
    <Content Include="CQMS\WBS\Control\DivisionSubProjectsEdit.aspx" />
    <Content Include="CQMS\WBS\Control\PointCropping.aspx" />
@ -8637,6 +8639,20 @@
    <Compile Include="CQMS\WBS\ControlPoint.aspx.designer.cs">
      <DependentUpon>ControlPoint.aspx</DependentUpon>
    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideAndCrop.aspx.designer.cs">
+      <DependentUpon>DivisionDivideAndCrop.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="CQMS\WBS\Control\DivisionDivideList.aspx.designer.cs">
+      <DependentUpon>DivisionDivideList.aspx</DependentUpon>
+    </Compile>
    <Compile Include="CQMS\WBS\Control\DivisionSubProjects.aspx.cs">
      <DependentUpon>DivisionSubProjects.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@ -9,6 +9,8 @@
 </TreeNode>
 <TreeNode id="3B322232-38A1-4291-9832-CD4A01C2A975" Text="检验试验计划/单位分部分项工程划分" NavigateUrl=""><TreeNode id="1025D812-2325-4FE9-A1E9-D53F2CAACDC6" Text="现场控制点裁剪(新)" NavigateUrl="CQMS/WBS/Control/PointCropping.aspx"></TreeNode>
 <TreeNode id="17E206A1-E06B-40C0-8DCB-E3AAA2E3B339" Text="分部分项工程(新)" NavigateUrl="CQMS/WBS/Control/DivisionSubProjects.aspx"></TreeNode>
+<TreeNode id="FB94A120-921B-4AAB-B54F-EC11B6F561FD" Text="单位分部分项工程划分、裁剪" NavigateUrl="CQMS/WBS/Control/DivisionDivideAndCrop.aspx"></TreeNode>
+<TreeNode id="BA250432-492B-49A3-8BB6-D04BF74D2EDD" Text="单位分部分项工程划分表" NavigateUrl="CQMS/WBS/Control/DivisionDivideList.aspx"></TreeNode>
 <TreeNode id="5AA08233-9E04-4808-AC43-DD411C5F9D31" Text="现场控制点裁剪" NavigateUrl="CQMS/WBS/ProjectControlPoint.aspx"></TreeNode>
 <TreeNode id="88F115C3-D193-4455-8E8D-76F2EAF56291" Text="现场控制点资料柜" NavigateUrl="CQMS/WBS/ProjectControlPointFile.aspx"></TreeNode>
 </TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_DigData.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_DigData.xml
@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="DA7D64F8-A107-4DBC-B7E4-5C79409EB9FA" Text="查询" NavigateUrl="">
-  </TreeNode>
-<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="资料库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""><TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx"></TreeNode>
+  <TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="资料库" NavigateUrl="">
+    <TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl="">
+      <TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl="">
+        <TreeNode id="F4B02718-0616-4623-ABCE-885698DDBEB1" Text="安全法律法规" NavigateUrl="HSSE/Law/LawRegulationList.aspx">
+        </TreeNode>
 <TreeNode id="EFDSFVDE-RTHN-7UMG-4THA-5TGED48F8IOL" Text="安全标准规范" NavigateUrl="HSSE/Law/HSSEStandardList.aspx"></TreeNode>
 <TreeNode id="DF1413F3-4CE5-40B3-A574-E01CE64FEA25" Text="安全规章制度" NavigateUrl="HSSE/Law/RulesRegulations.aspx"></TreeNode>
 <TreeNode id="56960940-81A8-43D1-9565-C306EC7AFD12" Text="安全管理规定" NavigateUrl="HSSE/Law/ManageRule.aspx"></TreeNode>
@ -40,5 +42,4 @@
 </TreeNode>
 <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据库" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据作战室" NavigateUrl=""></TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@ -25,7 +25,6 @@
 <TreeNode id="49485F7E-8E71-4EED-87B4-BF6CC180C69C" Text="HSE技术交底" NavigateUrl="HSSE/License/HSETechnical.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="EE260447-028F-46AF-8864-9A5DC9DAA5BD" Text="人员信息" NavigateUrl=""><TreeNode id="AD6FC259-CF40-41C7-BA3F-15AC50C1DD20" Text="人员信息档案" NavigateUrl="HSSE/SitePerson/PersonList.aspx"></TreeNode>
-<TreeNode id="06A96829-08BF-4314-896A-81579039F82D" Text="黑名单" NavigateUrl="HSSE/SitePerson/BlackPersonList.aspx"></TreeNode>
 <TreeNode id="8F15D3BE-BE21-4A6F-AD5C-2BBECEE46149" Text="人工时日报" NavigateUrl="HSSE/SitePerson/DayReport.aspx"></TreeNode>
 <TreeNode id="6C97E014-AF13-46E5-ADB2-03D327C560EC" Text="人工时月报" NavigateUrl="HSSE/SitePerson/MonthReport.aspx"></TreeNode>
 <TreeNode id="7ACB0CB1-15D8-4E8E-A54D-0CDC5F69B39A" Text="发卡管理" NavigateUrl="HSSE/SitePerson/SendCard.aspx"></TreeNode>
@ -90,10 +89,13 @@
 <TreeNode id="A1BE3AB6-9D4A-41E7-8870-E73423165451" Text="吊装作业票" NavigateUrl="HSSE/License/LiftingWork.aspx"></TreeNode>
 <TreeNode id="0E9B7084-D021-4CA3-B9D2-9CBAA27A571B" Text="作业票(定稿)" NavigateUrl="HSSE/License/LicenseManager.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="20ECB69E-28C4-4FAC-941A-15F446AEB634" Text="HSE费用" NavigateUrl=""><TreeNode id="C6CF3A5C-546B-483A-B742-A77F2E152523" Text="合同HSE费用额登记" NavigateUrl="HSSE/CostGoods/FeeRegistration.aspx"></TreeNode>
+<TreeNode id="20ECB69E-28C4-4FAC-941A-15F446AEB634" Text="HSE费用" NavigateUrl=""><TreeNode id="EEE7CBBE-2EFB-4D64-96A6-A932E20FF9DB" Text="HSE费用计划" NavigateUrl="HSSE/CostGoods/Expense.aspx"></TreeNode>
+<TreeNode id="0C311396-C859-40B0-9D72-6A8B20733002" Text="HSE费用支出" NavigateUrl="HSSE/CostGoods/CostSmallDetail.aspx"></TreeNode>
 <TreeNode id="6FBF4B7D-21D2-4013-9465-12AC093109D4" Text="HSE措施费使用计划" NavigateUrl="HSSE/CostGoods/MeasuresPlan.aspx"></TreeNode>
-<TreeNode id="9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E" Text="HSE费用投入登记" NavigateUrl="HSSE/CostGoods/PayRegistrationNew.aspx"></TreeNode>
-<TreeNode id="19C1370F-92C0-4E31-87B4-8BADA74113E4" Text="合同HSE费用及支付台账" NavigateUrl="HSSE/CostGoods/CostLedgerNew.aspx"></TreeNode>
+<TreeNode id="FF68C697-B058-4687-A98F-71C591650E02" Text="分包商HSE费用申请" NavigateUrl="HSSE/CostGoods/CostManage.aspx"></TreeNode>
+<TreeNode id="E7B8059B-304B-47C6-90C8-D88E4A3EC506" Text="分包商HSE费用投入登记" NavigateUrl="HSSE/CostGoods/SubPayRegistration.aspx"></TreeNode>
+<TreeNode id="9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E" Text="HSE费用投入登记" NavigateUrl="HSSE/CostGoods/PayRegistration.aspx"></TreeNode>
+<TreeNode id="19C1370F-92C0-4E31-87B4-8BADA74113E4" Text="合同HSE费用及支付台账" NavigateUrl="HSSE/CostGoods/CostLedger.aspx"></TreeNode>
 </TreeNode>
 <TreeNode id="E0B25140-82DF-43EB-9A76-6D56C128E41D" Text="安全物资管理" NavigateUrl=""><TreeNode id="3DC61C8A-7C54-49E0-96C4-DED9CC6BFD0B" Text="HSE物资管理" NavigateUrl="HSSE/CostGoods/GoodsManage.aspx"></TreeNode>
 </TreeNode>
@ -119,8 +121,7 @@
 <TreeNode id="A5D0287B-2410-4DB1-8BD4-E0534EBAE308" Text="应急流程" NavigateUrl="HSSE/Emergency/EmergencyProcess.aspx"></TreeNode>
 <TreeNode id="CF5516F7-0735-44EF-9A6D-46FABF8EBC6E" Text="应急演练开展情况" NavigateUrl="HSSE/Emergency/DrillRecordList.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="03235B30-960D-4FCF-99F7-97773A2EE108" Text="工作报告" NavigateUrl=""><TreeNode id="9E4B28DF-8C8E-49F8-AB15-270BBDC73449" Text="HSE管理月报(新)" NavigateUrl="HSSE/Manager/ManagerMonthCNew.aspx"></TreeNode>
-<TreeNode id="68A52EEA-2661-4CB0-9382-A36AA5DCC480" Text="HSE管理月报" NavigateUrl="HSSE/Manager/ManagerMonthC.aspx"></TreeNode>
+<TreeNode id="03235B30-960D-4FCF-99F7-97773A2EE108" Text="工作报告" NavigateUrl=""><TreeNode id="68A52EEA-2661-4CB0-9382-A36AA5DCC480" Text="HSE管理月报" NavigateUrl="HSSE/Manager/ManagerMonthC.aspx"></TreeNode>
 <TreeNode id="D0EC3002-E1FA-457D-AC3B-4C7B2D71DD82" Text="月报" NavigateUrl="HSSE/Manager/ManagerMonth_SeDin.aspx"></TreeNode>
 <TreeNode id="88AE0EF8-D29E-409F-A154-CCA3999B00AE" Text="HSE完工报告" NavigateUrl="HSSE/Manager/CompletionReport.aspx"></TreeNode>
 <TreeNode id="8E5B4A8E-B06E-4C8A-A2C8-1091A9BCAF72" Text="工程师HSE日志" NavigateUrl="HSSE/Manager/HSEDiary.aspx"></TreeNode>
--- a/SGGL/FineUIPro.Web/common/Menu_Project.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Project.xml
@ -2,5 +2,4 @@
 <Tree>
  <TreeNode id="B95DF6F0-EB0C-4120-BD56-A4453AB42059" Text="项目列表" NavigateUrl="ProjectData/ProjectList.aspx">
  </TreeNode>
-<TreeNode id="CD167198-1667-4552-9876-E768C2542C30" Text="实业信息" NavigateUrl="BaseInfo/BaseFactory.aspx"></TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@ -46,12 +46,12 @@
 <TreeNode id="D9D90BA4-BF34-4045-977F-DCE9D507F40F" Text="生成工作包检查表" NavigateUrl="TestRun/BeforeTestRun/SubInspectTerm.aspx"></TreeNode>
 <TreeNode id="150A6D3D-CAA2-4246-947C-6730A18BCC83" Text="检查表条件确认" NavigateUrl="TestRun/BeforeTestRun/SubWorkInspect.aspx"></TreeNode>
 <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="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="F7A324D0-2410-4B37-858C-10F0A3059C90" Text="检查项确认" NavigateUrl="TestRun/BeforeTestRun/TailTermHandleList.aspx"></TreeNode>
+<TreeNode id="2254D22A-94EF-435F-9916-F07BD7082689" Text="检查表流转" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutList.aspx"></TreeNode>
+<TreeNode id="8542644D-BD9B-4188-9FDE-AE5D6D6D9A40" Text="检查项审核" NavigateUrl="TestRun/BeforeTestRun/TailTermApproveList.aspx"></TreeNode>
 <TreeNode id="F184E0FC-96E3-48A5-9515-21EAD37053B3" Text="现场实施" NavigateUrl="TestRun/BeforeTestRun/SiteImplementationList.aspx"></TreeNode>
 <TreeNode id="19865B64-E0AA-4D32-9712-05C14FE6288F" Text="试车记录上传" NavigateUrl="TestRun/BeforeTestRun/TestRunRecordUploadList.aspx"></TreeNode>
+<TreeNode id="AF88737F-D665-4C81-99D5-A07A8910C1E0" Text="检查表流转全部通过" NavigateUrl="TestRun/BeforeTestRun/InspectWanderAboutAllPassList.aspx"></TreeNode>
 <TreeNode id="FCC050F0-0F13-4CE5-BE33-623377562965" Text="三查四定尾项清单" NavigateUrl="TestRun/BeforeTestRun/SubThreeChecksFourDecisionList.aspx"></TreeNode>
 <TreeNode id="4822760B-395B-4979-B547-EA0D715C8A2C" Text="三查四定提出人处理" NavigateUrl="TestRun/BeforeTestRun/FourDecisionProposerHandle.aspx"></TreeNode>
 <TreeNode id="E673FC27-74F1-479C-8DE1-950183566725" Text="三查四定责任人销项" NavigateUrl="TestRun/BeforeTestRun/FourDecisionResponsibilityConfirm.aspx"></TreeNode>
@ -69,11 +69,9 @@
 <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>
@ -121,8 +119,8 @@
 <TreeNode id="EC4B11B4-AF9B-44E9-8CD4-364A5633CB76" Text="性能考核报告" NavigateUrl="TestRun/DriverReport/PropertyReport.aspx"></TreeNode>
 <TreeNode id="0D5C3347-0484-4455-AD32-D558BCFF0D0B" Text="开车完工报告" NavigateUrl="TestRun/DriverReport/DriverRunComplete.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="9B32C4BF-62E9-4561-8632-97AC0F581701" Text="月技术总结" NavigateUrl="TestRun/DriverSummary/MonthSummary.aspx"></TreeNode>
-<TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
+<TreeNode id="ECDC614F-6239-44D2-9523-6A25D42C6A45" Text="项目开车总结" NavigateUrl=""><TreeNode id="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></TreeNode>
 <TreeNode id="9EBA628D-E725-4A0B-B765-171F405D0821" Text="完工后个人总结" NavigateUrl="TestRun/DriverSummary/PersonalSummary.aspx"></TreeNode>
+<TreeNode id="AA88BD56-E0B4-4B9C-9238-3F48EA59C50A" Text="开车完工报告" NavigateUrl="TestRun/DriverSummary/CompleteSummary.aspx"></TreeNode>
 </TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@ -3,19 +3,4 @@
  <TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
  </TreeNode>
 <TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Non-Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
-<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punchlist Completion Table" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
-<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Table" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
-<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Chart" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
-<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Summary Table" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
-<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
-<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
-<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="仪表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
-<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="电气&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
-<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="土建/建筑/结构&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
-<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="消防&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
-<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
-<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="地管&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
-<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punch List Form" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
 </Tree>
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@ -83,6 +83,4 @@
 </TreeNode>
 <TreeNode id="EA413D2A-8D29-4DE2-932D-8511BB7F6CB2" Text="各项目巡查汇总" NavigateUrl="ZHGL/InspectionSummary/InspectionSummary.aspx"></TreeNode>
 <TreeNode id="F2133BD6-C786-407A-AD6F-3EEF613229A8" Text="施工管理绩效数据" NavigateUrl="ZHGL/Performance/PerformanceAllData.aspx"></TreeNode>
-<TreeNode id="53D8CED2-9AA7-43EA-B27D-EA10A06DF713" Text="开车人员绩效管理" NavigateUrl=""><TreeNode id="383290E0-60AE-4D16-8B5E-3899B85EC2ED" Text="开车绩效评分标准" NavigateUrl="ZHGL/TestRunPerformance/TestRunPerformanceStandard.aspx"></TreeNode>
-</TreeNode>
 </Tree>
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs