From d281b1d9c1717dd57c602e82edf18bfa83b60b8b Mon Sep 17 00:00:00 2001
From: "754998852@qq.com" <754998852@qq.com>
Date: Fri, 5 Jul 2024 14:11:35 +0800
Subject: [PATCH] =?UTF-8?q?HSE=E8=B4=B9=E7=94=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=8F=8A=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql  |   2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   9 +-
 .../HSSE/CostGoods/CostLedgerNew.aspx         |  11 +-
 .../HSSE/CostGoods/CostLedgerNew.aspx.cs      | 198 ++++++++++++++++--
 .../CostGoods/FeeRegistrationEdit.aspx.cs     |   2 +-
 .../CostGoods/PayRegistrationNewEdit.aspx.cs  |   2 +-
 SGGL/FineUIPro.Web/common/Menu_HSSE.xml       |   9 +-
 SGGL/FineUIPro.Web/common/Menu_TestRun.xml    |  14 +-
 SGGL/FineUIPro.Web/common/Menu_Transfer.xml   |  18 ++
 SGGL/FineUIPro.Web/common/Menu_ZHGL.xml       |   2 +
 10 files changed, 235 insertions(+), 32 deletions(-)

diff --git a/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql b/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
index 17083aba..49e13536 100644
--- a/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
+++ b/DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
@@ -5,7 +5,7 @@ values('dc123980-732c-4fdc-a08e-7d03ebd4388e','5','五级','0','0','五级','1')
 update sys_menu set IsUsed=0 where menuname='HSE费用计划';
 update sys_menu set IsUsed=0 where menuname='HSE费用支出';
 update sys_menu set IsUsed=0 where menuname='分包商HSE费用申请';
-
+update sys_menu set IsUsed=0 where menuname='分包商HSE费用投入登记';
 --合同HSE费用额登记
 insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
 values('C6CF3A5C-546B-483A-B742-A77F2E152523','合同HSE费用额登记','HSSE/CostGoods/FeeRegistration.aspx',9,'20ECB69E-28C4-4FAC-941A-15F446AEB634','Menu_HSSE',0,1,1)
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 599c2cea..9a02d7c9 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -29,6 +29,11 @@
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
     <TargetFrameworkProfile />
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>12.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,6 +45,7 @@
     <WarningLevel>4</WarningLevel>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,6 +55,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>false</SignAssembly>
@@ -19022,7 +19029,6 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
@@ -19042,6 +19048,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx
index 7f113533..018022df 100644
--- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx
@@ -6,6 +6,11 @@
 <head runat="server">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title></title>
+    <style>
+        .textalign {
+            text-align: center;
+        }
+    </style>
 </head>
 <body>
     <form id="form1" runat="server">
@@ -15,7 +20,8 @@
             <Toolbars>
                 <f:Toolbar ID="Toolbar1" Position="Top" runat="server">
                     <Items>
-                        <f:DatePicker ID="txtDate" runat="server" Label="日期" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month">
+                        <f:DatePicker ID="txtDate" runat="server" Label="日期" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month"
+                             AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
                         </f:DatePicker>
                         <f:ToolbarFill runat="server"></f:ToolbarFill>
                         <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
@@ -31,7 +37,8 @@
                         bordercolor="#bcd2e7" bordercolordark="#bcd2e7" bordercolorlight="#bcd2e7">
                         <tr>
                             <td align="center" valign="top">
