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/CMEditorEdit.aspx.cs
+9 -8
View File
@@ -365,15 +365,11 @@ namespace FineUIPro.Web.EditorManage
var epro = BLL.EProjectService.GeteProjectById(eproject.EProjectId);
if (epro != null)
{
//当PM中Milestone(Actual)的Project Approval不为空，同时CM中Const.-Civil的Revised Start和Const.-Mech,E&I的Revised Start小于当前时间,状态为In Construction
//if (epro.PM_MA_ProjectApproval.HasValue && Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) > Funs.GetNewDateTime(epro.CM_CC_RevisedStart.ToString()) && Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) > Funs.GetNewDateTime(epro.CM_CM_RevisedStart.ToString()))
//{
// epro.ProjectControl_JobStatus = "In Construction";
//}
if (epro.CM_KickOffMetting.HasValue)
// CM中Kick-off meeting不为空 ,CM中Actual MC Date为空,PM中Final Approval Date不为空 修改于2024.07.03
if (epro.ProjectControl_JobType != "Other" && epro.CM_KickOffMetting.HasValue && !epro.CM_MA_MC.HasValue && epro.PM_MA_ProjectApproval.HasValue)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "In Procurement"
|| 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")
{
eproject.ProjectControl_JobStatus = "In Construction";
@@ -384,12 +380,17 @@ 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")
{
eproject.ProjectControl_JobStatus = "MC";
}
}
// 增加于2024.07.03
if (epro.ProjectControl_JobType == "Other" && epro.PM_MA_ProjectApproval.HasValue && !epro.CM_MA_MC.HasValue)
{
eproject.ProjectControl_JobStatus = "On Going";
}
//当Project_Control Manager中Business Closure-Close Date、CM中、Milestones(Actual)-MC、FC、Punch-C Killed Date都不为空时，状态为Closed
//if (epro.ProjectControl_BC_CloseDate.HasValue && epro.CM_MA_MC.HasValue && epro.CM_FC.HasValue && epro.CM_Punch_CKilledDate.HasValue)