From a33a1ca50c01b1232440a6f4aebbe4a21e8fe4bb Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 25 Sep 2025 11:34:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?20250925=20P11=E6=8A=A5=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs b/EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs index ac5914a..5c00075 100644 --- a/EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs +++ b/EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs @@ -27,6 +27,7 @@ namespace FineUIPro.Web.Report GetButtonPower();//权限设置 BLL.DepartService.InitCTEDepartDropDownList(this.drpWorkCenter, false); + this.txtMonth.Text = string.Format("{0:yyyyMM}", DateTime.Now); btnSelectColumns.OnClientClick = Window1.GetShowReference("TimeSheetReportSelectColumn.aspx"); From 56c9aa33aba5abff85564694d642c7de3a6d09b4 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 29 Sep 2025 13:54:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?20250929=20=E4=BA=BA=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EProject/FineUIPro.Web/Global.asax.cs | 59 +++++++++---------- .../ManHours/AccountDisabled.aspx | 43 ++++++++++---- .../ManHours/AccountDisabled.aspx.cs | 6 +- .../ManHours/AccountDisabled.aspx.designer.cs | 9 +++ .../FineUIPro.Web/ManHours/AddManHours.aspx | 4 +- .../ManHours/AddManHours.aspx.cs | 21 ++++++- EProject/FineUIPro.Web/ManHours/ManHours.aspx | 2 +- .../ResourcePlan/ResourcePlanAdd.aspx.cs | 4 ++ .../ResourcePlan/ResourcePlanEdit.aspx.cs | 4 ++ EProject/FineUIPro.Web/common/Main.aspx | 10 ++-- EProject/Model/Model.cs | 18 ++++++ 11 files changed, 129 insertions(+), 51 deletions(-) diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs index 74a9309..36b8f74 100644 --- a/EProject/FineUIPro.Web/Global.asax.cs +++ b/EProject/FineUIPro.Web/Global.asax.cs @@ -342,42 +342,41 @@ /// private void UpdateManHourDisabled(object sender, System.Timers.ElapsedEventArgs e) { - //有资源的人工时 - var eprojects = (from x in Funs.DB.Resource_Plan select x).GroupBy(x => x.EProjectId).ToList(); - if (eprojects != null) - { - foreach (var epr in eprojects) - { - var planLists = (from x in Funs.DB.Resource_Plan - join y in Funs.DB.Editor_EProject on x.EProjectId equals y.EProjectId - where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC") - && x.Phase == "Study/Concept Planning" - orderby x.CreateDate ascending - select new { x.ResourcePlanId, y.PM_MA_ProjectApproval, x.WO }).ToList(); - //if (planLists.Count == 2) - //{ - if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now) - { - string resourcePlanId = planLists[0].ResourcePlanId.ToString(); - List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == epr.Key && x.ResourcePlanId == resourcePlanId select x).ToList(); - foreach (var item in manHours_Plan) - { - item.AccountDisabled = 1; - Funs.DB.SubmitChanges(); - } - } - //} - } - } - - //特殊处理的人工时 + //有资源的人工时 + //var eprojects = (from x in Funs.DB.Resource_Plan select x).GroupBy(x => x.EProjectId).ToList(); + //if (eprojects != null) + //{ + // foreach (var epr in eprojects) + // { + // var planLists = (from x in Funs.DB.Resource_Plan + // join y in Funs.DB.Editor_EProject on x.EProjectId equals y.EProjectId + // where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC") + // && x.Phase == "Study/Concept Planning" + // orderby x.CreateDate ascending + // select new { x.ResourcePlanId, y.PM_MA_ProjectApproval, x.WO }).ToList(); + // //if (planLists.Count == 2) + // //{ + // if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now) + // { + // string resourcePlanId = planLists[0].ResourcePlanId.ToString(); + // List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == epr.Key && x.ResourcePlanId == resourcePlanId select x).ToList(); + // foreach (var item in manHours_Plan) + // { + // item.AccountDisabled = 1; + // Funs.DB.SubmitChanges(); + // } + // } + // //} + // } + //} + //Phase为Study/Concept Planning的人工时Disabled var eprojectLists = (from x in Funs.DB.Editor_EProject where (x.ProjectControl_JobType == "Projects" || x.ProjectControl_JobType == "MOC") && x.PM_MA_ProjectApproval.HasValue && x.PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now select x).ToList(); foreach (var pro in eprojectLists) { - List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == pro.EProjectId && x.Phase == "Study/Concept Planning" select x).ToList(); + List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == pro.EProjectId && x.Phase.Contains("Study/Concept Planning") select x).ToList(); foreach (var item in manHours_Plan) { item.AccountDisabled = 1; diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx index b909a0f..40fa5d2 100644 --- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx +++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx @@ -4,55 +4,68 @@ - +
- + - + - - <%-- + + <%-- --%> - + - + - + - + + + + + + + + + + + + + + - + @@ -67,5 +80,15 @@ + diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.cs b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.cs index 1f6b42c..77b2bc6 100644 --- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.cs +++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.cs @@ -60,13 +60,15 @@ namespace FineUIPro.Web.ManHours if (p.AccountDisabled == 1) { cbNotApplicable1.Checked = true; } + if (!string.IsNullOrEmpty(p.Phase)) + { + checkPhase.SelectedValueArray = p.Phase.Split(','); + } } } } } - - /// /// 提交按钮 /// diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs index c999560..4b7b3a7 100644 --- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs +++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs @@ -86,6 +86,15 @@ namespace FineUIPro.Web.ManHours /// protected global::FineUIPro.TextBox txtManHours; + /// + /// checkPhase 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList checkPhase; + /// /// Label1 控件。 /// diff --git a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx index d766431..3ee492d 100644 --- a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx +++ b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx @@ -49,10 +49,10 @@ - + <%-- - + --%> diff --git a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs index b4612c3..cbd1e52 100644 --- a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs +++ b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs @@ -36,7 +36,26 @@ namespace FineUIPro.Web.ManHours { this.txtAccount.Text = p.ProjectControl_Account; } - + + var plans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(eProjectId); + if (plans.Count < 2 && plans.FirstOrDefault().Phase == "Study/Concept Planning") + { + checkPhase.Items.Clear(); + List lists = new List(); + lists.Add("Study/Concept Planning"); + checkPhase.DataSource = lists; + checkPhase.DataBind(); + checkPhase.SelectedValueArray = lists[0].Split(','); + } + else + { + checkPhase.Items.Clear(); + List lists = new List(); + lists.Add("Study/Concept Planning"); + lists.Add("Execution"); + checkPhase.DataSource = lists; + checkPhase.DataBind(); + } } } else diff --git a/EProject/FineUIPro.Web/ManHours/ManHours.aspx b/EProject/FineUIPro.Web/ManHours/ManHours.aspx index 1330785..45e12e8 100644 --- a/EProject/FineUIPro.Web/ManHours/ManHours.aspx +++ b/EProject/FineUIPro.Web/ManHours/ManHours.aspx @@ -125,7 +125,7 @@ @@ -220,7 +220,7 @@ - + @@ -625,10 +625,10 @@ FieldType="String" HeaderText="Sch.(Days)" HeaderTextAlign="Center"> + FieldType="String" HeaderText="Initiator" HeaderTextAlign="Center"> + FieldType="String" HeaderText="category" HeaderTextAlign="Center"> diff --git a/EProject/Model/Model.cs b/EProject/Model/Model.cs index 66586f5..12e159c 100644 --- a/EProject/Model/Model.cs +++ b/EProject/Model/Model.cs @@ -27681,6 +27681,8 @@ namespace Model private System.Nullable _ActHours; + private string _Phase; + public View_NewManHours_Plan() { } @@ -28116,6 +28118,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Phase", DbType="NVarChar(50)")] + public string Phase + { + get + { + return this._Phase; + } + set + { + if ((this._Phase != value)) + { + this._Phase = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Project_Closure_Report")] From c49bf4fb6aeeacf0f8791aab8cd0ffceaf2800f9 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 30 Sep 2025 09:49:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?20250930=20=E7=89=B9=E6=AE=8A=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E6=97=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx | 2 +- EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx index 40fa5d2..946e656 100644 --- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx +++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx @@ -50,7 +50,7 @@ - + diff --git a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs index cbd1e52..a918277 100644 --- a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs +++ b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.ManHours } var plans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(eProjectId); - if (plans.Count < 2 && plans.FirstOrDefault().Phase == "Study/Concept Planning") + if (plans.Count>0 && plans.Count < 2 && plans.FirstOrDefault().Phase == "Study/Concept Planning") { checkPhase.Items.Clear(); List lists = new List(); From ee5843441ad4c58a582c3cd046941ef7cc344e2c Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 9 Oct 2025 15:34:31 +0800 Subject: [PATCH 4/5] 20251009 --- .../ManHours/AddManHours.aspx.cs | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs index a918277..69df581 100644 --- a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs +++ b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx.cs @@ -36,25 +36,31 @@ namespace FineUIPro.Web.ManHours { this.txtAccount.Text = p.ProjectControl_Account; } - - var plans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(eProjectId); - if (plans.Count>0 && plans.Count < 2 && plans.FirstOrDefault().Phase == "Study/Concept Planning") + if (p.ProjectControl_JobType == "Projects" || p.ProjectControl_JobType == "MOC") { - checkPhase.Items.Clear(); - List lists = new List(); - lists.Add("Study/Concept Planning"); - checkPhase.DataSource = lists; - checkPhase.DataBind(); - checkPhase.SelectedValueArray = lists[0].Split(','); + var plans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(eProjectId); + if (plans.Count > 0 && plans.Count < 2 && plans.FirstOrDefault().Phase == "Study/Concept Planning") + { + checkPhase.Items.Clear(); + List lists = new List(); + lists.Add("Study/Concept Planning"); + checkPhase.DataSource = lists; + checkPhase.DataBind(); + checkPhase.SelectedValueArray = lists[0].Split(','); + } + else + { + checkPhase.Items.Clear(); + List lists = new List(); + lists.Add("Study/Concept Planning"); + lists.Add("Execution"); + checkPhase.DataSource = lists; + checkPhase.DataBind(); + } } else { - checkPhase.Items.Clear(); - List lists = new List(); - lists.Add("Study/Concept Planning"); - lists.Add("Execution"); - checkPhase.DataSource = lists; - checkPhase.DataBind(); + checkPhase.Hidden = true; } } } @@ -166,9 +172,13 @@ namespace FineUIPro.Web.ManHours pm.IsClose = 0; } - if (checkPhase.SelectedValueArray != null) + var epr = BLL.EProjectService.GeteProjectById(eProjectId); + if (epr.ProjectControl_JobType == "Projects" || epr.ProjectControl_JobType == "MOC") { - pm.Phase = checkPhase.SelectedValueArray[0]; + if (checkPhase.SelectedValueArray != null) + { + pm.Phase = checkPhase.SelectedValueArray[0]; + } } BLL.PlanService.AddPlan(pm); From ec2cd8b78287d6038f30299a6603b6738cba4ed0 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Mon, 13 Oct 2025 08:35:29 +0800 Subject: [PATCH 5/5] 20251013 --- EProject/FineUIPro.Web/common/Main.aspx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/EProject/FineUIPro.Web/common/Main.aspx b/EProject/FineUIPro.Web/common/Main.aspx index 2752a0e..3dda606 100644 --- a/EProject/FineUIPro.Web/common/Main.aspx +++ b/EProject/FineUIPro.Web/common/Main.aspx @@ -195,8 +195,8 @@ - - + +