-                                <asp:GridView ID="gvTotalPayRegistration" runat="server" AllowPaging="false" AllowSorting="True"
+                                <asp:GridView ID="gvTotalPayRegistration" runat="server" AllowPaging="false" AllowSorting="True" CssClass="textalign"
+
                                     AutoGenerateColumns="True" HorizontalAlign="Justify" Width="100%" OnRowCreated="gvTotalPayRegistration_RowCreated"
                                     OnDataBound="gvTotalPayRegistration_DataBound">
                                     <AlternatingRowStyle CssClass="GridBgColr" />
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs
index 2e96a30f..4dd535b3 100644
--- a/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/CostLedgerNew.aspx.cs
@@ -11,22 +11,57 @@ namespace FineUIPro.Web.HSSE.CostGoods
     {
         private static string headerStr;
 
+        #region 定义项
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string getdatetime
+        {
+            get
+            {
+                return (string)ViewState["getdatetime"];
+            }
+            set
+            {
+                ViewState["getdatetime"] = value;
+            }
+        }
+        #endregion
+
         protected void Page_Load(object sender, EventArgs e)
         {
             if (!IsPostBack)
             {
-                txtDate.Text = DateTime.Now.ToString("yyyy-MM");
+                getdatetime = Request.Params["getdatetime"];
+                if (string.IsNullOrEmpty(getdatetime))
+                {
+                    txtDate.Text = DateTime.Now.ToString("yyyy-MM");
+                }
+                else {
+                    txtDate.Text =Convert.ToDateTime(getdatetime).ToString("yyyy-MM");
+                }
+               
                 loadAll();
             }
         }
 
+        protected void TextBox_TextChanged(object sender, EventArgs e) {
+            //loadAll();
+            //重定向页面
+            //Response.Redirect("TargetPage.aspx?getdatetime="+ txtDate.Text);
+           
+            Response.Redirect(Request.Url.ToString().Split('?')[0]+ "?getdatetime=" + txtDate.Text);
+        }
+
         /// <summary>
         /// 根据日期加载所有
         /// </summary>
         protected void loadAll() {
+            this.gvTotalPayRegistration.DataSource = null;
+            this.gvTotalPayRegistration.DataBind();
             var pid = CurrUser.LoginProjectId;
             var result = Funs.DB.CostGoods_HseExpense.FirstOrDefault(x => x.ProjectId == CurrUser.LoginProjectId && x.PayMonth == txtDate.Text);
-            if (result!=null)
+            if (result != null)
             {
                 DateTime startTime = Convert.ToDateTime(result.PayDate.Value.Year + "-" + result.PayDate.Value.Month + "-1");
                 DateTime endTime = startTime.AddMonths(1);
@@ -37,6 +72,22 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 dt.Columns.Add("R0");   //编号
                 dt.Columns.Add("R1");   //类别
                 var units = BLL.UnitService.GetMainAndSubUnitByProjectIdList(result.ProjectId);
+                //如果不是五环，只能看到自己单位的
+                //如果不是中国五环工程有限公司，只加载自己的
+                if (CurrUser.UnitId == CommonService.GetThisUnitId() || CurrUser.UserId == Const.hfnbdId)
+                {
+
+                }
+                else
+                {
+                    var unit = new Model.Base_Unit()
+                    {
+                        UnitId = CurrUser.UnitId,
+                        UnitName = UnitService.getUnitNamesUnitIds(CurrUser.UnitId)
+                    };
+                    units = new System.Collections.Generic.List<Model.Base_Unit>();
+                    units.Add(unit);
+                }
                 int a = 0;
 
                 for (int i = 0; i < units.Count; i++)
@@ -56,8 +107,11 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 var yearHseExpense = Funs.DB.CostGoods_HseExpense.Where(x => x.ProjectId == pid && x.PayDate.Value.Year == endTime.Year);
                 var monthHseExpense = Funs.DB.CostGoods_HseExpense.Where(x => x.ProjectId == pid && x.PayDate >= startTime && x.PayDate <= endTime);
 
-                for (int i = 0; i < units.Count; i++) {
-                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId ).Sum(x => x.SMonthType1);
+                var xmzje = Funs.DB.CostGoods_FeeRegistration.Where(x => x.ProjectId == pid);
+
+                for (int i = 0; i < units.Count; i++)
+                {
+                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1);
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1) ?? 0;
@@ -67,15 +121,15 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 dt.Rows.Add(row1);
 
                 b = 2;
-                row1=dt.NewRow();
+                row1 = dt.NewRow();
                 row1[0] = "2";
                 row1[1] = "应急救援和演练";
                 for (int i = 0; i < units.Count; i++)
                 {
-                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2 ) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2) ?? 0;
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
-                    row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2 ) ?? 0;
+                    row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType2) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                 }
@@ -88,7 +142,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 for (int i = 0; i < units.Count; i++)
                 {
                     row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType3) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType3) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -103,7 +157,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 for (int i = 0; i < units.Count; i++)
                 {
                     row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType4) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType4) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -133,7 +187,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 for (int i = 0; i < units.Count; i++)
                 {
                     row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType6) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType6) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -147,7 +201,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 row1[1] = "“四新”推广应用支出";
                 for (int i = 0; i < units.Count; i++)
                 {
-                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType7 ) ?? 0;
+                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType7) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType7) ?? 0;
@@ -163,7 +217,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 for (int i = 0; i < units.Count; i++)
                 {
                     row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType8) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType8) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -193,7 +247,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 for (int i = 0; i < units.Count; i++)
                 {
                     row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType10) ?? 0;
-                    row1[b] =  Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
                     b++;
                     row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType10) ?? 0;
                     row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
