2023-10-25

DataBase/版本日志/SGGLDB_V2023-10-25.sql

@@ -5,3 +5,5 @@ go
 exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN'
 go
 
+alter table Base_Project add ProjectRealCode nvarchar(50) null
+GO

SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs

@@ -24,9 +24,13 @@ namespace BLL
                 var getSeDinMonthReport = from x in db.SeDin_MonthReport
                                           where x.ProjectId == projectId
                                           select x;
-                if (!string.IsNullOrEmpty(states))
+                if (states == "1")
                 {
-                    getSeDinMonthReport = getSeDinMonthReport.Where(x => x.States == states || (states == "0" && (x.States == null || x.States == "0")));
+                    getSeDinMonthReport = getSeDinMonthReport.Where(x => x.States == BLL.Const.State_3);
+                }
+                else
+                {
+                    getSeDinMonthReport = getSeDinMonthReport.Where(x => x.States == null || x.States != BLL.Const.State_3);
                 }
 
                 if (monthD.HasValue)

SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs

@@ -956,11 +956,15 @@ namespace BLL
                                                                                        where personLogIds.Contains(x.ConstructionLogId)
                                                                                        select x;
                 var unitWorks = (from x in getContractTracks
-                                 select new { MainItemCode = x.MainItemCode, MainItemName = x.MainItemName }).Distinct().ToList();
+                                 select new { MainItemCode = x.MainItemCode, MainItemName = x.MainItemName }).Distinct().OrderBy(x => x.MainItemCode).ToList();
 
                 DataTable table = new DataTable();
                 table.Columns.Add(new DataColumn("Id", typeof(String)));
                 table.Columns.Add(new DataColumn("Code", typeof(String)));
+                table.Columns.Add(new DataColumn("MainItemCode", typeof(String)));
+                table.Columns.Add(new DataColumn("MainItemName", typeof(String)));
+                table.Columns.Add(new DataColumn("MajorCode", typeof(String)));
+                table.Columns.Add(new DataColumn("MajorName", typeof(String)));
                 table.Columns.Add(new DataColumn("ProjectCode", typeof(String)));
                 table.Columns.Add(new DataColumn("ProjectName", typeof(String)));
                 table.Columns.Add(new DataColumn("UnitOfMeasurement", typeof(String)));
@@ -1054,7 +1058,7 @@ namespace BLL
                     row = table.NewRow();
                     row[0] = unitWork.MainItemCode;
                     row[1] = a;
-                    row[2] = string.Empty;
+                    row[2] = unitWork.MainItemCode;
                     row[3] = unitWork.MainItemName;
                     table.Rows.Add(row);
                     int b = 1;
@@ -1064,84 +1068,156 @@ namespace BLL
                         row[0] = unitWork.MainItemCode + b.ToString();
                         row[1] = a + "." + b;
                         row[2] = string.Empty;
