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

20241010

Browse Source
This commit is contained in:
毕文静
2024-10-10 15:14:29 +08:00
parent d6c2b68ebc
commit 41b2e9f0ca
212 changed files with 396785 additions and 12795 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
+21 -13
View File
@@ -603,7 +603,7 @@ namespace FineUIPro.Web.EditorManage
//}
//当PM中Milestone(Actual)的Project Approval不为空，并且Resource_Plan有记录时，状态为Not Approved
//当项目类型为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)
{
@@ -612,33 +612,41 @@ namespace FineUIPro.Web.EditorManage
epro.ProjectControl_JobStatus = "Study";
}
}
if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
// 增加于2024.07.03
if (epro.ProjectControl_JobType == "Other" && epro.PM_MA_ProjectApproval.HasValue && !epro.CM_MA_MC.HasValue)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "On Going";
}
eproject.ProjectControl_JobStatus = "On Going";
}
// 去除于2024.07.03
//if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
//{
// if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
// {
// epro.ProjectControl_JobStatus = "On Going";
// }
//}
//去掉 同时满足Today小于Design Civil_Revised End Date和Design Mech.E&I_Revised End Date的最大值时，
//var civilRevisedEnd = BLL.PMService.GetCivil(eproject.EProjectId);
//var mechEIRevisedEnd = BLL.PMService.GetMechEI(eproject.EProjectId);
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detail Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId== epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && !x.ReceiveHC.HasValue select x;
if (epro.PM_MA_ProjectApproval.HasValue && all.Count() > 0)
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detailed Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId== epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && all.Count() == 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "Detail Design";
epro.ProjectControl_JobStatus = "Detailed Design";
}
}
// 后加：当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC不为空，状态为In Procurement
var con_all = from x in Funs.DB.Editor_TDC where x.EProjectId == epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x;
if (epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "In Procurement";
}
@@ -648,7 +656,7 @@ namespace FineUIPro.Web.EditorManage
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == ""
|| eproject.ProjectControl_JobStatus == "In Procurement" || eproject.ProjectControl_JobStatus == "In Construction"
|| eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Detailed Design" || eproject.ProjectControl_JobStatus == "On Going"
|| eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "MC";