@@ -201,6 +255,83 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 }
                 dt.Rows.Add(row1);
 
+                b = 2;
+                row1 = dt.NewRow();
+                row1[0] = "投入小计";
+                row1[1] = "投入小计";
+                for (int i = 0; i < units.Count; i++)
+                {
+                    row1[b] = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1 + x.SMonthType2
+                    + x.SMonthType3 + x.SMonthType4 + x.SMonthType5 + x.SMonthType6 + x.SMonthType7
+                    + x.SMonthType8 + x.SMonthType9 + x.SMonthType10) ?? 0;
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    b++;
+                    row1[b] = yearHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1 + x.SMonthType2
+                    + x.SMonthType3 + x.SMonthType4 + x.SMonthType5 + x.SMonthType6 + x.SMonthType7
+                    + x.SMonthType8 + x.SMonthType9 + x.SMonthType10) ?? 0;
+                    row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2");
+                    b++;
+                }
+                dt.Rows.Add(row1);
+
+                b = 2;
+                row1 = dt.NewRow();
+                row1[0] = "剩余金额";
+                row1[1] = "剩余金额";
+                for (int i = 0; i < units.Count; i++)
+                {
+                    //登记总金额-项目累计
+                    var Allmoney = xmzje.FirstOrDefault(x => x.UnitId == units[i].UnitId).Cost;
+                    var xmlj = monthHseExpense.Where(x => x.UnitId == units[i].UnitId).Sum(x => x.SMonthType1 + x.SMonthType2
+                    + x.SMonthType3 + x.SMonthType4 + x.SMonthType5 + x.SMonthType6 + x.SMonthType7
+                    + x.SMonthType8 + x.SMonthType9 + x.SMonthType10) ?? 0;
+
+                    var syje = Allmoney - xmlj;
+                    row1[b] = syje;
+                    b++;
+                    row1[b] = syje;
+                    b++;
+                }
+                dt.Rows.Add(row1);
+
+
+                this.gvTotalPayRegistration.DataSource = dt;
+                this.gvTotalPayRegistration.DataBind();
+            }
+            else {
+                headerStr = string.Empty;
+                headerStr += "编号#类别";
+                DataTable dt = new DataTable();
+                dt.Columns.Add("R0");   //编号
+                dt.Columns.Add("R1");   //类别
+                var units = BLL.UnitService.GetMainAndSubUnitByProjectIdList(CurrUser.LoginProjectId);
+                //如果不是五环，只能看到自己单位的
+                //如果不是中国五环工程有限公司，只加载自己的
+                if (CurrUser.UnitId == CommonService.GetThisUnitId() || CurrUser.UserId == Const.hfnbdId)
+                {
+
+                }
+                else
+                {
+                    var unit = new Model.Base_Unit()
+                    {
+                        UnitId = CurrUser.UnitId,
+                        UnitName = UnitService.getUnitNamesUnitIds(CurrUser.UnitId)
+                    };
+                    units = new System.Collections.Generic.List<Model.Base_Unit>();
+                    units.Add(unit);
+                }
+                int a = 0;
+
+                for (int i = 0; i < units.Count; i++)
+                {
+                    headerStr += "#" + units[i].UnitName + " 当月累计,当年累计";
+                    dt.Columns.Add("M" + a);   //当月累计
+                    a++;
+                    dt.Columns.Add("M" + a);   //当年累计
+                    a++;
+                }
+
                 this.gvTotalPayRegistration.DataSource = dt;
                 this.gvTotalPayRegistration.DataBind();
             }
