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

20250729

This commit is contained in:
毕文静 2025-07-29 09:35:32 +08:00
parent f3013d8c1a
commit 0c51a35191
5 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx
View File

@ -239,6 +239,9 @@
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="Remarks" runat="server"> <f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="Remarks" runat="server">
<Items> <Items>
<f:Panel ID="Panel5" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server"> <f:Panel ID="Panel5" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
@ -263,8 +266,6 @@
</f:Panel> </f:Panel>
</Items> </Items>
</f:GroupPanel> </f:GroupPanel>
</Items>
</f:GroupPanel>
<f:GroupPanel ID="gpEM" Layout="Anchor" Title="EM Detail Eng（单击行Forecast Start、Forecast End编辑）" runat="server"> <f:GroupPanel ID="gpEM" Layout="Anchor" Title="EM Detail Eng（单击行Forecast Start、Forecast End编辑）" runat="server">
<Items> <Items>
<f:Panel ID="Panel8" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server"> <f:Panel ID="Panel8" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">

6
EProject/FineUIPro.Web/Global.asax.cs
View File

@ -96,6 +96,7 @@
aTimer.Start(); aTimer.Start();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(MCEmial); aTimer.Elapsed += new System.Timers.ElapsedEventHandler(MCEmial);
} }
//填写第二张资源时，第一张资源预留一个月的时候填写人工时 //填写第二张资源时，第一张资源预留一个月的时候填写人工时
if (DateTime.Now.Hour == 10) if (DateTime.Now.Hour == 10)
{ {
@ -350,13 +351,14 @@
where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC") where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC")
&& x.Phase == "Study/Concept Planning" && x.Phase == "Study/Concept Planning"
orderby x.CreateDate ascending orderby x.CreateDate ascending
select new { x.ResourcePlanId, y.PM_MA_ProjectApproval }).ToList(); select new { x.ResourcePlanId, y.PM_MA_ProjectApproval, x.WO }).ToList();
//if (planLists.Count == 2) //if (planLists.Count == 2)
//{ //{
if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now) if (planLists[0].PM_MA_ProjectApproval.HasValue && planLists[0].PM_MA_ProjectApproval.Value.AddMonths(1) <= DateTime.Now)
{ {
string resourcePlanId = planLists[0].ResourcePlanId.ToString(); string resourcePlanId = planLists[0].ResourcePlanId.ToString();
List<ManHours_Plan> manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.ResourcePlanId == resourcePlanId select x).ToList(); string wo = planLists[0].WO.ToString();//特殊处理的人工时无ResourcePlanId判断Account与第一个rp的Account相同做Disabled
List<ManHours_Plan> manHours_Plan = (from x in Funs.DB.ManHours_Plan where x.EProjectId == epr.Key && (x.ResourcePlanId == resourcePlanId || x.Account.Contains(wo)) select x).ToList();
foreach (var item in manHours_Plan) foreach (var item in manHours_Plan)
{ {
item.AccountDisabled = 1; item.AccountDisabled = 1;

6
EProject/FineUIPro.Web/Report/OverviewReport.aspx.cs
View File

@ -2887,7 +2887,7 @@ namespace FineUIPro.Web.Report
{ {
if (Funs.GetNewDateTime(itemOver.MCActual).Value.AddDays(90) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.FC_Signed)) if (Funs.GetNewDateTime(itemOver.MCActual).Value.AddDays(90) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.FC_Signed))
{ {
overview.GetRow(rowIndex).GetCell(22).CellStyle = redbackgroundstyle; overview.GetRow(rowIndex).GetCell(24).CellStyle = redbackgroundstyle;
} }
} }
@ -2901,7 +2901,7 @@ namespace FineUIPro.Web.Report
{ {
if (Funs.GetNewDateTime(itemOver.FC_Signed).Value.AddDays(180) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.ProjectControl_BC_CloseDate)) if (Funs.GetNewDateTime(itemOver.FC_Signed).Value.AddDays(180) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.ProjectControl_BC_CloseDate))
{ {
overview.GetRow(rowIndex).GetCell(23).CellStyle = redbackgroundstyle; overview.GetRow(rowIndex).GetCell(25).CellStyle = redbackgroundstyle;
} }
} }
//超出实际MC90天，仍未收到AB的（As-built Received） //超出实际MC90天，仍未收到AB的（As-built Received）
@ -2909,7 +2909,7 @@ namespace FineUIPro.Web.Report
{ {
if (Funs.GetNewDateTime(itemOver.MCActual).Value.AddDays(90) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.As_built_Received)) if (Funs.GetNewDateTime(itemOver.MCActual).Value.AddDays(90) < Funs.GetNewDateTime(DateTime.Now.ToShortDateString()) && string.IsNullOrEmpty(itemOver.As_built_Received))
{ {
overview.GetRow(rowIndex).GetCell(25).CellStyle = redDatestyle; overview.GetRow(rowIndex).GetCell(27).CellStyle = redDatestyle;
} }
} }
#endregion #endregion

2
EProject/FineUIPro.Web/Report/ProjectCostReport.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.Report
string strSql = @"SELECT costReport.CostReportId, string strSql = @"SELECT costReport.CostReportId,
costReport.EProjectId, costReport.EProjectId,
costReport.Monthly, costReport.Monthly,
costReport.OrginalBudget, (costReport.OrginalBudget+costReport.ChangedBudget) as OrginalBudget,
costReport.ChangedBudget, costReport.ChangedBudget,
costReport.ActualCost, costReport.ActualCost,
(costReport.CommittedPRPO + costReport.CommittedSSRs) AS Commitment, (costReport.CommittedPRPO + costReport.CommittedSSRs) AS Commitment,

3
EProject/FineUIPro.Web/common/Main.aspx
View File

@ -731,7 +731,8 @@
var sd = parseFloat(CostArr[i].ActualCost) + parseFloat(CostArr[i].CommittedPRPO) + parseFloat(CostArr[i].CommittedSSRs + parseFloat(CostArr[i].CostToComplete)); var sd = parseFloat(CostArr[i].ActualCost) + parseFloat(CostArr[i].CommittedPRPO) + parseFloat(CostArr[i].CommittedSSRs + parseFloat(CostArr[i].CostToComplete));
ActCom += "" + sd + ","; ActCom += "" + sd + ",";
ActComs += "" + CostArr[i].ActualCost + ","; ActComs += "" + CostArr[i].ActualCost + ",";
Budget += "" + CostArr[i].OrginalBudget + ","; var bg = parseFloat(CostArr[i].OrginalBudget) + parseFloat(CostArr[i].ChangedBudget);
Budget += "" + bg + ",";
} }
} }
Legendata = '[' + Legendata.substring(0, Legendata.length - 1) + ']'; Legendata = '[' + Legendata.substring(0, Legendata.length - 1) + ']';