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/AreaConcernEditor.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/AreaConcernEditor.aspx.cs
+13 -1
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -319,6 +319,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx.cs
+15 -1
View File
@@ -62,7 +62,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -314,6 +314,20 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
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)
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx
+1 -1
View File
@@ -22,7 +22,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." AutoPostBack="true" NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx.cs
+13 -1
View File
@@ -63,7 +63,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -318,6 +318,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx.cs
+14 -1
View File
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -320,6 +320,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx.cs
+13 -1
View File
@@ -264,6 +264,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -294,7 +306,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
+21 -13
View File
@@ -603,7 +603,7 @@ namespace FineUIPro.Web.EditorManage
//}
//当PM中Milestone(Actual)的Project Approval不为空，并且Resource_Plan有记录时，状态为Not Approved
//当项目类型为projects或moc时PM中Milestone(Actual)的Project Approval不为空，并且Resource_Plan有记录时，状态为Not Approved 修改于2024.07.04
var resourcePlans = BLL.ResourcePlanService.GetResourcePlanByEProjectId(epro.EProjectId);
if ((epro.PM_MA_ProjectApproval == null || epro.PM_MA_ProjectApproval.ToString() == "") && resourcePlans.Count() > 0)
{
@@ -612,33 +612,41 @@ namespace FineUIPro.Web.EditorManage
epro.ProjectControl_JobStatus = "Study";
}
}
if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
// 增加于2024.07.03
if (epro.ProjectControl_JobType == "Other" && epro.PM_MA_ProjectApproval.HasValue && !epro.CM_MA_MC.HasValue)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "On Going";
}
eproject.ProjectControl_JobStatus = "On Going";
}
// 去除于2024.07.03
//if (epro.PM_MA_ProjectApproval.HasValue && resourcePlans.Count()>1)
//{
// if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
// {
// epro.ProjectControl_JobStatus = "On Going";
// }
//}
//去掉 同时满足Today小于Design Civil_Revised End Date和Design Mech.E&I_Revised End Date的最大值时，
//var civilRevisedEnd = BLL.PMService.GetCivil(eproject.EProjectId);
//var mechEIRevisedEnd = BLL.PMService.GetMechEI(eproject.EProjectId);
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detail Design
var 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;
if (epro.PM_MA_ProjectApproval.HasValue && all.Count() > 0)
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detailed Design
var 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;
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && all.Count() == 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
epro.ProjectControl_JobStatus = "Detail Design";
epro.ProjectControl_JobStatus = "Detailed Design";
}
}
// 后加：当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的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;
if (epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
if (epro.ProjectControl_JobType != "Other" && epro.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
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")
{
epro.ProjectControl_JobStatus = "In Procurement";
}
@@ -648,7 +656,7 @@ 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")
{
epro.ProjectControl_JobStatus = "MC";
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx.cs
+13 -1
View File
@@ -245,6 +245,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -272,7 +284,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx
+1 -1
View File
@@ -36,7 +36,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx.cs
+14 -1
View File
@@ -89,7 +89,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -453,6 +453,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
+14 -3
View File
@@ -28,14 +28,19 @@
<f:FormRow ColumnWidths="25% 24% 27% 24%">
<Items>
<f:DropDownList ID="drpJobType" runat="server" Label="Job Type" ShowRedStar="true" LabelWidth="110px" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtFilesLink" runat="server" Label="Files Link" LabelWidth="120px"></f:TextBox>
<f:DropDownList ID="drpProjType" runat="server" Label="Proj.Type" LabelWidth="120px">
<f:ListItem Value="0" Text="N/A" Selected="true" />
<f:ListItem Value="Temp" Text="Temp" />
<f:ListItem Value="Perm" Text="Perm" />
</f:DropDownList>
<f:DropDownList ID="drpEMManager" runat="server" Label="Engineering Manager" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtNetworkNo" runat="server" Label="Network No." LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 24% 27% 24%">
<Items>
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" LabelWidth="110px" ShowRedStar="true" Required="true" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" Label="Job Status" LabelWidth="110px" ShowRedStar="true" Required="true" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpJobStatus_SelectedIndexChanged"></f:DropDownList>
<f:NumberBox ID="txtOrginalBudget" runat="server" Label="Orginal Budget" NoDecimal="true" NoNegative="true" LabelWidth="120px" AutoPostBack="true" OnTextChanged="txtOrginalBudget_TextChanged" EnableCommas="true"></f:NumberBox>
<f:DropDownList ID="drpConstManager" runat="server" Label="Const Manager" LabelWidth="160px" EnableGroup="true" EnableEdit="true"></f:DropDownList>
<f:TextBox ID="txtMOCFormNO" runat="server" Label="MOC Form No." LabelWidth="130px"></f:TextBox>
@@ -67,7 +72,13 @@
<f:DatePicker ID="txtRevisedMCDate" runat="server" Label="Revised MC Date" LabelWidth="120px" EnableEdit="true" AutoPostBack="true" OnTextChanged="txtRevisedMCDate_OnTextChanged"></f:DatePicker>
<f:DropDownList ID="drpPM_General_Priority" runat="server" Label="Priority" LabelWidth="140px" EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtRemark" runat="server" Label="Remarks" LabelWidth="160px"></f:TextBox>
<f:TextBox ID="txtFilesLink" runat="server" Label="Files Link" LabelWidth="130px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="49% 51%">
<Items>
<f:TextBox ID="txtRemark" runat="server" Label="Remarks" LabelWidth="110px"></f:TextBox>
</Items>
</f:FormRow>
</Rows>
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
+51 -3
View File
@@ -1,4 +1,6 @@
using BLL;
using FineUIPro.Web.Report;
using Microsoft.IdentityModel.Tokens;
using Model;
using System;
using System.Collections.Generic;
@@ -28,7 +30,7 @@ namespace FineUIPro.Web.EditorManage
#region 加载下拉框
BLL.ConstService.InitConstValueDropDownList(this.drpJobType, BLL.Const.ProjectPlanner_JobType, true);//项目类型
BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, false); //项目状态
//BLL.ConstService.InitConstValueDropDownList(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, false); //项目状态
BLL.DepartService.InitDepartDropDownList(this.drpBuCode, true);//部门
BLL.Sys_UserService.InitUserDrpNA(this.drpProjectManager, true); //项目经理
BLL.Sys_UserService.InitUserDrpNA(this.drpEMManager, true); //EM
@@ -75,7 +77,14 @@ namespace FineUIPro.Web.EditorManage
this.drpOpre.SelectedIndex = 0;
//this.drpLeadBy.SelectedIndex = 0;
this.drpEMManager.SelectedIndex = 0;
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", false);
}
else
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", false);
}
this.txtJobNo.Text = eproject.ProjectControl_JobNo;
if (!string.IsNullOrEmpty(eproject.ProjectControl_BUCode))
{
@@ -91,6 +100,10 @@ namespace FineUIPro.Web.EditorManage
{
this.drpJobType.SelectedValue = BLL.ConstService.GetConstListByTextAndGroupId(eproject.ProjectControl_JobType.Trim(), BLL.Const.ProjectPlanner_JobType).ConstValue;
}
if (!string.IsNullOrEmpty(eproject.ProjectControl_ProjectType))
{
this.drpProjType.SelectedValue = eproject.ProjectControl_ProjectType;
}
this.txtOrginalBudget.Text = eproject.ProjectControl_OrginalBudget == null ? "" : Convert.ToInt32(eproject.ProjectControl_OrginalBudget).ToString();
if (!string.IsNullOrEmpty(eproject.ProjectControl_EMManagerId) && eproject.ProjectControl_EMManagerId != null)
@@ -240,6 +253,10 @@ namespace FineUIPro.Web.EditorManage
eProject.ProjectControl_ConstManager = this.drpConstManager.SelectedItem.Text;
}
eProject.ProjectControl_JobType = this.drpJobType.SelectedItem.Text;
if (this.drpProjType.SelectedValue != "0")
{
eProject.ProjectControl_ProjectType = this.drpProjType.SelectedValue;
}
eProject.ProjectControl_OrginalBudget = Funs.GetNewIntOrZero(this.txtOrginalBudget.Text.Trim());
if (this.drpEMManager.SelectedValue != BLL.Const._Null)
{
@@ -579,6 +596,10 @@ namespace FineUIPro.Web.EditorManage
{
operationLog += "Job Type 由" + pro.ProjectControl_JobType + "修改为" + drpJobType.SelectedItem.Text + "，";
}
if ((pro.ProjectControl_ProjectType != null || drpProjType.SelectedValue != "0") && pro.ProjectControl_ProjectType != drpProjType.SelectedValue)
{
operationLog += "Proj.Type 由" + pro.ProjectControl_ProjectType + "修改为" + drpProjType.SelectedValue + "，";
}
if ((pro.ProjectControl_JobStatus != null || drpJobStatus.SelectedValue != Const._Null) && pro.ProjectControl_JobStatus != drpJobStatus.SelectedItem.Text)
{
operationLog += "Job Status 由" + pro.ProjectControl_JobStatus + "修改为" + drpJobStatus.SelectedItem.Text + "，";
@@ -1032,12 +1053,13 @@ namespace FineUIPro.Web.EditorManage
#endregion
}
if (!string.IsNullOrEmpty(this.txtCancelDate.Text))//当Cancel Date有输入时,状态为Cancelled
if (eproject.ProjectControl_PC_CancelDate.HasValue)//当Cancel Date有输入时,状态为Cancelled
{
eproject.ProjectControl_JobStatus = "Cancelled";
}
if (!string.IsNullOrEmpty(this.txtHold.Text))//Hold Date有输入时,状态为Hold
// 修改于2024.07.04 非other类型的项目hold不为空并且cancelDate为空
if (eproject.Job_Hold.HasValue && !eproject.ProjectControl_PC_CancelDate.HasValue)//Hold Date有输入时,状态为Hold
{
eproject.ProjectControl_JobStatus = "Hold";
}
@@ -1285,6 +1307,16 @@ namespace FineUIPro.Web.EditorManage
/// <param name="e"></param>
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (this.drpJobType.SelectedItem.Text == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", false);
}
else
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", false);
}
if (string.IsNullOrEmpty(Request.Params["eProjectId"]))
{
if (this.drpJobType.SelectedItem.Text == "Projects" && Funs.GetNewDecimal(this.txtOrginalBudget.Text) > 1000000)
@@ -1342,6 +1374,22 @@ namespace FineUIPro.Web.EditorManage
}
}
}
protected void drpJobStatus_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpJobStatus.SelectedValue != "Hold")
{
this.txtHold.Text = string.Empty;
}
else
{
var eproject = BLL.EProjectService.GeteProjectById(Request.Params["eProjectId"]);
if (eproject != null)
{
this.txtHold.Text = eproject.Job_Hold == null ? "" : string.Format("{0:yyyy-MM-dd}", eproject.Job_Hold);
}
}
}
protected void txtOrginalBudget_TextChanged(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(Request.Params["eProjectId"]))
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs
Generated
+11 -2
View File
@@ -105,13 +105,13 @@ namespace FineUIPro.Web.EditorManage
protected global::FineUIPro.DropDownList drpJobType;
/// <summary>
/// txtFilesLink 控件。
/// drpProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFilesLink;
protected global::FineUIPro.DropDownList drpProjType;
/// <summary>
/// drpEMManager 控件。
@@ -266,6 +266,15 @@ namespace FineUIPro.Web.EditorManage
/// </remarks>
protected global::FineUIPro.DropDownList drpPM_General_Priority;
/// <summary>
/// txtFilesLink 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFilesLink;
/// <summary>
/// txtRemark 控件。
/// </summary>
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx
+1 -1
View File
@@ -35,7 +35,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx.cs
+14 -1
View File
@@ -80,7 +80,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -431,6 +431,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx
+1 -1
View File
@@ -24,7 +24,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch">
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch">
</f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch">
</f:DropDownList>
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx.cs
+13 -1
View File
@@ -245,6 +245,18 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
///查询
protected void btnSearch_Click(object sender, EventArgs e)
{
@@ -272,7 +284,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx
+1 -1
View File
@@ -23,7 +23,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" NextFocusControl="btnSearch"></f:DropDownList>
<f:TextBox ID="txtJobNO" runat="server" EmptyText="Enter the Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click" ></f:Button>
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx.cs
+14 -1
View File
@@ -181,7 +181,7 @@ namespace FineUIPro.Web.EditorManage
strSql += " AND ProjectControl_JobType=@JobType ";
listStr.Add(new SqlParameter("@JobType", this.drpJobType.SelectedItem.Text));
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
strSql += " AND ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@@ -338,6 +338,19 @@ namespace FineUIPro.Web.EditorManage
#endregion
#region 查询
protected void drpJobType_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpJobStatus.Items.Clear();
if (drpJobType.SelectedText == "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "3", true);
}
if (drpJobType.SelectedText != "Other")
{
BLL.ConstService.InitConstValueProjectStatus(this.drpJobStatus, BLL.Const.ProjectPlanner_JobStatus, "2", true);
}
}
/// <summary>
/// 下拉框选择事件
/// </summary>
EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs
+8 -8
View File
@@ -203,29 +203,29 @@ namespace FineUIPro.Web.EditorManage
var eproject = BLL.EProjectService.GeteProjectById(Request.Params["eProjectId"]);
if (eproject != null)
{
#region 更新项目关闭或Detail Design 状态
#region 更新项目关闭或Detailed Design 状态
#region Detail Design 和 In Procurement
#region Detailed Design 和 In Procurement
//去掉 同时满足Today小于Design Civil_Revised End Date和Design Mech.E&I_Revised End Date的最大值时，
//var civilRevisedEnd = BLL.PMService.GetCivil(eproject.EProjectId);
//var mechEIRevisedEnd = BLL.PMService.GetMechEI(eproject.EProjectId);
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detail Design
var all = from x in Funs.DB.Editor_TDC where x.EProjectId == eproject.EProjectId && x.Type == "D01_IFC" && x.Disc == "00_ALL" && x.ReceiveHC == null select x;
if (eproject.PM_MA_ProjectApproval.HasValue && all.Count() > 0)
// 后加条件 //当PM中Milestone(Actual)的Project Approval不为空并且IFC ALL的ReceiveHC为空，状态为Detailed Design
var 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;
if (eproject.ProjectControl_JobType != "Other" && eproject.PM_MA_ProjectApproval.HasValue && all.Count() == 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
{
eproject.ProjectControl_JobStatus = "Detail Design";
eproject.ProjectControl_JobStatus = "Detailed Design";
}
}
// 后加：当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;
if (eproject.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
if (eproject.ProjectControl_JobType != "Other" && eproject.PM_MA_ProjectApproval.HasValue && con_all.Count() > 0)
{
if (eproject.ProjectControl_JobStatus == null || eproject.ProjectControl_JobStatus == "" || eproject.ProjectControl_JobStatus == "Detail Design" || eproject.ProjectControl_JobStatus == "On Going" || eproject.ProjectControl_JobStatus == "Study" || eproject.ProjectControl_JobStatus == "Not Start")
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")
{
eproject.ProjectControl_JobStatus = "In Procurement";
}