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

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

@ -19,15 +19,15 @@
<f:Form ID="Form2" ShowBorder="false" ShowHeader="false" AutoScroll="true" runat="server"
RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow >
<f:FormRow>
<Items>
<f:DropDownList ID="drpPM_General_CDI" runat="server" Label="CDI" LabelWidth="80px" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpOutSourceType" runat="server" Label="OutSource Type" LabelWidth="140px" >
<f:ListItem Text="" Value="0"/>
<f:ListItem Text="A" Value="A"/>
<f:ListItem Text="B" Value="B"/>
<f:ListItem Text="C" Value="C"/>
<f:DropDownList ID="drpOutSourceType" runat="server" Label="OutSource Type" LabelWidth="140px">
<f:ListItem Text="" Value="0" />
<f:ListItem Text="A" Value="A" />
<f:ListItem Text="B" Value="B" />
<f:ListItem Text="C" Value="C" />
</f:DropDownList>
<f:NumberBox ID="txtPM_General_CostToComplete" runat="server" Label="Cost to Complete" NoNegative="true" EnableCommas="true"
LabelWidth="140px">
@ -69,13 +69,13 @@
</f:Label>
<f:CheckBox ID="cbPM_PressurePiping" runat="server" Text="Pressure Piping" AutoPostBack="true" OnCheckedChanged="PressurePiping_OnCheckedChanged">
</f:CheckBox>
<f:DatePicker ID="txtPM_PressurePiping" runat="server" Hidden="true">
<f:DatePicker ID="txtPM_PressurePiping" runat="server" Hidden="true">
</f:DatePicker>
<f:Label ID="Label4" runat="server">
</f:Label>
<f:CheckBox ID="cbPM_SQIB" runat="server" Text="QIB" AutoPostBack="true" OnCheckedChanged="SQIB_OnCheckedChanged">
</f:CheckBox>
<f:DatePicker ID="txtPM_SQIB" runat="server" Hidden="true">
<f:DatePicker ID="txtPM_SQIB" runat="server" Hidden="true">
</f:DatePicker>
<f:Label ID="Label26" runat="server">
</f:Label>
@ -162,7 +162,7 @@
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel6" Layout="Anchor" Title="Job" runat="server">
<f:GroupPanel ID="GroupPanel6" Layout="Anchor" Title="Job" runat="server">
<Items>
<f:Form ID="Form6" ShowBorder="false" ShowHeader="false" AutoScroll="true" runat="server"
RedStarPosition="BeforeText" LabelAlign="Right">
@ -183,7 +183,7 @@
<Items>
<f:DatePicker ID="txtEstimate_Worksheet" Label="Estimate Worksheet" runat="server"
LabelWidth="170px">
</f:DatePicker>
</f:DatePicker>
<f:DatePicker ID="txtBudget" Label="Budget" runat="server" LabelWidth="170px">
</f:DatePicker>
<f:DatePicker ID="txtTecoAlarm_Study" Label="Teco Study" runat="server"
@ -204,7 +204,7 @@
</Rows>
<Rows>
<f:FormRow>
<Items>
<Items>
<f:DropDownList ID="drpDelaybyteam1" runat="server" Label="Delay by team1" LabelWidth="170px" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpDelaybypersonel1" runat="server" Label="Delay by personel1" EnableGroup="true" LabelWidth="170px" EnableEdit="true">
@ -224,7 +224,7 @@
</Items>
</f:FormRow>
</Rows>
<Rows>
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDelaybyteam3" runat="server" Label="Delay by team3" LabelWidth="170px" EnableEdit="true">
@ -239,30 +239,31 @@
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="Remarks" runat="server">
</Items>
</f:GroupPanel>
<f:GroupPanel ID="GroupPanel5" Layout="Anchor" Title="Remarks" runat="server">
<Items>
<f:Panel ID="Panel5" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:Panel ID="Panel5" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextArea ID="txtPM_Remarks_Engineering" Label="Engineering" runat="server" LabelAlign="Right"
LabelWidth="140px">
</f:TextArea>
</Items>
</f:Panel>
<f:Panel ID="Panel2" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:Label ID="Label5" runat="server" Width="20px"></f:Label>
<f:Label ID="lblCMProcurement" runat="server"></f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel6" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextArea ID="txtPM_Remarks_Procurement" Label="Procurement" runat="server" LabelAlign="Right"
LabelWidth="140px">
</f:TextArea>
</Items>
</f:Panel>
<f:TextArea ID="txtPM_Remarks_Engineering" Label="Engineering" runat="server" LabelAlign="Right"
LabelWidth="140px">
</f:TextArea>
</Items>
</f:GroupPanel>
</f:Panel>
<f:Panel ID="Panel2" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:Label ID="Label5" runat="server" Width="20px"></f:Label>
<f:Label ID="lblCMProcurement" runat="server"></f:Label>
</Items>
</f:Panel>
<f:Panel ID="Panel6" Layout="HBox" ShowHeader="false" ShowBorder="false" runat="server">
<Items>
<f:TextArea ID="txtPM_Remarks_Procurement" Label="Procurement" runat="server" LabelAlign="Right"
LabelWidth="140px">
</f:TextArea>
</Items>
</f:Panel>
</Items>
</f:GroupPanel>
<f:GroupPanel ID="gpEM" Layout="Anchor" Title="EM Detail Eng（单击行Forecast Start、Forecast End编辑）" runat="server">
@ -275,7 +276,7 @@
<Columns>
<f:RowNumberField TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="DisciplinesWBSCode" DataField="DisciplinesWBSCode"
HeaderText="Identifier" HeaderTextAlign="Center" >
HeaderText="Identifier" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DisciplinesWBSName" DataField="DisciplinesWBSName"
HeaderText="Disciplines" HeaderTextAlign="Center">
@ -284,7 +285,7 @@
ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="SchStart" DataField="SchStart" HeaderText="SchStart" HeaderTextAlign="Center" Renderer="Date" FieldType="Date" RendererArgument="yyyy-MM-dd">
<Editor>
<Editor>
<f:DatePicker ID="SchStart" runat="server">
</f:DatePicker>
</Editor>
@ -301,8 +302,8 @@
</f:DatePicker>
</Editor>
</f:RenderField>
<f:RenderCheckField Width="90px" ColumnID="RevisedStartIsAct" DataField="RevisedStartIsAct" HeaderText="Actual" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderCheckField Width="90px" ColumnID="RevisedStartIsAct" DataField="RevisedStartIsAct" HeaderText="Actual" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField Width="140px" ColumnID="RevisedEnd" DataField="RevisedEnd" FieldType="Date"
HeaderText="Forecast End" HeaderTextAlign="Center" Renderer="Date" RendererArgument="yyyy-MM-dd">
<Editor>
@ -314,7 +315,7 @@
<f:TemplateField HeaderText="Actual IFC" Width="150px" HeaderTextAlign="Center">
<ItemTemplate>
<asp:Label ID="lblActual_IFC" runat="server" Text='<%# ConvertActualIFC(Eval("DisciplinesWBSName")) %>'></asp:Label>
<asp:Label ID="lblActual_IFC" runat="server" Text='<%# ConvertActualIFC(Eval("DisciplinesWBSName")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns>
@ -328,10 +329,10 @@
<f:Toolbar ID="Toolbar1" runat="server" ToolbarAlign="Right" Position="Bottom">
<Items>
<f:Button ID="btnCalculated" Icon="CalculatorEdit" runat="server" ToolTip="Calculated Progress"
OnClick="btnCalculated_Click" Text="Calculated Progress" >
OnClick="btnCalculated_Click" Text="Calculated Progress">
</f:Button>
<f:Button ID="btnSave" Icon="SystemSave" Text="Save" runat="server" ToolTip="Save" ValidateForms="SimpleForm1"
OnClick="btnSave_Click" >
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" Text="Close" ToolTip="Close" runat="server" Icon="SystemClose">
</f:Button>

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