-                        row[3] = proName;
+                        row[3] = string.Empty;
-                        table.Rows.Add(row);
+                        var pro = pros.FirstOrDefault(x => x.Value == proName);
-                        int c = 1;
+                        if (pro != null)
-                        var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName);
-                        foreach (Model.PHTGL_ContractTrack item in contractTracks)
                         {
-                            row = table.NewRow();
+                            row[4] = pro.Text;
-                            row[0] = item.Id;
+                        }
-                            row[1] = a + "." + b + "." + c;
+                        row[5] = proName;
-                            row[2] = item.ProjectCode;
+                        table.Rows.Add(row);
-                            row[3] = item.ProjectName;
+                        var subProjects = (from x in getContractTracks
-                            row[4] = item.UnitOfMeasurement;
+                                           where x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName && x.SubProject != null
-                            row[7] = item.Id;
+                                           select x.SubProject).Distinct().ToList();
-                            if (workEfficiencys.Count() > 0)
+                        if (subProjects.Count == 0)   //未填分部工程
+                        {
+                            int c = 1;
+                            var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName).OrderBy(x => x.SerialNumber);
+                            foreach (Model.PHTGL_ContractTrack item in contractTracks)
                             {
-                                var we = (from x in workEfficiencys
+                                row = table.NewRow();
-                                          where x.ContractTrackId == item.Id
+                                row[0] = item.Id;
-                                          select new { x.ConstructionLogId, x.ContractTrackId, x.PhysicalCompletionQuantity, x.MaterialConsumption }).Distinct().ToList();
+                                row[1] = a + "." + b + "." + c;
-                                decimal physicalCompletionQuantity = 0, materialConsumption = 0;
+                                row[6] = item.ProjectCode;
-                                if (we.Count() > 0)
+                                row[7] = item.ProjectName;
+                                row[8] = item.UnitOfMeasurement;
+                                row[11] = item.Id;
+                                if (workEfficiencys.Count() > 0)
                                 {
-                                    foreach (var w in we)
+                                    var we = (from x in workEfficiencys
+                                              where x.ContractTrackId == item.Id
+                                              select new { x.ConstructionLogId, x.ContractTrackId, x.PhysicalCompletionQuantity, x.MaterialConsumption }).Distinct().ToList();
+                                    decimal physicalCompletionQuantity = 0, materialConsumption = 0;
+                                    if (we.Count() > 0)
                                     {
-                                        physicalCompletionQuantity += w.PhysicalCompletionQuantity ?? 0;
+                                        physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
-                                        materialConsumption += w.MaterialConsumption ?? 0;
+                                        materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
+                                        row[9] = physicalCompletionQuantity;
+                                        row[10] = materialConsumption;
                                     }
-                                    row[5] = physicalCompletionQuantity;
+                                    for (int i = 0; i < workPostIds.Count; i++)
-                                    row[6] = materialConsumption;
-                                }
-                                for (int i = 0; i < workPostIds.Count; i++)
-                                {
-                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
-                                    if (workEfficiencyList.Count() > 0)
                                     {
-                                        decimal d = 0;
+                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
-                                        foreach (var workEfficiency in workEfficiencyList)
+                                        if (workEfficiencyList.Count() > 0)
                                         {
-                                            if (workEfficiency.ConsumeHours != null)
+                                            decimal d = 0;
+                                            d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
+                                            if (d > 0)
                                             {
-                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
+                                                row[12 + i * 2] = decimal.Round(d, 2);
+                                                if (physicalCompletionQuantity > 0)
+                                                {
+                                                    row[13 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
+                                                }
                                             }
                                         }
-                                        if (d > 0)
+                                    }
+                                    for (int i = 0; i < machineIds.Count; i++)
+                                    {
+                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
+                                        if (workEfficiencyList.Count() > 0)
                                         {
-                                            row[8 + i * 2] = decimal.Round(d, 2);
+                                            decimal d = 0;
-                                            if (physicalCompletionQuantity > 0)
+                                            d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
+                                            if (d > 0)
                                             {
-                                                row[9 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
+                                                row[52 + i * 2] = decimal.Round(d, 2);
-                                            }
+                                                if (physicalCompletionQuantity > 0)
-                                        }
+                                                {
-                                    }
+                                                    row[53 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
-                                }
+                                                }
-                                for (int i = 0; i < machineIds.Count; i++)
-                                {
-                                    var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
-                                    if (workEfficiencyList.Count() > 0)
-                                    {
-                                        decimal d = 0;
-                                        foreach (var workEfficiency in workEfficiencyList)
-                                        {
-                                            if (workEfficiency.ConsumeHours != null)
-                                            {
-                                                d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
-                                            }
-                                        }
-                                        if (d > 0)
-                                        {
-                                            row[48 + i * 2] = decimal.Round(d, 2);
-                                            if (physicalCompletionQuantity > 0)
-                                            {
-                                                row[49 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
                                             }
                                         }
                                     }
                                 }
+                                table.Rows.Add(row);
+                                c++;
+                            }
+                        }
+                        else   //存在分部工程
+                        {
+                            int c = 1;
+                            foreach (var subProject in subProjects)
+                            {
+                                row = table.NewRow();
+                                row[0] = unitWork.MainItemCode + b.ToString() + c.ToString();
+                                row[1] = a + "." + b + "." + c;
+                                row[7] = subProject;
+                                table.Rows.Add(row);
+                                int f = 1;
+                                var contractTracks = getContractTracks.Where(x => x.MainItemCode == unitWork.MainItemCode && x.MajorName == proName && x.SubProject == subProject).OrderBy(x => x.SerialNumber);
+                                foreach (Model.PHTGL_ContractTrack item in contractTracks)
+                                {
+                                    row = table.NewRow();
+                                    row[0] = item.Id;
+                                    row[1] = a + "." + b + "." + c + "." + f;
+                                    row[6] = item.ProjectCode;
+                                    row[7] = item.ProjectName;
+                                    row[8] = item.UnitOfMeasurement;
+                                    row[11] = item.Id;
+                                    if (workEfficiencys.Count() > 0)
+                                    {
+                                        var we = (from x in workEfficiencys
+                                                  where x.ContractTrackId == item.Id
+                                                  select new { x.ConstructionLogId, x.ContractTrackId, x.PhysicalCompletionQuantity, x.MaterialConsumption }).Distinct().ToList();
+                                        decimal physicalCompletionQuantity = 0, materialConsumption = 0;
+                                        if (we.Count() > 0)
+                                        {
+                                            physicalCompletionQuantity = we.Sum(x => x.PhysicalCompletionQuantity ?? 0);
+                                            materialConsumption = we.Sum(x => x.MaterialConsumption ?? 0);
+                                            row[9] = physicalCompletionQuantity;
+                                            row[10] = materialConsumption;
+                                        }
+                                        for (int i = 0; i < workPostIds.Count; i++)
+                                        {
+                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
+                                            if (workEfficiencyList.Count() > 0)
+                                            {
+                                                decimal d = 0;
+                                                d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
+                                                if (d > 0)
+                                                {
+                                                    row[12 + i * 2] = decimal.Round(d, 2);
+                                                    if (physicalCompletionQuantity > 0)
+                                                    {
+                                                        row[13 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                        for (int i = 0; i < machineIds.Count; i++)
+                                        {
+                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
+                                            if (workEfficiencyList.Count() > 0)
+                                            {
+                                                decimal d = 0;
+                                                d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
+                                                if (d > 0)
+                                                {
+                                                    row[52 + i * 2] = decimal.Round(d, 2);
+                                                    if (physicalCompletionQuantity > 0)
+                                                    {
+                                                        row[53 + i * 2] = decimal.Round(Convert.ToDecimal(physicalCompletionQuantity / d), 2);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                    table.Rows.Add(row);
+                                    f++;
+                                }
+                                c++;
                             }
-                            table.Rows.Add(row);
-                            c++;
                         }
                         b++;
                     }

SGGL/BLL/ProjectData/ProjectService.cs

@@ -48,6 +48,20 @@
             }
             return name;
         }
+        /// <summary>
+        ///根据ID获取项目编号
+        /// </summary>
+        /// <returns></returns>
+        public static string GetProjectRealCodeByProjectId(string projectId)
+        {
+            string name = string.Empty;
+            var project = Funs.DB.Base_Project.FirstOrDefault(e => e.ProjectId == projectId);
+            if (project != null)
+            {
+                name = project.ProjectRealCode;
+            }
+            return name;
+        }
         public static Model.Base_Project GetProjectByProjectShortName(string name)
         {
             return Funs.DB.Base_Project.FirstOrDefault(e => e.ShortName == name);
@@ -110,6 +124,7 @@
                 Province = project.Province,
                 City = project.City,
                 EnglishRemark = project.EnglishRemark,
+                ProjectRealCode=project.ProjectRealCode,
 
             };
             db.Base_Project.InsertOnSubmit(newProject);
@@ -155,6 +170,7 @@
                 newProject.Province = project.Province;
                 newProject.City = project.City;
                 newProject.EnglishRemark = project.EnglishRemark;
+                newProject.ProjectRealCode = project.ProjectRealCode;
                 db.SubmitChanges();
                 HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
                 CQMSDataCollectService.ProjectCQMSDataCollectSubmission(newProject);

SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs

@@ -567,23 +567,23 @@ namespace FineUIPro.Web.CQMS.WBS
         protected void btnCreateCode_Click(object sender, EventArgs e)
         {
             Model.SGGLDB db = Funs.DB;
-            string projectCode = BLL.ProjectService.GetProjectCodeByProjectId(this.CurrUser.LoginProjectId);
+            string projectRealCode = BLL.ProjectService.GetProjectRealCodeByProjectId(this.CurrUser.LoginProjectId);
             var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x;
             var workPackages = (from x in db.WBS_WorkPackage where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
             var controlItemAndCycles = (from x in db.WBS_ControlItemAndCycle where x.ProjectId == this.CurrUser.LoginProjectId && x.IsApprove == true select x).ToList();
             foreach (var unitWork in unitWorks)
             {
-                unitWork.WBSCode = projectCode + unitWork.UnitWorkCode;
+                unitWork.WBSCode = projectRealCode + unitWork.UnitWorkCode;
                 var workPackage1s = workPackages.Where(x => x.UnitWorkId == unitWork.UnitWorkId && x.SuperWorkPack == null).OrderBy(x => x.WorkPackageCode);
                 foreach (var workPackage1 in workPackage1s)
                 {
                     if (!workPackage1.PackageContent.Contains("-"))
                     {
-                        workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode;
+                        workPackage1.WBSCode = projectRealCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode;
                     }
                     else
                     {
-                        workPackage1.WBSCode = projectCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2);
+                        workPackage1.WBSCode = projectRealCode + unitWork.UnitWorkCode + unitWork.ProjectType + workPackage1.PackageCode + workPackage1.WorkPackageCode.Substring(workPackage1.WorkPackageCode.Length - 2, 2);
                     }
                     UpdateWBSCode(db, workPackages, workPackage1.WorkPackageId, workPackage1.WBSCode, controlItemAndCycles);
                 }

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs

@@ -154,27 +154,27 @@ namespace FineUIPro.Web.HJGL.PreDesign
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
             this.BindGrid();
-            var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
+           // var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
-            if (q.Any())
+           // if (q.Any())
-            {
+           // {
-                List<string> listpipecode = new List<string>();
+           //     List<string> listpipecode = new List<string>();
-                foreach (var item in q)
+           //     foreach (var item in q)
-                {
+           //     {
-                    listpipecode.Add("/" + item.PipelineCode);
+           //         listpipecode.Add("/" + item.PipelineCode);
-                }
+           //     }
-                Line_No = string.Join(",", listpipecode);
+           //     Line_No = string.Join(",", listpipecode);
-            }
+           // }
-            Model.Parameter3D parameter3D = new Model.Parameter3D();
+           // Model.Parameter3D parameter3D = new Model.Parameter3D();
-            Model.ColorModel colorModel = new Model.ColorModel();
+           // Model.ColorModel colorModel = new Model.ColorModel();
-            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+           // colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
-            parameter3D.ColorModel = colorModel;
+           // parameter3D.ColorModel = colorModel;
-            parameter3D.TagNum = Line_No;
+           // parameter3D.TagNum = Line_No;
-            parameter3D.ButtonType = "1";
+           // parameter3D.ButtonType = "1";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+           // parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
-           // parameter3D.Line_No = Line_No;
+           //// parameter3D.Line_No = Line_No;
-            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
+           // ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
-            ctlAuditFlow.data = parameter3D;
+           // ctlAuditFlow.data = parameter3D;
-            ctlAuditFlow.BindData();
+           // ctlAuditFlow.BindData();
 
         }
         #endregion
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
              var table = this.GetPagedDataTable(Grid1, list);
             Grid1.DataSource = table;
             Grid1.DataBind();
-            lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
+            //lbSinglePreRate.Text= GetSinglePreRateByUnitWork(this.tvControlItem.SelectedNodeID);
         }
         #endregion
 

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackComparison.aspx

@@ -107,7 +107,7 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
                                     </Editor>
@@ -141,13 +141,13 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="TotalCostFixedComprehensiveUnitPrice" DataField="TotalCostFixedComprehensiveUnitPrice" SortField="TotalCostFixedComprehensiveUnitPrice"
-                                    FieldType="String" HeaderText="全费用固定综合单价" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
+                                    FieldType="String" HeaderText="全费用固定综合单价(元)" TextAlign="Left" HeaderTextAlign="Center" EnableColumnEdit="False">
                                     <Editor>
                                         <f:TextBox ID="TextBox12" runat="server" Required="true"></f:TextBox>
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="MainMaterialCost" DataField="MainMaterialCost" SortField="MainMaterialCost" EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="主材费" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="其中:主材费(元)" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox13" runat="server" Required="true"></f:TextBox>
                                     </Editor>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractTrackList.aspx

@@ -111,7 +111,7 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject"   
-                                    FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
                                     </Editor>

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx

@@ -105,7 +105,7 @@
                                     </Editor>
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="SubItemProject" DataField="SubItemProject" SortField="SubItemProject" EnableColumnEdit="False"
-                                    FieldType="String" HeaderText="分项工程" TextAlign="Left" HeaderTextAlign="Center">
+                                    FieldType="String" HeaderText="子分部工程" TextAlign="Left" HeaderTextAlign="Center">
                                     <Editor>
                                         <f:TextBox ID="TextBox7" runat="server" Required="true"></f:TextBox>
                                     </Editor>
@@ -132,7 +132,7 @@
                                     </Editor>
                                 </f:RenderField>
 
-                                <f:RenderField Width="150px" ColumnID="ControlItemAndCycleCode" DataField="ControlItemAndCycleCode" SortField="ControlItemAndCycleCode"
+                                <f:RenderField Width="150px" ColumnID="WBSCode" DataField="WBSCode" SortField="WBSCode"
                                     FieldType="String" HeaderText="WBS编号" TextAlign="Left" HeaderTextAlign="Center">
                                 </f:RenderField>
                                 <f:RenderField Width="150px" ColumnID="ControlItemContent" DataField="ControlItemContent" SortField="ControlItemContent"

SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractWBS.aspx.cs

@@ -60,7 +60,7 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                         MatchWbsId= y.Id ,
                        y.ContractTrackId,
                        y.ControlItemAndCycleId,
-                       z.ControlItemAndCycleCode,
+                       z.WBSCode,
                        z.ControlItemContent,
                        z.Weights,
                        y.WorkPackageEstimate,
@@ -176,8 +176,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex];
+            string ID = Grid1.SelectedRow.DataKeys[0].ToString(); 
-            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
+            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
             if (model != null) ///已上报时不能删除
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));
@@ -215,8 +215,8 @@ namespace FineUIPro.Web.PHTGL.ContractCompile
                 Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
                 return;
             }
-            object[] ID = Grid1.DataKeys[Grid1.SelectedRowIndex];
+            string ID = Grid1.SelectedRow.DataKeys[0].ToString();
-            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID[0].ToString());
+            var model = BLL.PhtglContractTrackService.GetPHTGL_ContractTrackById(ID);
             if (model != null) ///已上报时不能删除
             {
                 PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ContractTrackMatchWBS.aspx?ContractTrackId={0}", ID, "编辑 - ")));

SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionLogWorkEfficiency.aspx

@@ -40,13 +40,13 @@
                         <f:RenderField Width="75px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
                             HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
+                        <f:RenderField Width="65px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
+                        <f:RenderField Width="60px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableLock="true" Locked="true"

SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx

@@ -30,14 +30,28 @@
                             <Items>
                                 <f:DatePicker ID="txtCompileDate" runat="server" Label="日期" LabelAlign="Right" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtCompileDate_TextChanged"></f:DatePicker>
                                 <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
+                                <f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
+                                <f:Label runat="server" Label="施工分包商" ID="lblUnitName" LabelWidth="150px" LabelAlign="Right"></f:Label>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-                        <f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
+                        <f:RenderField Width="75px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
                             HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="65px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>

SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.cs

@@ -107,11 +107,33 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             if (!IsPostBack)
             {
                 this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+                //合同编号
+                this.drpContractNo.DataTextField = "ContractNum";
+                this.drpContractNo.DataValueField = "ContractId";
+                this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
+                this.drpContractNo.DataBind();
+                Funs.FineUIPleaseSelect(this.drpContractNo);
                 GetData();
             }
         }
         #endregion
 
+        protected void drpContractNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.lblUnitName.Text = string.Empty;
+            if (this.drpContractNo.SelectedValue != BLL.Const._Null)
+            {
+                var contractTrack = (from x in Funs.DB.PHTGL_ContractTrack
+                                     where x.ContractId == this.drpContractNo.SelectedValue && x.ConstructionSubcontractor != null && x.ConstructionSubcontractor != string.Empty
+                                     select x).FirstOrDefault();
+                if (contractTrack != null)
+                {
+                    this.lblUnitName.Text = contractTrack.ConstructionSubcontractor;
+                }
+            }
+            GetData();
+        }
+
         private void GetData()
         {
             Model.SGGLDB db = Funs.DB;
@@ -134,6 +156,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                     }
                 }
             }
+            if (this.drpContractNo.SelectedValue != BLL.Const._Null)
+            {
+                contractNo = this.drpContractNo.SelectedValue;
+            }
             List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
             List<string> professionalList = Funs.GetStrListByStr(professional, ',');
             var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency

SGGL/FineUIPro.Web/PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx.designer.cs

@@ -74,5 +74,23 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox hdId;
+        
+        /// <summary>
+        /// drpContractNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpContractNo;
+        
+        /// <summary>
+        /// lblUnitName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblUnitName;
     }
 }

SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx

@@ -29,6 +29,8 @@
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server">
                             <Items>
                                 <f:DatePicker ID="txtMonth" runat="server" Label="月份" LabelAlign="Right" DateFormatString="yyyy-MM" DisplayType="Month" AutoPostBack="true" OnTextChanged="txtMonth_TextChanged" LabelWidth="120px"></f:DatePicker>
+                                <f:DropDownList ID="drpContractNo" runat="server" Label="合同编号" LabelAlign="Right" EnableEdit="true" LabelWidth="120px" AutoPostBack="true" OnSelectedIndexChanged="drpContractNo_SelectedIndexChanged"></f:DropDownList>
+                                <f:Label runat="server" Label="施工分包商" ID="lblUnitName" LabelWidth="150px" LabelAlign="Right"></f:Label>
                                 <f:TextBox runat="server" ID="hdId" Hidden="true"></f:TextBox>
                                 <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="BtnAnalyse" Text="统计" Icon="ChartPie"
@@ -44,6 +46,18 @@
                         <f:RenderField Width="60px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
                             HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
+                        <f:RenderField Width="65px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="60px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
+                        <f:RenderField Width="100px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableLock="true" Locked="true"
+                            FieldType="String" HeaderText="专业工程名称" TextAlign="Left" HeaderTextAlign="Center">
+                        </f:RenderField>
                         <f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="项目编码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>

SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.cs

@@ -107,10 +107,35 @@ namespace FineUIPro.Web.PZHGL.InformationProject
             if (!IsPostBack)
             {
                 this.txtMonth.Text = string.Format("{0:yyyy-MM}", DateTime.Now);
+                //合同编号
+                this.drpContractNo.DataTextField = "ContractNum";
+                this.drpContractNo.DataValueField = "ContractId";
+                this.drpContractNo.DataSource = BLL.PHTGL_ContractReviewService.GetContractReview_CompleteData(this.CurrUser.LoginProjectId);
+                this.drpContractNo.DataBind();
+                Funs.FineUIPleaseSelect(this.drpContractNo);
             }
         }
         #endregion
 
+        protected void drpContractNo_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.lblUnitName.Text = string.Empty;
+            this.btnSave.Hidden = false;
+            if (this.drpContractNo.SelectedValue != BLL.Const._Null)
+            {
+                var contractTrack = (from x in Funs.DB.PHTGL_ContractTrack
+                                     where x.ContractId == this.drpContractNo.SelectedValue && x.ConstructionSubcontractor != null && x.ConstructionSubcontractor != string.Empty
+                                     select x).FirstOrDefault();
+                if (contractTrack != null)
+                {
+                    this.lblUnitName.Text = contractTrack.ConstructionSubcontractor;
+                }
+                this.btnSave.Hidden = true;
+            }
+            this.Grid1.DataSource = null;
+            this.Grid1.DataBind();
+        }
+
         private void GetData()
         {
             Model.SGGLDB db = Funs.DB;
@@ -135,6 +160,10 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                     }
                 }
             }
+            if (this.drpContractNo.SelectedValue != BLL.Const._Null)
+            {
+                contractNo = this.drpContractNo.SelectedValue;
+            }
             List<string> contractNoList = Funs.GetStrListByStr(contractNo, ',');
             List<string> professionalList = Funs.GetStrListByStr(professional, ',');
             var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
