diff --git a/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs b/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs index ac0c2d4..e6064ef 100644 --- a/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs +++ b/EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs @@ -645,7 +645,7 @@ namespace FineUIPro.Web.EditorManage // 后加:当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC不为空,状态为In Procurement //或者当PM中Milestone(Actual)的Project Approval不为空并且IFC NA的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; - var con_na = from x in Funs.DB.Editor_TDC where x.EProjectId == epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "90_NA" && x.ReceiveHC.HasValue select x; + var con_na = from x in Funs.DB.Editor_TDC where x.EProjectId == epro.EProjectId && x.Type == "D01_IFC" && x.Disc == "90_NA" select x; if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && (con_all.Count() > 0 || con_na.Count() > 0)) { 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") diff --git a/EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs b/EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs index 0b7cf71..44b48ce 100644 --- a/EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs +++ b/EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs @@ -223,7 +223,7 @@ namespace FineUIPro.Web.EditorManage // 后加:当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC不为空,状态为In Procurement var con_all = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC.HasValue select x; - var con_na = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "90_NA" && x.ReceiveHC.HasValue select x; + var con_na = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "90_NA" select x; if (eproject.ProjectControl_JobType != "Other" && eproject.PM_MA_ProjectApproval.HasValue && (con_all.Count() > 0 || con_na.Count() > 0)) { 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")