shecs
/
Basf_EProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250822 修改项目状态Study条件

This commit is contained in:
毕文静 2025-08-22 15:12:43 +08:00
parent 0c51a35191
commit ee5bd93724
5 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
View File

@ -603,9 +603,17 @@ namespace FineUIPro.Web.EditorManage
//}
//当项目类型为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")
{

14
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
View File

@ -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;
}
//}

14
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanEdit.aspx.cs
View File

@ -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)
{

BIN
EProjectPackFile_2025-8-22_01.zip Normal file
View File

Binary file not shown.

BIN
EProjectPackFile_2025-8-22_01/PackFile/bin/FineUIPro.Web.dll Normal file
View File

Binary file not shown.