@@ -183,63 +212,70 @@ namespace FineUIPro.Web.PZHGL.InformationProject
         {
             if (!string.IsNullOrEmpty(this.txtMonth.Text.Trim()))
             {
-                Model.SGGLDB db = Funs.DB;
+                if (this.Grid1.Rows.Count > 0)
-                DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
-                BLL.ConstructionLogWorkEfficiencyMonthService.DeleteConstructionLogWorkEfficiencyMonthsByConstructionLogId(this.CurrUser.LoginProjectId, month);
-                var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
-                                      join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
-                                      where y.ProjectId == this.CurrUser.LoginProjectId
-                                      select x;
-                List<string> workPostIds = (from x in workEfficiencys
-                                            where x.Type == "Person"
-                                            select x.TypeId).Distinct().ToList();
-                List<string> machineIds = (from x in workEfficiencys
-                                           where x.Type == "Machine"
-                                           select x.TypeId).Distinct().ToList();
-                foreach (JObject mergedRow in Grid1.GetMergedData())
                 {
-                    JObject values = mergedRow.Value<JObject>("values");
+                    Model.SGGLDB db = Funs.DB;
-                    int a = mergedRow.Value<int>("index");
+                    DateTime month = Funs.GetNewDateTimeOrNow(this.txtMonth.Text.Trim() + "-01");
-                    if (this.Grid1.Rows[a].DataKeys[2] != null)
+                    BLL.ConstructionLogWorkEfficiencyMonthService.DeleteConstructionLogWorkEfficiencyMonthsByConstructionLogId(this.CurrUser.LoginProjectId, month);
+                    var workEfficiencys = from x in db.ZHGL_ConstructionLogWorkEfficiency
+                                          join y in db.ZHGL_ConstructionLog on x.ConstructionLogId equals y.ConstructionLogId
+                                          where y.ProjectId == this.CurrUser.LoginProjectId
+                                          select x;
+                    List<string> workPostIds = (from x in workEfficiencys
+                                                where x.Type == "Person"
+                                                select x.TypeId).Distinct().ToList();
+                    List<string> machineIds = (from x in workEfficiencys
+                                               where x.Type == "Machine"
+                                               select x.TypeId).Distinct().ToList();
+                    foreach (JObject mergedRow in Grid1.GetMergedData())
                     {
-                        string physicalCompletionQuantity = values.Value<string>("PhysicalCompletionQuantity");
+                        JObject values = mergedRow.Value<JObject>("values");
-                        string materialConsumption = values.Value<string>("MaterialConsumption");
+                        int a = mergedRow.Value<int>("index");
-                        string unitOfMeasurement = values.Value<string>("UnitOfMeasurement");
+                        if (this.Grid1.Rows[a].DataKeys[2] != null)
-                        for (int i = 0; i < workPostIds.Count; i++)
                         {
-                            Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
+                            string physicalCompletionQuantity = values.Value<string>("PhysicalCompletionQuantity");
-                            workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
+                            string materialConsumption = values.Value<string>("MaterialConsumption");
-                            workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
+                            string unitOfMeasurement = values.Value<string>("UnitOfMeasurement");
-                            workEfficiency.Month = month;
+                            for (int i = 0; i < workPostIds.Count; i++)
-                            workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
+                            {
-                            workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
+                                Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
-                            workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
+                                workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
-                            workEfficiency.UnitOfMeasurement = unitOfMeasurement;
+                                workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
-                            workEfficiency.Type = "Person";
+                                workEfficiency.Month = month;
-                            workEfficiency.TypeId = workPostIds[i];
+                                workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
-                            workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("PersonConsumeHours" + i.ToString()));
+                                workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
-                            workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("PersonWorkEfficiency" + i.ToString()));
+                                workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
-                            BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
+                                workEfficiency.UnitOfMeasurement = unitOfMeasurement;
-                        }
+                                workEfficiency.Type = "Person";
-                        for (int i = 0; i < machineIds.Count; i++)
+                                workEfficiency.TypeId = workPostIds[i];
-                        {
+                                workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("PersonConsumeHours" + i.ToString()));
-                            Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
+                                workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("PersonWorkEfficiency" + i.ToString()));
-                            workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
+                                BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
-                            workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
+                            }
-                            workEfficiency.Month = month;
+                            for (int i = 0; i < machineIds.Count; i++)
-                            workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
+                            {
-                            workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
+                                Model.ZHGL_ConstructionLogWorkEfficiencyMonth workEfficiency = new Model.ZHGL_ConstructionLogWorkEfficiencyMonth();
-                            workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
+                                workEfficiency.ConstructionLogWorkEfficiencyMonthId = SQLHelper.GetNewID();
-                            workEfficiency.UnitOfMeasurement = unitOfMeasurement;
+                                workEfficiency.ProjectId = this.CurrUser.LoginProjectId;
-                            workEfficiency.Type = "Machine";
+                                workEfficiency.Month = month;
-                            workEfficiency.TypeId = machineIds[i];
+                                workEfficiency.ContractTrackId = this.Grid1.Rows[a].DataKeys[2].ToString();
-                            workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("MachineConsumeHours" + i.ToString()));
+                                workEfficiency.PhysicalCompletionQuantity = Funs.GetNewDecimal(physicalCompletionQuantity);
-                            workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("MachineWorkEfficiency" + i.ToString()));
+                                workEfficiency.MaterialConsumption = Funs.GetNewDecimal(materialConsumption);
-                            BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
+                                workEfficiency.UnitOfMeasurement = unitOfMeasurement;
+                                workEfficiency.Type = "Machine";
+                                workEfficiency.TypeId = machineIds[i];
+                                workEfficiency.ConsumeHours = Funs.GetNewDecimal(values.Value<string>("MachineConsumeHours" + i.ToString()));
+                                workEfficiency.WorkEfficiency = Funs.GetNewDecimal(values.Value<string>("MachineWorkEfficiency" + i.ToString()));
+                                BLL.ConstructionLogWorkEfficiencyMonthService.AddConstructionLogWorkEfficiencyMonth(workEfficiency);
+                            }
                         }
                     }
+                    ShowNotify("保存成功！", MessageBoxIcon.Success);
+                }
+                else
+                {
+                    Alert.ShowInTop("请先统计后再保存！", MessageBoxIcon.Warning);
                 }