@ -96,6 +96,7 @@
aTimer.Start();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(MCEmial);
}
//填写第二张资源时，第一张资源预留一个月的时候填写人工时
if (DateTime.Now.Hour == 10)
{
@ -350,19 +351,20 @@
where x.EProjectId == epr.Key && (y.ProjectControl_JobType == "Projects" || y.ProjectControl_JobType == "MOC")
&& x.Phase == "Study/Concept Planning"
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[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 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)
{
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();
foreach (var item in manHours_Plan)
{
item.AccountDisabled = 1;
Funs.DB.SubmitChanges();
}
item.AccountDisabled = 1;
Funs.DB.SubmitChanges();
}
}
//}
}
}

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))
{
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))
{
overview.GetRow(rowIndex).GetCell(23).CellStyle = redbackgroundstyle;
overview.GetRow(rowIndex).GetCell(25).CellStyle = redbackgroundstyle;
}
}
//超出实际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))
{
overview.GetRow(rowIndex).GetCell(25).CellStyle = redDatestyle;
overview.GetRow(rowIndex).GetCell(27).CellStyle = redDatestyle;
}
}
#endregion

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

@ -49,7 +49,7 @@ namespace FineUIPro.Web.Report
string strSql = @"SELECT costReport.CostReportId,
costReport.EProjectId,
costReport.Monthly,
costReport.OrginalBudget,
(costReport.OrginalBudget+costReport.ChangedBudget) as OrginalBudget,
costReport.ChangedBudget,
costReport.ActualCost,
(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));
ActCom += "" + sd + ",";
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) + ']';