diff --git a/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs b/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs index e6064ef..98babe5 100644 --- a/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs +++ b/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs @@ -602,10 +602,18 @@ namespace FineUIPro.Web.EditorManage // epro.ProjectControl_JobStatus = "In Construction"; //} - - //当项目类型为projects或moc时PM中Milestone(Actual)的Project Approval不为空,并且Resource_Plan有记录时,状态为Not Approved 修改于2024.07.04 - var resourcePlans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(epro.EProjectId); - if ((epro.PM_MA_ProjectApproval == null || epro.PM_MA_ProjectApproval.ToString() == "") && resourcePlans.Count() > 0) + + ////当项目类型为projects或moc时PM中Milestone(Actual)的Project Approval不为空,并且Resource_Plan有记录时,状态为Not Approved 修改于2024.07.04 + //var resourcePlans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(epro.EProjectId); + //if ((epro.PM_MA_ProjectApproval == null || epro.PM_MA_ProjectApproval.ToString() == "") && resourcePlans.Count() > 0) + //{ + // if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Not Start") + // { + // epro.ProjectControl_JobStatus = "Study"; + // } + //} + //由原先Project Approval为空且有第一个rp修改状态为Study 改为 Project Approval为空,并且Planning Cost Approval不为空,状态改为Study 修改于2025.8.22 + if ((epro.PM_MA_ProjectApproval == null || epro.PM_MA_ProjectApproval.ToString() == "") && epro.PM_Planning_Approval.HasValue) { if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Not Start") { diff --git a/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs b/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs index b79216f..684619f 100644 --- a/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs +++ b/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs @@ -638,14 +638,14 @@ namespace FineUIPro.Web.ResourcePlan if (eProject != null) { - if (eProject.ProjectControl_JobStatus == "Not Start" && !eProject.PM_MA_ProjectApproval.HasValue) - { - EProjects.ProjectControl_JobStatus = "Study"; - } - else - { + //if (eProject.ProjectControl_JobStatus == "Not Start" && !eProject.PM_MA_ProjectApproval.HasValue) + //{ + // EProjects.ProjectControl_JobStatus = "Study"; + //} + //else + //{ EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus; - } + //} diff --git a/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs b/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs index 5cdd393..9f92df2 100644 --- a/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs +++ b/EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs @@ -1048,14 +1048,14 @@ namespace FineUIPro.Web.ResourcePlan } if (eProject != null) { - if (eProject.ProjectControl_JobStatus == "Not Start" && !eProject.PM_MA_ProjectApproval.HasValue) - { - EProject.ProjectControl_JobStatus = "Study"; - } - else - { + //if (eProject.ProjectControl_JobStatus == "Not Start" && !eProject.PM_MA_ProjectApproval.HasValue) + //{ + // EProject.ProjectControl_JobStatus = "Study"; + //} + //else + //{ EProject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus; - } + //} if (cbCDI.Checked) { diff --git a/EProjectPackFile_2025-8-22_01.zip b/EProjectPackFile_2025-8-22_01.zip new file mode 100644 index 0000000..9c63aff Binary files /dev/null and b/EProjectPackFile_2025-8-22_01.zip differ diff --git a/EProjectPackFile_2025-8-22_01/PackFile/bin/FineUIPro.Web.dll b/EProjectPackFile_2025-8-22_01/PackFile/bin/FineUIPro.Web.dll new file mode 100644 index 0000000..780205a Binary files /dev/null and b/EProjectPackFile_2025-8-22_01/PackFile/bin/FineUIPro.Web.dll differ