-                ShowNotify("保存成功！", MessageBoxIcon.Success);
             }
             else
             {

SGGL/FineUIPro.Web/PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx.designer.cs

@@ -66,6 +66,24 @@ namespace FineUIPro.Web.PZHGL.InformationProject {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtMonth;
         
+        /// <summary>
+        /// drpContractNo 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpContractNo;
+        
+        /// <summary>
+        /// lblUnitName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Label lblUnitName;
+        
         /// <summary>
         /// hdId 控件。
         /// </summary>

SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs

@@ -303,25 +303,55 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 {
                     foreach (var personLog in personLogs)
                     {
-                        if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
+                        var projectUser = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, personLog.CompileMan);
+                        if (projectUser != null)
                         {
-                            Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
+                            if (projectUser.WorkPostId != BLL.Const.WorkPost_ConstructionManager)
-                            hse.ConstructionLogId = personLog.ConstructionLogId;
+                            {
-                            hse.HSETodaySummary = personLog.HSETodaySummary;
+                                if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
-                            hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
+                                {
-                            hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
+                                    Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
-                            hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
+                                    hse.ConstructionLogId = personLog.ConstructionLogId;
-                            hses.Add(hse);
+                                    hse.HSETodaySummary = personLog.HSETodaySummary;
+                                    hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
+                                    hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
+                                    hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
+                                    hses.Add(hse);
+                                }
+                                if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
+                                {
+                                    Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
+                                    cqms.ConstructionLogId = personLog.ConstructionLogId;
+                                    cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
+                                    cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
+                                    cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
+                                    cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
+                                    cqmss.Add(cqms);
+                                }
+                            }
                         }
-                        if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
+                        else
                         {
-                            Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
+                            if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
-                            cqms.ConstructionLogId = personLog.ConstructionLogId;
+                            {
-                            cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
+                                Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
-                            cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
+                                hse.ConstructionLogId = personLog.ConstructionLogId;
-                            cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
+                                hse.HSETodaySummary = personLog.HSETodaySummary;
-                            cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
+                                hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
-                            cqmss.Add(cqms);
+                                hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
+                                hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
+                                hses.Add(hse);
+                            }
+                            if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
+                            {
+                                Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
+                                cqms.ConstructionLogId = personLog.ConstructionLogId;
+                                cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
+                                cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
+                                cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
+                                cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
+                                cqmss.Add(cqms);
+                            }
                         }
                     }
                     this.GridHSETodaySummary.DataSource = hses;

SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLogWorkEfficiency.aspx

@@ -37,13 +37,13 @@
                         <f:RenderField Width="75px" ColumnID="Code" DataField="Code" FieldType="String" EnableLock="true" Locked="true"
                             HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
+                        <f:RenderField Width="65" ColumnID="MainItemCode" DataField="MainItemCode" SortField="MainItemCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="主项号" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="MainItemName" DataField="MainItemName" SortField="MainItemName" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="主项名称" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
-                        <f:RenderField Width="100px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
+                        <f:RenderField Width="60px" ColumnID="MajorCode" DataField="MajorCode" SortField="MajorCode" EnableLock="true" Locked="true"
                             FieldType="String" HeaderText="专业代码" TextAlign="Left" HeaderTextAlign="Center">
                         </f:RenderField>
                         <f:RenderField Width="100px" ColumnID="MajorName" DataField="MajorName" SortField="MajorName" EnableLock="true" Locked="true"

SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx

@@ -54,6 +54,9 @@
                     <f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
                         HeaderText="项目代号">
                     </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
+                        HeaderText="项目编码">
+                    </f:RenderField>
                     <f:RenderField Width="200px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
                         FieldType="String" HeaderText="项目名称"  HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>

SGGL/FineUIPro.Web/ProjectData/ProjectList.aspx.cs

@@ -34,7 +34,7 @@ namespace FineUIPro.Web.ProjectData
         /// </summary>
         private void BindGrid()
         {
-            string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
+            string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ShortName, ConstructionMoney,"
                           + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工'  ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
                           + @" ,ProjectMoney,DATEDIFF(DAY,Project.StartDate,GETDATE()) AS DayCount,ProjectType.ProjectTypeName AS ProjectTypeName"
                           + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx

@@ -57,6 +57,9 @@
                     <f:RenderField Width="100px" ColumnID="ProjectCode" DataField="ProjectCode" SortField="ProjectCode" FieldType="String"
                         HeaderText="项目号">
                     </f:RenderField>
+                    <f:RenderField Width="100px" ColumnID="ProjectRealCode" DataField="ProjectRealCode" SortField="ProjectRealCode" FieldType="String"
+                        HeaderText="项目编码">
+                    </f:RenderField>
                     <f:RenderField Width="300px" ColumnID="ProjectName" DataField="ProjectName" SortField="ProjectName"
                         FieldType="String" HeaderText="项目名称"  HeaderTextAlign="Center" TextAlign="Left">
                     </f:RenderField>

SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs

@@ -35,7 +35,7 @@ namespace FineUIPro.Web.ProjectData
         /// </summary>
         private void BindGrid()
         {
-            string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
+            string strSql = "SELECT Project.ProjectId,Project.ProjectCode,Project.ProjectName,Project.ProjectRealCode,unit.UnitName,Project.StartDate,Project.EndDate,Project.ProjectAddress,ProjectType.ProjectTypeName AS ProjectTypeName,ShortName, "
                           + @" (CASE WHEN ProjectState='" + BLL.Const.ProjectState_2 + "' THEN '暂停中' WHEN ProjectState='" + BLL.Const.ProjectState_3 + "' THEN '已完工'  ELSE '施工中' END) AS ProjectStateName,Project.ProjectState"
                           + @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId"
                           + @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx

@@ -126,6 +126,16 @@
                     
                 </Items>
             </f:FormRow>   
+            <f:FormRow>
+               <Items>
+                   <f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50" 
+                    ShowRedStar="true"></f:TextBox>
+                </Items>
+                <Items>
+                   <f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
+                       MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
+                </Items>
+            </f:FormRow>
         </rows>
         <toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs

@@ -100,6 +100,7 @@ namespace FineUIPro.Web.ProjectData
                         }
                         this.txtCity.Text = project.City;
                         this.txtEnglishRemark.Text = project.EnglishRemark;
+                        this.txtProjectRealCode.Text = project.ProjectRealCode;
                     }
                 }
                 else
@@ -141,6 +142,7 @@ namespace FineUIPro.Web.ProjectData
                 Country = this.txtCountry.Text.Trim(),
                 City = this.txtCity.Text.Trim(),
                 EnglishRemark = this.txtEnglishRemark.Text.Trim(),
+                ProjectRealCode=this.txtProjectRealCode.Text.Trim(),
             };
 
             if (!string.IsNullOrEmpty(txtStartDate.Text.Trim()))

SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.ProjectData
+namespace FineUIPro.Web.ProjectData {
-{
+    
-
+    
-
+    public partial class ProjectSetSave {
-    public partial class ProjectSetSave
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// txtProjectName 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectName;
-
+        
         /// <summary>
         /// txtProjectCode 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
-
+        
         /// <summary>
         /// txtShortName 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtShortName;
-
+        
         /// <summary>
         /// drpProjectType 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectType;
-
+        
         /// <summary>
         /// drpProjectState 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectState;
-
+        
         /// <summary>
         /// txtStartDate 控件。
         /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtStartDate;
-
+        
         /// <summary>
         /// txtEndDate 控件。
         /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEndDate;
-
+        
         /// <summary>
         /// txtContractNo 控件。
         /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtContractNo;
-
+        
         /// <summary>
         /// txtDuration 控件。
         /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtDuration;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// ckbIsForeign 控件。
         /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckbIsForeign;
-
+        
         /// <summary>
         /// drpProjectManager 控件。
         /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectManager;
-
+        
         /// <summary>
         /// drpConstructionManager 控件。
         /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpConstructionManager;
-
+        
         /// <summary>
         /// drpHSSEManager 控件。
         /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpHSSEManager;
-
+        
         /// <summary>
         /// txtProjectAddress 控件。
         /// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectAddress;
-
+        
         /// <summary>
         /// txtWorkRange 控件。
         /// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtWorkRange;
-
+        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextArea txtRemark;
-
+        
         /// <summary>
         /// txtProjectMoney 控件。
         /// </summary>
@@ -202,7 +200,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtProjectMoney;
-
+        
         /// <summary>
         /// txtConstructionMoney 控件。
         /// </summary>
@@ -211,7 +209,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.NumberBox txtConstructionMoney;
-
+        
         /// <summary>
         /// txtTelephone 控件。
         /// </summary>
@@ -220,7 +218,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTelephone;
-
+        
         /// <summary>
         /// txtCountry 控件。
         /// </summary>
@@ -229,7 +227,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCountry;
-
+        
         /// <summary>
         /// drpProvince 控件。
         /// </summary>
@@ -238,7 +236,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProvince;
-
+        
         /// <summary>
         /// txtCity 控件。
         /// </summary>
@@ -247,7 +245,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCity;
-
+        
         /// <summary>
         /// txtMapCoordinates 控件。
         /// </summary>
@@ -256,7 +254,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtMapCoordinates;
-
+        
         /// <summary>
         /// bottomPanel 控件。
         /// </summary>
@@ -265,7 +263,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ContentPanel bottomPanel;
-
+        
         /// <summary>
         /// txtEnglishRemark 控件。
         /// </summary>
@@ -274,7 +272,25 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtEnglishRemark;
-
+        
+        /// <summary>
+        /// txtProjectRealCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectRealCode;
+        
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -283,7 +299,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// ckIsUpTotalMonth 控件。
         /// </summary>
@@ -292,7 +308,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsUpTotalMonth;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -301,7 +317,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -310,7 +326,7 @@ namespace FineUIPro.Web.ProjectData
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-
+        
         /// <summary>
         /// hdCompileMan 控件。
         /// </summary>

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx

@@ -96,10 +96,20 @@
             </f:FormRow>     
             <f:FormRow>
                  <Items>
-                    <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true"></f:TextBox>
+                    <f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" Readonly="true" LabelWidth="150px"></f:TextBox>
                      <f:Label ID="lb1" runat="server"></f:Label>
                 </Items>
             </f:FormRow>   
+            <f:FormRow>
+               <Items>
+                   <f:TextBox ID="txtProjectRealCode" runat="server" Label="项目编码" Required="true" MaxLength="50" Readonly="true" LabelWidth="150px"
+                    ShowRedStar="true"></f:TextBox>
+                </Items>
+                <Items>
+                   <f:TextBox ID="TextBox2" runat="server" Label="" LabelWidth="150px" Hidden="true"
+                       MaxLength="6" Required="true" ShowRedStar="true"></f:TextBox>
+                </Items>
+            </f:FormRow>
         </rows>
         <toolbars>
             <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.cs

@@ -89,6 +89,7 @@ namespace FineUIPro.Web.ProjectData
                         this.txtProvince.Text = project.Province;
                         this.txtCity.Text = project.City;
                         this.txtEnglishRemark.Text = project.EnglishRemark;
+                        this.txtProjectRealCode.Text = project.ProjectRealCode;
                     }
                 }
             }

