diff --git a/CreateModel.bat b/CreateModel.bat index 7f29540..2b82dc5 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -27,7 +27,7 @@ REM -------------- @echo. @call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:.\SQL2016 /database:EProjectDB /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2022 /database:EProjectDB /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO pause diff --git a/EProject/BLL/Common/CommonService.cs b/EProject/BLL/Common/CommonService.cs index 1270efa..149bd2c 100644 --- a/EProject/BLL/Common/CommonService.cs +++ b/EProject/BLL/Common/CommonService.cs @@ -293,7 +293,10 @@ namespace BLL if (user.UserId == Const.GlyId) //// 如果是管理员或者本部人员返回所有菜单 { var sysMenu = from x in Funs.DB.Sys_Menu orderby x.SortIndex select x; - reMenuList = sysMenu.ToList(); + if (sysMenu.Count() > 0) + { + reMenuList = sysMenu.ToList(); + } } else { @@ -302,7 +305,10 @@ namespace BLL where y.RoleId == user.RoleId orderby x.SortIndex select x; - reMenuList = sysMenuRole.ToList(); + if (sysMenuRole.Count() > 0) + { + reMenuList = sysMenuRole.ToList(); + } // PM,EM,CM权限特殊处理 List pm = (from x in Funs.DB.Editor_EProject select x.ProjectControl_ProjectManagerId).ToList(); @@ -312,13 +318,19 @@ namespace BLL { Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First(); Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.PMEditorMenuId select x).First(); - reMenuList.Add(addMenu); + if (addMenu != null) + { + reMenuList.Add(addMenu); + } } if (cm.Contains(user.UserId)) { Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "1FA19FE4-D8B9-4D1B-8EB0-CAC05B71AFBB" select x).First(); Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.CMEditorMenuId select x).First(); - reMenuList.Add(addMenu); + if (addMenu != null) + { + reMenuList.Add(addMenu); + } } // 对资源模块的特殊处理:CTE/M具有RP权限 @@ -326,8 +338,14 @@ namespace BLL { Model.Sys_Menu addSupMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == "72CDB9E2-F44B-4F96-A578-3271211FDC15" select x).First(); Model.Sys_Menu addMenu = (from x in Funs.DB.Sys_Menu where x.MenuId == Const.ResourcePlanMenuId select x).First(); - reMenuList.Add(addSupMenu); - reMenuList.Add(addMenu); + if (addSupMenu != null) + { + reMenuList.Add(addSupMenu); + } + if (addMenu != null) + { + reMenuList.Add(addMenu); + } } } diff --git a/EProject/EProject.sln b/EProject/EProject.sln index 06bbbcc..31f4cbf 100644 --- a/EProject/EProject.sln +++ b/EProject/EProject.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.572 +# Visual Studio Version 17 +VisualStudioVersion = 17.11.35312.102 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}" EndProject diff --git a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx index 6790b09..ca223d7 100644 --- a/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx +++ b/EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx @@ -41,7 +41,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx b/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx index 03677e3..b85bd17 100644 Binary files a/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx and b/EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx differ diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs index c734e7a..02c0209 100644 --- a/EProject/FineUIPro.Web/Global.asax.cs +++ b/EProject/FineUIPro.Web/Global.asax.cs @@ -108,7 +108,7 @@ } // MC证书提醒 - if ((DateTime.Now.Day == 1 || DateTime.Now.Day == 16) && DateTime.Now.Hour == 10) + if ((DateTime.Now.Day == 1 || DateTime.Now.Day == 16) && DateTime.Now.Hour == 14) { System.Timers.Timer aTimer = new System.Timers.Timer(); //1小时执行一次 diff --git a/EProject/FineUIPro.Web/ManHours/ManHoursActual.aspx.cs b/EProject/FineUIPro.Web/ManHours/ManHoursActual.aspx.cs index 373804e..78a90d1 100644 --- a/EProject/FineUIPro.Web/ManHours/ManHoursActual.aspx.cs +++ b/EProject/FineUIPro.Web/ManHours/ManHoursActual.aspx.cs @@ -380,7 +380,7 @@ namespace FineUIPro.Web.ManHours Alert.ShowInParent("Please fill in the Hours!"); return; } - Actual.Hours = int.Parse(objects["values"]["Hours"].ToString()); + Actual.Hours = Funs.GetNewDouble(objects["values"]["Hours"].ToString()); Actual.Description = objects["values"]["Description"].ToString(); actualLists.Add(Actual); diff --git a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx index bbd44f8..eae297b 100644 --- a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx +++ b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx @@ -740,6 +740,18 @@ + <%-- + --%> + + + + + + diff --git a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs index 11a2de2..3a41a2f 100644 --- a/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs +++ b/EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs @@ -1403,6 +1403,20 @@ namespace FineUIPro.Web.Report projectList.GetRow(rowIndex).GetCell(74).SetCellValue(itemOver.ProjectControl_ProjectType); projectList.GetRow(rowIndex).GetCell(74).CellStyle.SetFont(cs_content_Font); + //Engineering Remark + if (projectList.GetRow(rowIndex).GetCell(75) == null) projectList.GetRow(rowIndex).CreateCell(75); + projectList.GetRow(rowIndex).GetCell(75).SetCellValue(itemOver.PM_Remarks_Engineering); + projectList.GetRow(rowIndex).GetCell(75).CellStyle.SetFont(cs_content_Font); + + //Procurement Remark + if (projectList.GetRow(rowIndex).GetCell(76) == null) projectList.GetRow(rowIndex).CreateCell(76); + projectList.GetRow(rowIndex).GetCell(76).SetCellValue(itemOver.PM_Remarks_Procurement); + projectList.GetRow(rowIndex).GetCell(76).CellStyle.SetFont(cs_content_Font); + + //Construction Remark + if (projectList.GetRow(rowIndex).GetCell(77) == null) projectList.GetRow(rowIndex).CreateCell(77); + projectList.GetRow(rowIndex).GetCell(77).SetCellValue(itemOver.CM_Remarks_Construction); + projectList.GetRow(rowIndex).GetCell(77).CellStyle.SetFont(cs_content_Font); #endregion rowIndex++; diff --git a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx index 96915a6..8f221c4 100644 --- a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx +++ b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx @@ -20,13 +20,15 @@ - + + + + - <%----%> - @@ -87,7 +89,7 @@ - + FieldType="String" HeaderText="Account" HeaderTextAlign="Center" TextAlign="Left"> @@ -236,7 +238,7 @@ - - diff --git a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.cs b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.cs index 8adc129..439be09 100644 --- a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.cs +++ b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.cs @@ -7,6 +7,8 @@ using System.Data; using System.Data.SqlClient; using System.IO; using System.Linq; +using System.Xml.Linq; +using Org.BouncyCastle.Bcpg.OpenPgp; namespace FineUIPro.Web.Report { public partial class ProjectManhourReport : PageBase @@ -27,6 +29,7 @@ namespace FineUIPro.Web.Report ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, true); + BLL.Sys_UserService.InitCTEUserDropDownList(this.drpName, true); // 绑定表格 BindGrid(); @@ -49,6 +52,19 @@ namespace FineUIPro.Web.Report string status = String.Join(",", drpJobStatus.SelectedItemArray.Select(e => e.Text)); listStr.Add(new SqlParameter("@JobStatus", status)); } + if (!string.IsNullOrEmpty(this.txtJobNo.Text.Trim())) + { + listStr.Add(new SqlParameter("@JobNo", "%" + this.txtJobNo.Text.Trim() + "%")); + } + if (!string.IsNullOrEmpty(this.txtAccount.Text.Trim())) + { + listStr.Add(new SqlParameter("@Account", "%" + this.txtAccount.Text.Trim() + "%")); + } + if (this.drpName.SelectedValue != BLL.Const._Null && this.drpName.SelectedValue != null) + { + string name = String.Join(",", drpName.SelectedItemArray.Select(e => e.Text)); + listStr.Add(new SqlParameter("@Name", name)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("Proc_ProjectManhourReport", parameter); Grid1.RecordCount = tb.Rows.Count; @@ -289,8 +305,7 @@ namespace FineUIPro.Web.Report { BindGrid(); } - #endregion - + #endregion #region 分页、排序 /// @@ -375,6 +390,31 @@ namespace FineUIPro.Web.Report { listStr.Add(new SqlParameter("@JobStatus", null)); } + if (!string.IsNullOrEmpty(this.txtJobNo.Text.Trim())) + { + listStr.Add(new SqlParameter("@JobNo", "%" + this.txtJobNo.Text.Trim() + "%")); + } + else + { + listStr.Add(new SqlParameter("@JobNo", null)); + } + if (!string.IsNullOrEmpty(this.txtAccount.Text.Trim())) + { + listStr.Add(new SqlParameter("@Account", "%" + this.txtAccount.Text.Trim() + "%")); + } + else + { + listStr.Add(new SqlParameter("@Account", null)); + } + if (drpName.SelectedValue != BLL.Const._Null && drpName.SelectedValue != null) + { + string status = String.Join(",", drpName.SelectedItemArray.Select(x => x.Text)); + listStr.Add(new SqlParameter("@Name", status)); + } + else + { + listStr.Add(new SqlParameter("@Name", null)); + } SqlParameter[] parameter = listStr.ToArray(); DataTable table = SQLHelper.GetDataTableRunProc("Proc_ProjectManhourReport", parameter); if (table.Rows.Count > 0) diff --git a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.designer.cs b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.designer.cs index 1780352..0a02e05 100644 --- a/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.designer.cs +++ b/EProject/FineUIPro.Web/Report/ProjectManhourReport.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.Report { - - - public partial class ProjectManhourReport { - +namespace FineUIPro.Web.Report +{ + + + public partial class ProjectManhourReport + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpJobStatus 控件。 /// @@ -65,7 +67,34 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpJobStatus; - + + /// + /// txtJobNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtJobNo; + + /// + /// txtAccount 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccount; + + /// + /// drpName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpName; + /// /// btnSearch 控件。 /// @@ -74,7 +103,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSearch; - + /// /// ToolbarFill1 控件。 /// @@ -83,7 +112,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnExport 控件。 /// @@ -92,7 +121,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnExport; - + /// /// DropDowsnList1 控件。 /// @@ -101,7 +130,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDowsnList1; - + /// /// DropDownList1 控件。 /// @@ -110,7 +139,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList1; - + /// /// DropDownList2 控件。 /// @@ -119,7 +148,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList2; - + /// /// DropDownList3 控件。 /// @@ -128,7 +157,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList3; - + /// /// DropDownList4 控件。 /// @@ -137,7 +166,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList4; - + /// /// DropDownList5 控件。 /// @@ -146,7 +175,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList5; - + /// /// DropDownList6 控件。 /// @@ -155,7 +184,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList6; - + /// /// DropDownList7 控件。 /// @@ -164,7 +193,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList7; - + /// /// DropDownList8 控件。 /// @@ -173,7 +202,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList8; - + /// /// DropDownList9 控件。 /// @@ -182,7 +211,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList9; - + /// /// DropDownList10 控件。 /// @@ -191,7 +220,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList10; - + /// /// DropDownList11 控件。 /// @@ -200,7 +229,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList11; - + /// /// DropDownList12 控件。 /// @@ -209,7 +238,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList12; - + /// /// DropDownList13 控件。 /// @@ -218,7 +247,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList13; - + /// /// DropDownList14 控件。 /// @@ -227,7 +256,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList DropDownList14; - + /// /// ToolbarSeparator1 控件。 /// @@ -236,7 +265,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -245,7 +274,7 @@ namespace FineUIPro.Web.Report { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/EProject/FineUIPro.Web/Web.config b/EProject/FineUIPro.Web/Web.config index 08431ea..96ef0d8 100644 --- a/EProject/FineUIPro.Web/Web.config +++ b/EProject/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/EProject/FineUIPro.Web/common/Main.aspx b/EProject/FineUIPro.Web/common/Main.aspx index 108b6fa..81d975f 100644 --- a/EProject/FineUIPro.Web/common/Main.aspx +++ b/EProject/FineUIPro.Web/common/Main.aspx @@ -333,7 +333,7 @@ - + @@ -431,7 +431,7 @@ - + @@ -446,7 +446,7 @@ - + @@ -658,10 +658,10 @@ SortField="DisciplinesWBSCode" FieldType="String" HeaderText="Identifier" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderText="Discipline" HeaderTextAlign="Center" TextAlign="Left"> + FieldType="String" HeaderText="Quantity Description" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true"> diff --git a/EProject/FineUIPro.Web/common/PageBase.cs b/EProject/FineUIPro.Web/common/PageBase.cs index 85985e6..0ed20f4 100644 --- a/EProject/FineUIPro.Web/common/PageBase.cs +++ b/EProject/FineUIPro.Web/common/PageBase.cs @@ -1527,7 +1527,7 @@ namespace FineUIPro.Web { var Sendes1 = (from u in Sys_UserService.GetUserList() join r in Funs.DB.Sys_Role on u.RoleId equals r.RoleId - where r.RoleName == "CTE_Manager" || r.RoleName == "Accounting" + where r.RoleName == "CTE_Manager" //|| r.RoleName == "Accounting" select new { EmuaerEmailAddress = u.Email, senduserid = u.UserId } ).Distinct().ToList(); var Senders = Sendes1.Union(Sendes2); diff --git a/EProject/FineUIPro.Web/index.aspx.cs b/EProject/FineUIPro.Web/index.aspx.cs index 4d4969d..d3e6bfd 100644 --- a/EProject/FineUIPro.Web/index.aspx.cs +++ b/EProject/FineUIPro.Web/index.aspx.cs @@ -129,24 +129,27 @@ namespace FineUIPro.Web leftPanel.Items.Add(accordionMenu); var dt = GetNewMenu("0"); - foreach (var dr in dt) + if (dt.Count() > 0) { - AccordionPane accordionPane = new AccordionPane(); - accordionPane.Title = dr.MenuName; - //accordionPane.Layout = Layout.Fit; - accordionPane.ShowBorder = false; - accordionPane.BodyPadding = "2px 0 0 0"; - accordionMenu.Items.Add(accordionPane); + foreach (var dr in dt) + { + AccordionPane accordionPane = new AccordionPane(); + accordionPane.Title = dr.MenuName; + //accordionPane.Layout = Layout.Fit; + accordionPane.ShowBorder = false; + accordionPane.BodyPadding = "2px 0 0 0"; + accordionMenu.Items.Add(accordionPane); - Tree innerTree = new Tree(); - innerTree.ShowBorder = false; - innerTree.ShowHeader = false; - innerTree.EnableIcons = true; - innerTree.AutoScroll = true; - innerTree.EnableSingleClickExpand = true; - accordionPane.Items.Add(innerTree); + Tree innerTree = new Tree(); + innerTree.ShowBorder = false; + innerTree.ShowHeader = false; + innerTree.EnableIcons = true; + innerTree.AutoScroll = true; + innerTree.EnableSingleClickExpand = true; + accordionPane.Items.Add(innerTree); - BoundTree(innerTree.Nodes, dr.MenuId); + BoundTree(innerTree.Nodes, dr.MenuId); + } } return accordionMenu; } diff --git a/EProject/Model/Model.cs b/EProject/Model/Model.cs index 7d391a7..a92d3f8 100644 --- a/EProject/Model/Model.cs +++ b/EProject/Model/Model.cs @@ -137,9 +137,6 @@ namespace Model partial void InsertResource_PlanDetail(Resource_PlanDetail instance); partial void UpdateResource_PlanDetail(Resource_PlanDetail instance); partial void DeleteResource_PlanDetail(Resource_PlanDetail instance); - partial void InsertSyncDataUserLogs(SyncDataUserLogs instance); - partial void UpdateSyncDataUserLogs(SyncDataUserLogs instance); - partial void DeleteSyncDataUserLogs(SyncDataUserLogs instance); partial void InsertSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance); partial void UpdateSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance); partial void DeleteSys_ActualManHourMonthSet(Sys_ActualManHourMonthSet instance); @@ -18837,79 +18834,28 @@ namespace Model } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.SyncDataUserLogs")] - public partial class SyncDataUserLogs : INotifyPropertyChanging, INotifyPropertyChanged + public partial class SyncDataUserLogs { - private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); - - private int _Id; - private string _BatchNo; - private int _DataType; + private System.Nullable _CreatedTime; + + private System.Nullable _DataType; private string _DepatId; private string _UserId; - private System.Nullable _CreatedTime; - private System.Nullable _IsSuccess; private string _Remark; - private string _Josn; - - #region 可扩展性方法定义 - partial void OnLoaded(); - partial void OnValidate(System.Data.Linq.ChangeAction action); - partial void OnCreated(); - partial void OnIdChanging(int value); - partial void OnIdChanged(); - partial void OnBatchNoChanging(string value); - partial void OnBatchNoChanged(); - partial void OnDataTypeChanging(int value); - partial void OnDataTypeChanged(); - partial void OnDepatIdChanging(string value); - partial void OnDepatIdChanged(); - partial void OnUserIdChanging(string value); - partial void OnUserIdChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); - partial void OnIsSuccessChanging(System.Nullable value); - partial void OnIsSuccessChanged(); - partial void OnRemarkChanging(string value); - partial void OnRemarkChanged(); - partial void OnJosnChanging(string value); - partial void OnJosnChanged(); - #endregion - public SyncDataUserLogs() { - OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)] - public int Id - { - get - { - return this._Id; - } - set - { - if ((this._Id != value)) - { - this.OnIdChanging(value); - this.SendPropertyChanging(); - this._Id = value; - this.SendPropertyChanged("Id"); - this.OnIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="batchNo", Storage="_BatchNo", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BatchNo", DbType="NVarChar(50)")] public string BatchNo { get @@ -18920,76 +18866,12 @@ namespace Model { if ((this._BatchNo != value)) { - this.OnBatchNoChanging(value); - this.SendPropertyChanging(); this._BatchNo = value; - this.SendPropertyChanged("BatchNo"); - this.OnBatchNoChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="dataType", Storage="_DataType", DbType="Int NOT NULL")] - public int DataType - { - get - { - return this._DataType; - } - set - { - if ((this._DataType != value)) - { - this.OnDataTypeChanging(value); - this.SendPropertyChanging(); - this._DataType = value; - this.SendPropertyChanged("DataType"); - this.OnDataTypeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="depatId", Storage="_DepatId", DbType="NVarChar(50)")] - public string DepatId - { - get - { - return this._DepatId; - } - set - { - if ((this._DepatId != value)) - { - this.OnDepatIdChanging(value); - this.SendPropertyChanging(); - this._DepatId = value; - this.SendPropertyChanged("DepatId"); - this.OnDepatIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="userId", Storage="_UserId", DbType="NVarChar(50)")] - public string UserId - { - get - { - return this._UserId; - } - set - { - if ((this._UserId != value)) - { - this.OnUserIdChanging(value); - this.SendPropertyChanging(); - this._UserId = value; - this.SendPropertyChanged("UserId"); - this.OnUserIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="createdTime", Storage="_CreatedTime", DbType="DateTime")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] public System.Nullable CreatedTime { get @@ -19000,11 +18882,55 @@ namespace Model { if ((this._CreatedTime != value)) { - this.OnCreatedTimeChanging(value); - this.SendPropertyChanging(); this._CreatedTime = value; - this.SendPropertyChanged("CreatedTime"); - this.OnCreatedTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DataType", DbType="Int")] + public System.Nullable DataType + { + get + { + return this._DataType; + } + set + { + if ((this._DataType != value)) + { + this._DataType = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepatId", DbType="NVarChar(50)")] + public string DepatId + { + get + { + return this._DepatId; + } + set + { + if ((this._DepatId != value)) + { + this._DepatId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserId", DbType="NVarChar(50)")] + public string UserId + { + get + { + return this._UserId; + } + set + { + if ((this._UserId != value)) + { + this._UserId = value; } } } @@ -19020,16 +18946,12 @@ namespace Model { if ((this._IsSuccess != value)) { - this.OnIsSuccessChanging(value); - this.SendPropertyChanging(); this._IsSuccess = value; - this.SendPropertyChanged("IsSuccess"); - this.OnIsSuccessChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(500)")] public string Remark { get @@ -19040,54 +18962,10 @@ namespace Model { if ((this._Remark != value)) { - this.OnRemarkChanging(value); - this.SendPropertyChanging(); this._Remark = value; - this.SendPropertyChanged("Remark"); - this.OnRemarkChanged(); } } } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Josn", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] - public string Josn - { - get - { - return this._Josn; - } - set - { - if ((this._Josn != value)) - { - this.OnJosnChanging(value); - this.SendPropertyChanging(); - this._Josn = value; - this.SendPropertyChanged("Josn"); - this.OnJosnChanged(); - } - } - } - - public event PropertyChangingEventHandler PropertyChanging; - - public event PropertyChangedEventHandler PropertyChanged; - - protected virtual void SendPropertyChanging() - { - if ((this.PropertyChanging != null)) - { - this.PropertyChanging(this, emptyChangingEventArgs); - } - } - - protected virtual void SendPropertyChanged(String propertyName) - { - if ((this.PropertyChanged != null)) - { - this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); - } - } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Sys_ActualManHourMonthSet")] @@ -28577,8 +28455,6 @@ namespace Model private string _CM_CM_RevisedEnd; - private string _CM_KickOffMetting; - private System.Nullable _ProjectControl_Revised_MC_Date; private string _ProjectControl_Remarks; @@ -28605,6 +28481,14 @@ namespace Model private string _Job_Hold; + private string _CM_KickOffMetting; + + private string _PM_Remarks_Engineering; + + private string _PM_Remarks_Procurement; + + private string _CM_Remarks_Construction; + public View_ProjectListReport() { } @@ -29633,22 +29517,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_KickOffMetting", DbType="VarChar(10)")] - public string CM_KickOffMetting - { - get - { - return this._CM_KickOffMetting; - } - set - { - if ((this._CM_KickOffMetting != value)) - { - this._CM_KickOffMetting = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectControl_Revised_MC_Date", DbType="DateTime")] public System.Nullable ProjectControl_Revised_MC_Date { @@ -29856,6 +29724,70 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_KickOffMetting", DbType="VarChar(10)")] + public string CM_KickOffMetting + { + get + { + return this._CM_KickOffMetting; + } + set + { + if ((this._CM_KickOffMetting != value)) + { + this._CM_KickOffMetting = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PM_Remarks_Engineering", DbType="NVarChar(2000)")] + public string PM_Remarks_Engineering + { + get + { + return this._PM_Remarks_Engineering; + } + set + { + if ((this._PM_Remarks_Engineering != value)) + { + this._PM_Remarks_Engineering = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PM_Remarks_Procurement", DbType="NVarChar(2000)")] + public string PM_Remarks_Procurement + { + get + { + return this._PM_Remarks_Procurement; + } + set + { + if ((this._PM_Remarks_Procurement != value)) + { + this._PM_Remarks_Procurement = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CM_Remarks_Construction", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string CM_Remarks_Construction + { + get + { + return this._CM_Remarks_Construction; + } + set + { + if ((this._CM_Remarks_Construction != value)) + { + this._CM_Remarks_Construction = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Punch")]