@@ -213,7 +344,44 @@ namespace FineUIPro.Web.HSSE.CostGoods
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void gvTotalPayRegistration_DataBound(object sender, EventArgs e)
-        { }
+        {
+            var units = BLL.UnitService.GetMainAndSubUnitByProjectIdList(CurrUser.LoginProjectId);
+            if (CurrUser.UnitId == CommonService.GetThisUnitId() || CurrUser.UserId == Const.hfnbdId)
+            {
+
+            }
+            else
+            {
+                var unit = new Model.Base_Unit()
+                {
+                    UnitId = CurrUser.UnitId,
+                    UnitName = UnitService.getUnitNamesUnitIds(CurrUser.UnitId)
+                };
+                units = new System.Collections.Generic.List<Model.Base_Unit>();
+                units.Add(unit);
+            }
+
+            for (int i = 0; i < this.gvTotalPayRegistration.Rows.Count - 1; i++) {
+                GridViewRow gvrNext = this.gvTotalPayRegistration.Rows[i + 1];
+                if (gvrNext.Cells[0].Text == gvrNext.Cells[1].Text) {
+                    gvrNext.Cells[1].Visible = false;
+                    gvrNext.Cells[0].ColumnSpan = 2;
+
+                }
+                if (gvrNext.Cells[0].Text=="剩余金额")
+                {
+                    var item = 2;
+                    for (int j = 0; j < units.Count; j++)
+                    {
+                        if (gvrNext.Cells[item].Text == gvrNext.Cells[item+1].Text) {
+                            gvrNext.Cells[item].Visible = false;
+                            gvrNext.Cells[item + 1].ColumnSpan = 2;
+                        }
+                        item += 2;
+                    }
+                }
+            }
+        }
 
         #endregion
         #region Grid创建行
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs
index acfaf15d..53e2a5b1 100644
--- a/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/FeeRegistrationEdit.aspx.cs
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
             {
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
 
-                BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
+                BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
                 //如果不是中国五环工程有限公司，只加载自己的
                 if (CurrUser.UnitId == CommonService.GetThisUnitId() || CurrUser.UserId == Const.hfnbdId)
                 {
diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs
index 397ee519..13ef7fea 100644
--- a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationNewEdit.aspx.cs
@@ -33,7 +33,7 @@ namespace FineUIPro.Web.HSSE.CostGoods
                 this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
                 this.Id = Request.Params["Id"];
                 ///单位下拉框
-                BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
+                BLL.UnitService.InitUnitDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
                 if (!string.IsNullOrEmpty(this.Id)) {
                     var result = HseExpenseService.Detail(Id);
                     if (result!=null)
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index c2b8a0b5..44d44d35 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -25,6 +25,7 @@
 <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>
@@ -88,13 +89,11 @@
 <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="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="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="6FBF4B7D-21D2-4013-9465-12AC093109D4" Text="HSE措施费使用计划" NavigateUrl="HSSE/CostGoods/MeasuresPlan.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 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>
 <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>
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index b1a26ee1..1c0402e8 100644
--- 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="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="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="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,9 +69,11 @@
 <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>
@@ -119,8 +121,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="D215165B-95BA-4298-9736-B7A20F27B5D1" Text="专项总结" NavigateUrl="TestRun/DriverSummary/SpecialSummary.aspx"></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="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>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 91d9fd84..4d3b9e97 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -1,3 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
+  <TreeNode id="48545C6A-9D10-47F4-810F-DAB0CFCD5BF9" Text="Project Set up" NavigateUrl="Transfer/ProjectSetup.aspx">
+  </TreeNode>
+<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
+<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
+<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
+<TreeNode id="88F51059-55B4-4CD5-A38C-36404E5029F6" Text="Instrumentation" NavigateUrl="Transfer/Instrumentation.aspx"></TreeNode>
+<TreeNode id="296E75D2-192A-4D1F-8471-DD34263F8691" Text="Electrical" NavigateUrl="Transfer/Electrical.aspx"></TreeNode>
+<TreeNode id="95C39F86-C060-452E-BA37-D891C466A39B" Text="Civil Structure" NavigateUrl="Transfer/CivilStructure.aspx"></TreeNode>
+<TreeNode id="794E64E2-FDD2-4B7D-8408-F7FB06F9C92A" Text="Firefighting" NavigateUrl="Transfer/Firefighting.aspx"></TreeNode>
+<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
+<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
+<TreeNode id="05442049-1310-45B1-9D3D-CAAE759D8F3E" Text="HVAC" NavigateUrl="Transfer/HVAC.aspx"></TreeNode>
+<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="Punchlist from" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="E6F5125D-DD94-4978-B7EB-D9C26694D86D" Text="全厂移交统计表" NavigateUrl="Transfer/Chart/Instrumentation.aspx"></TreeNode>
+<TreeNode id="F97BCF55-E450-4007-AD84-AB64B3496204" Text="全厂移交统计递增表" NavigateUrl="Transfer/Chart/TransferChart.aspx"></TreeNode>
+<TreeNode id="C2DD3E9E-DB18-466F-8FA0-19AD6E21EEF0" Text="Punchlist from" NavigateUrl="Transfer/Chart/PunchlistFrom.aspx"></TreeNode>
+<TreeNode id="BB5EC5E1-A23D-4A3F-8772-CD40757974EC" Text="Punchlist from统计递增表" NavigateUrl="Transfer/Chart/PunchlistFromChart.aspx"></TreeNode>
+</TreeNode>
 </Tree>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index ed44c8fe..cc7e0f27 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -83,4 +83,6 @@
 </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>
\ No newline at end of file