SGGL/FineUIPro.Web/ProjectData/ProjectSetView.aspx.designer.cs

@@ -264,6 +264,24 @@ namespace FineUIPro.Web.ProjectData {
         /// </remarks>
         protected global::FineUIPro.Label lb1;
         
+        /// <summary>
+        /// txtProjectRealCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectRealCode;
+        
+        /// <summary>
+        /// TextBox2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox TextBox2;
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>

SGGL/FineUIPro.Web/common/Menu_DigData.xml

@@ -1,51 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl="">
+  <TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl="">
-    <TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl="">
+    <TreeNode id="0E9C6A47-E410-43C4-95D1-1EC1C01E9967" Text="WBS数据仓库" NavigateUrl="DigData/WBSDW.aspx">
-      <TreeNode id="8B550B58-C681-4F34-83F0-F1E99CE04A47" Text="国内标准" NavigateUrl="">
+    </TreeNode>
-      </TreeNode>
+<TreeNode id="92B50285-30BD-4B62-9E23-A0D6B4BA1577" Text="项目数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
-<TreeNode id="97D1E401-EA0F-4C90-B7DC-61D568BAE617" Text="国外标准" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""><TreeNode id="2C7F78D3-DA7B-4193-A37F-CC479E4B9583" Text="法律法规" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""><TreeNode id="406EBAAB-05B2-4249-BAC2-5589F50AE365" Text="企业标准" NavigateUrl=""></TreeNode>
-<TreeNode id="59F3FA81-7D08-4611-A3FF-22BFA656A940" Text="企业制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" 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="499E23C1-057C-4B04-B92A-973B1DACD546" Text="赛鼎制度" NavigateUrl="HSSE/HSSESystem/SafetyInstitution.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>
-</TreeNode>
-<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
-<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
-<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
-<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
-<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
-<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
-<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
-<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
-<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
-<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
-<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
-<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
-</TreeNode>
-</TreeNode>
-<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
-<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
-<TreeNode id="FF0D9166-4509-4411-8039-F035BC251114" Text="数据仓库" NavigateUrl=""><TreeNode id="AA670914-6EAA-4CFA-8BD6-E0648F8FD21C" Text="安全数据库" NavigateUrl=""><TreeNode id="E1ABD1B1-1563-433A-972B-555076A96D06" Text="安全数据库" NavigateUrl="DigData/HSEDataDW.aspx"></TreeNode>
-<TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
 <TreeNode id="04B182E4-D31E-449F-9803-322F3F380D89" Text="HSE日常检查问题分析" NavigateUrl="DigData/DailyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="24939ABD-E174-4C3D-8B04-494917B7BE40" Text="HSE隐患整改问题分析" NavigateUrl="DigData/RectifyProblemAnalysis.aspx"></TreeNode>
 <TreeNode id="4B2E7EE5-AC7C-4143-B5BC-60080C763A24" Text="HSE教育培训统计" NavigateUrl="DigData/TrainRecordAnalysis.aspx"></TreeNode>
@@ -58,15 +16,12 @@
 <TreeNode id="A20E2443-A118-4C67-9084-FFEB685CA539" Text="清单子目使用率及价格走势图" NavigateUrl=""></TreeNode>
 <TreeNode id="6D1F3A3F-EFD1-420A-87E7-8CFAEF971165" Text="日工效统计" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="5BE7F83B-C02D-4481-815F-153279B44C39" Text="劳务数据库" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="AF5C32FD-F0CB-404E-B56D-C4AE79A8A050" Text="人员功效分析" NavigateUrl=""></TreeNode>
-<TreeNode id="0DB6BB5F-B17A-4A38-AABB-278300EA9E39" Text="员工产值分析" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="B87413D8-4EFB-42F3-A4F6-9D21C0CD3DFE" Text="数据分析室" NavigateUrl=""><TreeNode id="CFEF47C0-8EFA-46FF-8648-5B1922519DCC" Text="WBS数据分析" NavigateUrl="DigData/WBSAnalysis.aspx"></TreeNode>
-<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="B146FC96-B199-426B-8504-4BE093C0DCB1" Text="项目数据汇总分析" NavigateUrl=""><TreeNode id="427AB060-2510-4568-B85B-AD6796EBE569" Text="项目HSE数据汇总" NavigateUrl="DigData/HSEDataCollect.aspx"></TreeNode>
-<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="DD960B76-1F33-468B-9FEF-76328235C079" Text="项目质量数据汇总" NavigateUrl="DigData/CQMSDataCollect.aspx"></TreeNode>
-<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="A705738B-D0A2-41D2-A01A-18774B5AED49" Text="项目施工数据汇总" NavigateUrl=""></TreeNode>
-<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
+</TreeNode>
 </TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_HTGL.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="E9D387EB-2797-43E3-AACE-93413839CCF7" Text="合同管理" NavigateUrl="">
+  <TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl="">
-  </TreeNode>
+    <TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx">
-<TreeNode id="E36CBDD0-2E49-415E-BBE7-B8222F40D749" Text="合同模板" NavigateUrl=""><TreeNode id="C141ABE5-E377-45C1-9507-E723C40099B8" Text="基本信息" NavigateUrl="PHTGL/ContractCompile/Contract.aspx"></TreeNode>
+    </TreeNode>
 <TreeNode id="C5560FF5-8181-4BA2-8326-D2B49E45660C" Text="合同协议书" NavigateUrl="PHTGL/ContractCompile/ContractAgreementEdit.aspx"></TreeNode>
 <TreeNode id="98573D16-3310-4292-96A5-A59B9A5E6B6B" Text="通用条款" NavigateUrl="PHTGL/ContractCompile/GeneralTermsConditions.aspx"></TreeNode>
 <TreeNode id="98367C43-9C85-467E-9144-288D80101E41" Text="专用条款" NavigateUrl="PHTGL/ContractCompile/SpecialTermsConditions.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="E3978B9E-89D7-4B23-B44B-A680FAFA0443" Text="施工长名单管理" NavigateUrl=""><TreeNode id="9C4E7381-4080-4082-8C4D-B041149D48C7" Text="施工长名单入网申请" NavigateUrl="PHTGL/LongListManager/LongListNetApplication.aspx"></TreeNode>
-</TreeNode>
 <TreeNode id="C18B4A2E-7BE7-43E6-A969-8A6292D19987" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx"></TreeNode>
 <TreeNode id="0A5DF9F5-B6B5-41B8-8951-C203C5749495" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractStandingBook.aspx"></TreeNode>
 <TreeNode id="8213BE20-2680-4A13-91B8-49028BB89869" Text="工程量清单" NavigateUrl=""><TreeNode id="326AA80C-6B01-4214-ACF2-B29595BA28D5" Text="土建工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=0"></TreeNode>
@@ -16,10 +14,7 @@
 <TreeNode id="0E04FA16-FFA6-4987-A0A5-A4658F0099F2" Text="工艺管道安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=2"></TreeNode>
 <TreeNode id="FAC4F0F7-A7C0-4F66-8BCB-846C082BCA40" Text="工艺设备安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=3"></TreeNode>
 <TreeNode id="10586190-0FDD-4DA8-A877-CE4599D6F0DF" Text="非标设备现场制作安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=4"></TreeNode>
-<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl=""><TreeNode id="3593DF22-78C1-4A73-8468-B20CB44D88C9" Text="电气工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.1"></TreeNode>
+<TreeNode id="1C770E20-7912-484C-9739-499B1B2F8DEB" Text="电仪安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5"></TreeNode>
-<TreeNode id="3ECE6333-6785-424D-996E-B923A650D8C7" Text="仪表工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.2"></TreeNode>
-<TreeNode id="480F8C85-F5F2-4C5C-BE72-2ADABB7250CF" Text="电信工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=5.3"></TreeNode>
-</TreeNode>
 <TreeNode id="92101A90-9C22-4B43-B012-9AFF8402F85D" Text="水暖安装工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=6"></TreeNode>
 <TreeNode id="33A03E2C-4E00-4722-AA14-F50419468154" Text="防腐绝热工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=7"></TreeNode>
 <TreeNode id="A5A31FE8-0643-4396-99E3-A4A31A947789" Text="无损检测工程" NavigateUrl="PHTGL/BillOfQuantities/TemQuantityList.aspx?Type=8"></TreeNode>

SGGL/FineUIPro.Web/common/Menu_JDGL.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Tree>
-  <TreeNode id="BAC3D994-03A8-466C-8975-A31039998BCC" Text="施工进度统计" NavigateUrl="JDGL/Check/ProgressShow.aspx">
+  <TreeNode id="E23F0879-3E9F-4E7B-9A2D-EFF34798D629" Text="进度计划编制" NavigateUrl="JDGL/Check/PlanSet.aspx">
   </TreeNode>
-<TreeNode id="1172B112-2A12-4410-AD66-E5BA6B461475" Text="施工进度赢得值曲线" NavigateUrl="JDGL/Check/ProgressStatistics.aspx"></TreeNode>
 <TreeNode id="B479EC55-E12A-4F91-AF3F-864DAAA136FB" Text="进度完成情况录入" NavigateUrl="JDGL/Check/CompleteInput.aspx"></TreeNode>
-<TreeNode id="4288426D-E49B-4E5D-A495-7E6A76F269B5" Text="周计划" NavigateUrl=""></TreeNode>
 <TreeNode id="F0E296C3-6499-43E5-88CD-E00C5180D3BC" Text="赢得值曲线" NavigateUrl="JDGL/Check/EarnedValueCurve.aspx"></TreeNode>
-<TreeNode id="C75F0853-8A2B-4B32-83B7-509278D11957" Text="项目里程碑节点" NavigateUrl=""></TreeNode>
-<TreeNode id="3550F422-E520-4962-9816-B691B0EE2865" Text="形象进度照片" NavigateUrl=""></TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_PHTGL.xml

@@ -13,15 +13,7 @@
 <TreeNode id="B32E7F62-5AA3-46B2-A438-E286909A47B4" Text="合同评审" NavigateUrl="PHTGL/ContractCompile/ContractReview_Countersign.aspx"></TreeNode>
 <TreeNode id="E50F243C-CE5A-4174-B473-15CD565A7796" Text="合同审批" NavigateUrl="PHTGL/ContractCompile/ContractReview.aspx"></TreeNode>
 </TreeNode>
-<TreeNode id="79A6D6B1-E29F-4921-8867-142CEED7997B" Text="数据中心" NavigateUrl=""><TreeNode id="FBCCEE66-D3EF-4275-A7EA-6A8796D6FD4E" Text="招标管理" NavigateUrl=""><TreeNode id="E4095CAC-E016-4D63-9A7A-580B51DC96FF" Text="施工分包实施计划管理" NavigateUrl="PHTGL/Filing/ActionPlanFile.aspx"></TreeNode>
+<TreeNode id="79A6D6B1-E29F-4921-8867-142CEED7997B" Text="数据中心" NavigateUrl=""><TreeNode id="11f4f882-28a9-4610-a657-6a58336097d2" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1"></TreeNode>
-<TreeNode id="2A1EB845-847A-4722-8A22-7DB9DB914C88" Text="招标文件管理" NavigateUrl="PHTGL/Filing/BidDocumentsFile.aspx"></TreeNode>
-<TreeNode id="99F81507-2121-4442-ABB9-1D2F60FC0AC6" Text="评标专家" NavigateUrl="PHTGL/Filing/ApproveUserFile.aspx"></TreeNode>
-<TreeNode id="60F42D82-7890-47A5-9108-FE60F8DAE384" Text="评标结果" NavigateUrl="PHTGL/Filing/SetSubFile.aspx"></TreeNode>
-</TreeNode>
-<TreeNode id="88CB0F1B-2516-4B4A-A61E-CD0FA94DEEBF" Text="合同管理" NavigateUrl=""><TreeNode id="7E03F115-B80E-41BA-926D-CFE1BA5FD1C1" Text="施工分包合同" NavigateUrl="PHTGL/Filing/ContractFile.aspx"></TreeNode>
-<TreeNode id="9D9A32F9-9FEF-455A-BD90-D8CBC2DE612F" Text="施工分包合同跟踪" NavigateUrl=""></TreeNode>
-</TreeNode>
-<TreeNode id="11f4f882-28a9-4610-a657-6a58336097d2" Text="招标工作台账" NavigateUrl="PHTGL/Filing/BidDocumentsStandingBook.aspx?Type=1"></TreeNode>
 <TreeNode id="dedaf6f6-af14-4e4e-9fc6-164aa808cab9" Text="合同台账" NavigateUrl="PHTGL/Filing/ContractFile.aspx"></TreeNode>
 <TreeNode id="9a772430-8a74-4d70-876d-136db8ce01a4" Text="文件归档" NavigateUrl="PHTGL/Filing/Files.aspx"></TreeNode>
 </TreeNode>
@@ -35,8 +27,13 @@
 <TreeNode id="48216E20-7103-48AB-A12F-237E28605952" Text="消防电信" NavigateUrl=""></TreeNode>
 <TreeNode id="5EB73242-63F0-402C-A42B-2BCDC0AC2229" Text="临建设施" NavigateUrl=""></TreeNode>
 </TreeNode>
-<TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
+<TreeNode id="73B84D49-940A-42DF-AC14-F4C75E10EC39" Text="合同执行跟踪" NavigateUrl=""><TreeNode id="D9BAB30E-3255-4EA0-8631-EF15C9203EFD" Text="合同价格信息" NavigateUrl="PHTGL/ContractCompile/ContractTrackList.aspx"></TreeNode>
 <TreeNode id="98269480-3F36-4169-A91D-16144D903C6C" Text="WBS工作包" NavigateUrl="PHTGL/ContractCompile/ContractWBS.aspx"></TreeNode>
 <TreeNode id="D715B66F-8E99-498F-87DA-E85B4B8EB923" Text="费用对比统计" NavigateUrl="PHTGL/ContractCompile/ContractTrackComparison.aspx"></TreeNode>
 <TreeNode id="F545E899-B3B5-4B49-A741-DE19356553D5" Text="进度检测" NavigateUrl="PHTGL/ContractCompile/ContractTrackProgressDetection.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="A9BBF623-83AC-4353-A010-07A5D4CEB7D1" Text="工效统计" NavigateUrl=""><TreeNode id="118B3E91-073B-468C-BDE3-DD6DCF6034C6" Text="日工效统计" NavigateUrl="PZHGL/InformationProject/DayConstructionLogWorkEfficiency.aspx"></TreeNode>
+<TreeNode id="4EDB3CB9-9FB6-4D63-802F-83C3FB3CA6B1" Text="月平均工效统计" NavigateUrl="PZHGL/InformationProject/MonthConstructionLogWorkEfficiencySum.aspx"></TreeNode>
+<TreeNode id="D791C4E1-7CF1-4F4E-9457-0CF91ACDB987" Text="项目平均工效统计" NavigateUrl="PZHGL/InformationProject/ProjectConstructionLogWorkEfficiencySum.aspx"></TreeNode>
+</TreeNode>
 </Tree>

SGGL/FineUIPro.Web/common/Menu_ZHGL.xml

@@ -48,6 +48,43 @@
 <TreeNode id="3BBFCD70-D7A3-435C-9571-DD499D5ED7B8" Text="应急信息" NavigateUrl=""><TreeNode id="D12C2412-E12A-4F78-9AEF-1EE8AC84A561" Text="应急预案管理清单" NavigateUrl="ZHGL/Emergency/EmergencyList.aspx"></TreeNode>
 <TreeNode id="172F25E0-F5E2-42E3-AD67-AC824D4E0FBB" Text="应急演练开展情况" NavigateUrl="ZHGL/Emergency/DrillRecordList.aspx"></TreeNode>
 </TreeNode>
+<TreeNode id="6A992AB8-A32D-448F-B06F-8DD4C112CC91" Text="法律法规制度标准库" NavigateUrl=""><TreeNode id="CF1F59BB-215A-4E9D-9F19-DE188D322477" Text="标准分类" NavigateUrl=""></TreeNode>
+<TreeNode id="DC3C36E0-4CD4-43E1-9CF8-D98D053E31FB" Text="法律法规" NavigateUrl=""></TreeNode>
+<TreeNode id="97D20BA1-9378-4268-901B-3747EDFB15F4" Text="赛鼎体系" NavigateUrl=""></TreeNode>
+<TreeNode id="35092B0F-1B7B-4014-A41D-41354FD87374" Text="遵照执行的集团制度" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="BAEBE57F-2858-49E0-BEFE-4D2FDF2FA4FE" Text="公共资源库" NavigateUrl=""><TreeNode id="664094A9-3DEF-4674-8FE2-ACF30B71B8DB" Text="安全公共资源库" NavigateUrl=""><TreeNode id="FDVXFGDS-5THM-CCDE-DCS2-TGHNO48F7UKM" Text="安全合规" NavigateUrl=""></TreeNode>
+<TreeNode id="2B49BFE2-734F-489E-91B9-D05F02E1976D" Text="安全生产责任制" NavigateUrl=""><TreeNode id="1DB91420-47D3-4219-AAB4-7E613FCBCC90" Text="安全主体责任" NavigateUrl="HSSE/HSSESystem/HSSEMainDuty.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="E26D223B-4CA2-4A6D-82D0-224CC9C8676D" Text="安全教育" NavigateUrl=""><TreeNode id="9D99A981-7380-4085-84FA-8C3B1AFA6202" Text="培训教材库" NavigateUrl="HSSE/EduTrain/TrainDB.aspx"></TreeNode>
+<TreeNode id="9D4F76A1-CD2E-4E66-B833-49425CD879EB" Text="公司教材库" NavigateUrl="HSSE/EduTrain/CompanyTraining.aspx"></TreeNode>
+<TreeNode id="4D6BD686-DA06-45CC-9DB8-54B342651724" Text="考试试题库" NavigateUrl="HSSE/EduTrain/TestTraining.aspx"></TreeNode>
+<TreeNode id="F58EE8ED-9EB5-47C7-9D7F-D751EFEA44CA" Text="安全试题库" NavigateUrl="HSSE/EduTrain/TrainTestDB.aspx"></TreeNode>
+<TreeNode id="D86917DB-D00A-4E18-9793-C290B5BBA84C" Text="事故案例库" NavigateUrl="HSSE/EduTrain/AccidentCase.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="D70D9BF5-C72E-414D-941B-CF9B4065F6BA" Text="安全技术" NavigateUrl=""><TreeNode id="8333727B-A2CE-4CE2-A019-21AC9EE61A4C" Text="危险源清单" NavigateUrl="HSSE/Technique/HazardList.aspx"></TreeNode>
+<TreeNode id="C0018E8C-C88B-4E25-BCFC-F0BF3CACC63A" Text="公司危险源清单" NavigateUrl="HSSE/Technique/CompanyHazardList.aspx"></TreeNode>
+<TreeNode id="773B59F9-61F9-4F5E-9D68-A1BF9322AFFA" Text="环境因素危险源" NavigateUrl="HSSE/Technique/Environmental.aspx"></TreeNode>
+<TreeNode id="DC2AA8C2-82A8-4F7A-832D-9889C65AA228" Text="公司环境因素危险源" NavigateUrl="HSSE/Technique/CompanyEnvironmental.aspx"></TreeNode>
+<TreeNode id="2D86AD87-4108-428C-BA3D-F81FB85511FE" Text="安全隐患" NavigateUrl="HSSE/Technique/Rectify.aspx"></TreeNode>
+<TreeNode id="9C26BF2A-091D-4AC3-8678-334DE4E1CED7" Text="项目安全检查项" NavigateUrl="HSSE/Technique/CheckItemSet.aspx"></TreeNode>
+<TreeNode id="D11BFC83-BE64-457D-B8FA-11C37D35CD72" Text="应急预案" NavigateUrl="HSSE/Technique/Emergency.aspx"></TreeNode>
+<TreeNode id="3E2F2FFD-ED2E-4914-8370-D97A68398814" Text="施工方案" NavigateUrl="HSSE/Technique/SpecialScheme.aspx"></TreeNode>
+</TreeNode>
+<TreeNode id="1B688B07-AEF4-43D8-BF31-1907522967ED" Text="标牌管理" NavigateUrl=""><TreeNode id="022CA9C1-70F0-4C07-996C-0736D32B442A" Text="标牌管理" NavigateUrl="HSSE/Resources/SignManage.aspx"></TreeNode>
+</TreeNode>
+</TreeNode>
+<TreeNode id="34705FFF-0BA5-4C4F-BD70-721AA0EF874F" Text="质量公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="AB48BB81-A0F1-4E90-9E01-3F203E5ACFDE" Text="施工公共资源库" NavigateUrl=""></TreeNode>
+<TreeNode id="EDDED4C1-B01E-4831-8552-38CB30CE8817" Text="开车公共资源库" NavigateUrl=""></TreeNode>
+</TreeNode>
+<TreeNode id="DCVVBDE3-1B48-4615-FCD0-VDBCDS3ET4D9" Text="施工WBS基础数据库" NavigateUrl="CQMS/WBS/ControlItemInitSet.aspx"></TreeNode>
+<TreeNode id="6136C2AE-2AF8-498D-BC19-7D693841239C" Text="文件柜" NavigateUrl=""><TreeNode id="506F42F3-F4CF-46A7-AC90-787117B4F1DC" Text="安全文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="A90460D0-2658-43F7-9558-A72E91E54ABD" Text="质量文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="2539A5CE-E209-4A16-A9B7-4C43E4E3CBEC" Text="进度文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="8FB0A651-485F-4413-BCD6-22BF82438125" Text="焊接文件柜" NavigateUrl=""></TreeNode>
+<TreeNode id="F596EC1A-71A3-4B34-B36C-68628F2F42FE" Text="合同文件柜" NavigateUrl=""></TreeNode>
+</TreeNode>
 <TreeNode id="1E216BE3-DB22-4649-BD9A-0777B0DC03E6" Text="QHSE上报" NavigateUrl=""><TreeNode id="94F94EC1-54B3-4BEB-A019-0A755A66D8FD" Text="安全数据" NavigateUrl="ZHGL/DataSync/HSSEData_HSSE.aspx"></TreeNode>
 <TreeNode id="4C9920AE-F335-48B1-BDB0-276173305952" Text="质量数据" NavigateUrl="ZHGL/DataSync/CQMSData_CQMS.aspx"></TreeNode>
 <TreeNode id="2110702F-4E12-479A-8EA1-E5A8EEF77276" Text="焊接数据" NavigateUrl="ZHGL/DataSync/HJGLData_HJGL.aspx"></TreeNode>

SGGL/Model/Model.cs

@@ -23808,6 +23808,8 @@ namespace Model
 		
 		private string _EnglishRemark;
 		
+		private string _ProjectRealCode;
+		
 		private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
 		
 		private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@@ -24224,6 +24226,8 @@ namespace Model
     partial void OnTelephoneChanged();
     partial void OnEnglishRemarkChanging(string value);
     partial void OnEnglishRemarkChanged();
+    partial void OnProjectRealCodeChanging(string value);
+    partial void OnProjectRealCodeChanged();
     #endregion
 		
 		public Base_Project()
@@ -24977,6 +24981,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectRealCode", DbType="NVarChar(50)")]
+		public string ProjectRealCode
+		{
+			get
+			{
+				return this._ProjectRealCode;
+			}
+			set
+			{
+				if ((this._ProjectRealCode != value))
+				{
+					this.OnProjectRealCodeChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectRealCode = value;
+					this.SendPropertyChanged("ProjectRealCode");
+					this.OnProjectRealCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
 		{