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

20250509

This commit is contained in:
毕文静 2025-05-09 16:09:15 +08:00
parent f957268466
commit 1390e63fe2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs
View File

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