From 0fa168948b8599ca441581d16fc9f5715a96f7f1 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 16 Sep 2025 16:41:45 +0800
Subject: [PATCH] =?UTF-8?q?20250916=20=E7=89=B9=E6=AE=8A=E4=BA=BA=E5=B7=A5?=
=?UTF-8?q?=E6=97=A5disabled?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
EProject/BLL/ManHours/PlanService.cs | 1 +
EProject/FineUIPro.Web/Global.asax.cs | 24 ++-
.../ManHours/AccountDisabled.aspx | 4 +-
.../ManHours/AccountDisabled.aspx.designer.cs | 43 ++--
.../FineUIPro.Web/ManHours/AddManHours.aspx | 25 ++-
.../ManHours/AddManHours.aspx.cs | 5 +
.../ManHours/AddManHours.aspx.designer.cs | 54 +++--
EProject/FineUIPro.Web/ManHours/ManHours.aspx | 2 +-
EProject/Model/Model.cs | 198 +++++++++++++++---
EProjectPackFile_2025-09-02-01.zip | Bin 295727 -> 0 bytes
.../PackFile/bin/FineUIPro.Web.dll | Bin 1362432 -> 0 bytes
11 files changed, 289 insertions(+), 67 deletions(-)
delete mode 100644 EProjectPackFile_2025-09-02-01.zip
delete mode 100644 EProjectPackFile_2025-09-02-01/PackFile/bin/FineUIPro.Web.dll
diff --git a/EProject/BLL/ManHours/PlanService.cs b/EProject/BLL/ManHours/PlanService.cs
index dec7067..42f2dbd 100644
--- a/EProject/BLL/ManHours/PlanService.cs
+++ b/EProject/BLL/ManHours/PlanService.cs
@@ -72,6 +72,7 @@ namespace BLL
newPlan.ManHours = plan.ManHours;
newPlan.AccountDisabled = plan.AccountDisabled;
newPlan.IsClose = plan.IsClose;
+ newPlan.Phase = plan.Phase;
Funs.DB.ManHours_Plan.InsertOnSubmit(newPlan);
Funs.DB.SubmitChanges();
}
diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs
index 94003eb..74a9309 100644
--- a/EProject/FineUIPro.Web/Global.asax.cs
+++ b/EProject/FineUIPro.Web/Global.asax.cs
@@ -97,12 +97,13 @@
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(MCEmial);
}
- //填写第二张资源时，第一张资源预留一个月的时候填写人工时
+ //填写第二张资源时，第一张资源预留一个月的时候填写人工时（不用了）
+ //以Phase为Study/Concept Planning且PM_MA_ProjectApproval+一个月≤当前时间，人工时Disabled
if (DateTime.Now.Hour == 10)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
//1小时执行一次
- aTimer.Interval = 3600000;
+ aTimer.Interval = 60 * 60 * 1000;
aTimer.Enabled = true;
aTimer.Start();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(UpdateManHourDisabled);
@@ -341,6 +342,7 @@
///
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)
{
@@ -357,8 +359,7 @@
if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now)
{
string resourcePlanId = planLists[0].ResourcePlanId.ToString();
- string wo = planLists[0].WO.ToString();//特殊处理的人工时无ResourcePlanId判断Account与第一个rp的Account相同做Disabled
- List manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == epr.Key && (x.ResourcePlanId == resourcePlanId || x.Account.Contains(wo)) select x).ToList();
+ 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;
@@ -369,6 +370,21 @@
}
}
+ //特殊处理的人工时
+ 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();
+ foreach (var item in manHours_Plan)
+ {
+ item.AccountDisabled = 1;
+ Funs.DB.SubmitChanges();
+ }
+ }
+
var epList = from x in Funs.DB.Editor_EProject
where (x.ProjectControl_PC_CancelDate.HasValue && x.ProjectControl_PC_CancelDate.Value.AddMonths(1) <= DateTime.Now && x.ProjectControl_PC_CancelDate.Value.AddMonths(2) >= DateTime.Now)
|| (x.Job_Hold.HasValue && x.Job_Hold.Value.AddMonths(1) <= DateTime.Now && x.Job_Hold.Value.AddMonths(2) >= DateTime.Now)
diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx
index 45b95eb..b909a0f 100644
--- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx
+++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx
@@ -46,9 +46,9 @@
-
-
+
+
diff --git a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs
index bc17ee3..c999560 100644
--- a/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs
+++ b/EProject/FineUIPro.Web/ManHours/AccountDisabled.aspx.designer.cs
@@ -7,11 +7,13 @@
//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.ManHours {
-
-
- public partial class AccountDisabled {
-
+namespace FineUIPro.Web.ManHours
+{
+
+
+ public partial class AccountDisabled
+ {
+
///
/// form1 控件。
///
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// SimpleForm1 控件。
///
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
/// txtJobNo 控件。
///
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtJobNo;
-
+
///
/// drpDiscipline 控件。
///
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpDiscipline;
-
+
///
/// txtAccount 控件。
///
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtAccount;
-
+
///
/// txtEngineerName 控件。
///
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtEngineerName;
-
+
///
/// txtManHours 控件。
///
@@ -83,7 +85,16 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtManHours;
-
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
///
/// cbNotApplicable1 控件。
///
@@ -92,7 +103,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.CheckBox cbNotApplicable1;
-
+
///
/// Toolbar1 控件。
///
@@ -101,7 +112,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// btnSave 控件。
///
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.ManHours {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSave;
-
+
///
/// btnClose 控件。
///
diff --git a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx
index 1ede53b..d766431 100644
--- a/EProject/FineUIPro.Web/ManHours/AddManHours.aspx
+++ b/EProject/FineUIPro.Web/ManHours/AddManHours.aspx
@@ -46,9 +46,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -67,5 +80,15 @@
+