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

11

This commit is contained in:
佘春生 2024-11-11 16:10:08 +08:00
parent 2e14c723c8
commit 809c06a3cb
55 changed files with 769 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
EProject/BLL/APIService/SyncUserInfoService.cs
View File

@ -33,8 +33,9 @@ namespace BLL.APIService
// var token = GetUserToken(); //获取接口token
var dic = GetDepartList(); //把本地数据库中的部门全部取出作为字典
var dicUser = GetUserInfoByAccount(); //同上把所有用户取出来
string result = BLL.Funs.DB.OriginDatas.Select(t => t.JsonData).FirstOrDefault();
string file = System.Web.HttpContext.Current.Server.MapPath("~/data.txt");
string result = System.IO.File.ReadAllText(file);
//string result = BLL.Common.HttpHelper.HttpPostRequest(GETHRINfOAPI, "", token);
var data = JsonHelper.DeserializeJsonToObject<ResultData<List<UserInfo>>>(result);
List<Model.SyncDataUserLogs> logList = new List<Model.SyncDataUserLogs>();

30
EProject/BLL/BaseInfo/ConstService.cs
View File

@ -50,6 +50,7 @@ namespace BLL
newConst.ConstId = consts.ConstId;
newConst.ConstValue = consts.ConstValue;
newConst.ConstText = consts.ConstText;
newConst.GroupType = consts.GroupType;
newConst.GroupId = consts.GroupId;
Funs.DB.Base_Const.InsertOnSubmit(newConst);
Funs.DB.SubmitChanges();
@ -66,6 +67,7 @@ namespace BLL
{
newConst.ConstValue = consts.ConstValue;
newConst.ConstText = consts.ConstText;
newConst.GroupType = consts.GroupType;
Funs.DB.SubmitChanges();
}
}
@ -161,5 +163,33 @@ namespace BLL
Funs.FineUIPleaseSelect(dropName);
}
}
/// <summary>
/// 只对项目状态的查询
/// </summary>
/// <param name="dropName"></param>
/// <param name="groupId"></param>
/// <param name="projectStatus"></param>
/// <param name="isShowPlease"></param>
public static void InitConstValueProjectStatus(FineUIPro.DropDownList dropName, string groupId, string projectStatus, bool isShowPlease)
{
dropName.DataValueField = "ConstValue";
dropName.DataTextField = "ConstText";
if (projectStatus == "2") // 非Other类型
{
dropName.DataSource = (from x in Funs.DB.Base_Const where x.GroupId == groupId && (x.GroupType=="1" ||x.GroupType == "2") orderby x.ConstValue select x).ToList();
}
else if (projectStatus == "3") //Other类型
{
dropName.DataSource = (from x in Funs.DB.Base_Const where x.GroupId == groupId && (x.GroupType == "1" || x.GroupType == "3") orderby x.ConstValue select x).ToList();
}
dropName.DataBind();
if (isShowPlease)
{
Funs.FineUIPleaseSelect(dropName);
}
}
}
}

10
EProject/BLL/EditorManage/EProjectService.cs
View File

@ -41,6 +41,7 @@ namespace BLL
newEProject.EProjectId = eProject.EProjectId;
newEProject.ProjectControl_JobNo = eProject.ProjectControl_JobNo;
newEProject.ProjectControl_JobType = eProject.ProjectControl_JobType;
newEProject.ProjectControl_ProjectType = eProject.ProjectControl_ProjectType;
newEProject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
newEProject.ProjectControl_JobTitle = eProject.ProjectControl_JobTitle;
newEProject.ProjectControl_BUCode = eProject.ProjectControl_BUCode;
@ -138,6 +139,7 @@ namespace BLL
{
newEProject.ProjectControl_JobNo = eProject.ProjectControl_JobNo;
newEProject.ProjectControl_JobType = eProject.ProjectControl_JobType;
newEProject.ProjectControl_ProjectType = eProject.ProjectControl_ProjectType;
newEProject.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
newEProject.ProjectControl_JobTitle = eProject.ProjectControl_JobTitle;
newEProject.ProjectControl_BUCode = eProject.ProjectControl_BUCode;
@ -209,10 +211,10 @@ namespace BLL
newEProject.StudyWo = eProject.StudyWo;
newEProject.CreateDate = eProject.CreateDate;
newEProject.CreatePerson = eProject.CreatePerson;
if (eProject.ProjectControl_JobStatus != "Hold")
{
newEProject.Job_Hold =null;
}
//if (eProject.ProjectControl_JobStatus != "Hold")
//{
// newEProject.Job_Hold =null;
//}
try
{

15
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx
View File

@ -21,9 +21,12 @@
<f:RenderField Width="250px" ColumnID="ConstValue" DataField="ConstValue"
FieldType="String" HeaderText="Value" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="400px" ColumnID="ConstText" DataField="ConstText"
<f:RenderField Width="250px" ColumnID="ConstText" DataField="ConstText"
FieldType="String" HeaderText="Name" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="GroupType" DataField="GroupType"
FieldType="String" HeaderText="适用项目" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
@ -48,11 +51,17 @@
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtConstValue" Label="Value" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" >
runat="server" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:TextBox ID="txtConstText" Label="Name" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right">
runat="server" LabelAlign="right" LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="drpGroupType" Label="适用项目" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" LabelWidth="100px">
<f:ListItem Text="通用" Value="1" Selected="true"/>
<f:ListItem Text="非Other类" Value="2" />
<f:ListItem Text="Other类" Value="3" />
</f:DropDownList>
</Items>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" runat="server">

17
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx.cs
View File

@ -1,6 +1,8 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.BaseInfo
@ -29,10 +31,14 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT const.ConstId,const.ConstValue,const.ConstText,const.GroupId"
+ @" FROM dbo.Base_Const AS const"
+ @" WHERE const.GroupId = '" + BLL.Const.ProjectPlanner_JobStatus + "'";
DataTable tb = SQLHelper.GetDataTableRunText(strSql, null);
string strSql = @"SELECT ConstId,ConstValue,ConstText,GroupId,
(CASE WHEN GroupType='1' THEN '通用' WHEN GroupType='2' THEN '非Other类' WHEN GroupType='3' THEN 'Other类' ELSE '' END) AS GroupType
FROM dbo.Base_Const
WHERE GroupId = @GroupId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@GroupId", Const.ProjectPlanner_JobStatus));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
@ -157,7 +163,8 @@ namespace FineUIPro.Web.BaseInfo
Model.Base_Const cons = new Model.Base_Const
{
ConstValue = this.txtConstValue.Text.Trim(),
ConstText = this.txtConstText.Text.Trim()
ConstText = this.txtConstText.Text.Trim(),
GroupType=drpGroupType.SelectedValue
};
if (string.IsNullOrEmpty(strRowID))
{

15
EProject/FineUIPro.Web/BaseInfo/ProjectPlannerJobStatus.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
namespace FineUIPro.Web.BaseInfo
{
public partial class ProjectPlannerJobStatus {
public partial class ProjectPlannerJobStatus
{
/// <summary>
/// form1 控件。
@ -111,6 +113,15 @@ namespace FineUIPro.Web.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtConstText;
/// <summary>
/// drpGroupType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpGroupType;
/// <summary>
/// Toolbar1 控件。
/// </summary>

2
EProject/FineUIPro.Web/Design/DesignInput.aspx
View File

@ -47,7 +47,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" 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>

15
EProject/FineUIPro.Web/Design/DesignInput.aspx.cs
View File

@ -62,7 +62,7 @@ namespace FineUIPro.Web.Design
strSql += " AND e.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 e.ProjectControl_JobStatus=@Status ";
listStr.Add(new SqlParameter("@Status", this.drpJobStatus.SelectedItem.Text));
@ -326,6 +326,19 @@ namespace FineUIPro.Web.Design
#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>

2
EProject/FineUIPro.Web/EditorManage/AreaConcernEditor.aspx
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>

14
EProject/FineUIPro.Web/EditorManage/AreaConcernEditor.aspx.cs
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>

2
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx
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>

16
EProject/FineUIPro.Web/EditorManage/CMEditor.aspx.cs
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)
{

17
EProject/FineUIPro.Web/EditorManage/CMEditorEdit.aspx.cs
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)

2
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx
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>

14
EProject/FineUIPro.Web/EditorManage/FCRLogEditor.aspx.cs
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>

2
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx
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>

15
EProject/FineUIPro.Web/EditorManage/LessonsLearnedEditor.aspx.cs
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>

2
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx
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>

14
EProject/FineUIPro.Web/EditorManage/PMEditor.aspx.cs
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));

34
EProject/FineUIPro.Web/EditorManage/PMEditorEdit.aspx.cs
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";

2
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx
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>

14
EProject/FineUIPro.Web/EditorManage/PermitEditor.aspx.cs
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));

2
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx
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>

15
EProject/FineUIPro.Web/EditorManage/ProjectControlEditor.aspx.cs
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>

17
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx
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>

54
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.cs
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"]))

13
EProject/FineUIPro.Web/EditorManage/ProjectControlEditorEdit.aspx.designer.cs generated
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>

2
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx
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>

15
EProject/FineUIPro.Web/EditorManage/PunchEditor.aspx.cs
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>

2
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx
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>

14
EProject/FineUIPro.Web/EditorManage/SQIBEditor.aspx.cs
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));

2
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx
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>

15
EProject/FineUIPro.Web/EditorManage/TDCEditor.aspx.cs
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>

16
EProject/FineUIPro.Web/EditorManage/TDCEditorEdit.aspx.cs
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";
}

BIN
EProject/FineUIPro.Web/File/Excel/Project_List_Report.xlsx
View File

Binary file not shown.

7
EProject/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -37,7 +37,7 @@
<OutputPath>bin\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<WarningLevel>5</WarningLevel>
<LangVersion>7.3</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
@ -55,9 +55,8 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="FineUIPro, Version=7.1.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>bin\FineUIPro.dll</HintPath>
<Reference Include="FineUIPro">
<HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>

2
EProject/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -36,7 +36,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>2396</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:9099/</IISUrl>
<IISUrl>http://localhost:9009/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>

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

@ -343,7 +343,7 @@
var planLists = (from x in Funs.DB.Resource_Plan where x.EProjectId == epr.Key orderby x.CreateDate descending select x).ToList();
if (planLists.Count() == 2)
{
if (planLists[0].CreateDate.Value.AddMonths(1).ToShortDateString() == DateTime.Now.ToShortDateString())
if (planLists[0].CreateDate.Value.AddMonths(1).Date <= DateTime.Now.Date && planLists[0].CreateDate.Value.AddMonths(2).Date >= DateTime.Now.Date)
{
var manHours_Plan = Funs.DB.ManHours_Plan.FirstOrDefault(x => x.ResourcePlanId == planLists[1].ResourcePlanId);
if (manHours_Plan != null)

12
EProject/FineUIPro.Web/ManHours/ManHours.aspx.cs
View File

@ -87,7 +87,7 @@ namespace FineUIPro.Web.ManHours
{
JobType = this.drpJobType.SelectedValue;
}
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
JobStatus = this.drpJobStatus.SelectedValue;
}
@ -155,6 +155,16 @@ namespace FineUIPro.Web.ManHours
/// <param name="e"></param>
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);
}
if (hidpersonnel.Text == "D@" + BLL.Const.CTE_DepartId)
{
BindGrid("");

2
EProject/FineUIPro.Web/ManHours/SelectPlan.aspx.cs
View File

@ -54,7 +54,7 @@ namespace FineUIPro.Web.ManHours
{
string strSql = @"SELECT * from View_NewManHours_Plan
WHERE AccountDisabled=0 and IsCalculated=1
AND (ProjectControl_JobStatus='Detail Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
AND (ProjectControl_JobStatus='Detailed Design' OR ProjectControl_JobStatus='In Construction' OR ProjectControl_JobStatus='In Procurement'
OR ProjectControl_JobStatus='Not Start' OR ProjectControl_JobStatus='On Going'
OR (ProjectControl_JobStatus='Cancelled' AND DATEDIFF(DAY,ProjectControl_PC_CancelDate,GETDATE())<=31)
OR (ProjectControl_JobStatus='MC' and DATEDIFF(MONTH,CM_MA_MC,GETDATE())<=4)

2
EProject/FineUIPro.Web/Report/ConcernReport.aspx
View File

@ -22,7 +22,7 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtJobNo" runat="server" EmptyText="Job NO." NextFocusControl="btnSearch"></f:TextBox>
<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:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>

15
EProject/FineUIPro.Web/Report/ConcernReport.aspx.cs
View File

@ -61,7 +61,7 @@ namespace FineUIPro.Web.Report
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));
@ -78,6 +78,19 @@ namespace FineUIPro.Web.Report
#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>

2
EProject/FineUIPro.Web/Report/MonthReport.aspx
View File

@ -23,7 +23,7 @@
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtJobNo" runat="server" EmptyText="Job No." NextFocusControl="btnSearch"></f:TextBox>
<f:DropDownList ID="drpJobType" runat="server" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" EnableEdit="true" NextFocusControl="btnSearch"></f:DropDownList>
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" Text="Search" OnClick="btnSearch_Click"></f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>

15
EProject/FineUIPro.Web/Report/MonthReport.aspx.cs
View File

@ -67,7 +67,7 @@ namespace FineUIPro.Web.Report
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));
@ -149,6 +149,19 @@ namespace FineUIPro.Web.Report
#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>

11
EProject/FineUIPro.Web/Report/ProjectListReport.aspx
View File

@ -64,6 +64,17 @@
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_ProjectType" DataField="ProjectControl_ProjectType"
FieldType="String" HeaderText="Proj.Type" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">
<Operator>
<f:DropDownList ID="DropDownList58" runat="server">
<f:ListItem Text="equal to" Value="equal" />
<f:ListItem Text="include" Value="contain" Selected="true" />
</f:DropDownList>
</Operator>
</Filter>
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ProjectControl_LeadByName" DataField="ProjectControl_LeadByName"
FieldType="String" HeaderText="Lead By" HeaderTextAlign="Center" TextAlign="Left" EnableFilter="true">
<Filter EnableMultiFilter="true" ShowMatcher="true">

19
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.cs
View File

@ -129,6 +129,19 @@ namespace FineUIPro.Web.Report
valid = true;
}
}
if (column == "ProjectControl_ProjectType")
{
string sourceValue = sourceObj.ToString();
string fillteredValue = fillteredObj.ToString();
if (fillteredOperator == "equal" && sourceValue == fillteredValue)
{
valid = true;
}
else if (fillteredOperator == "contain" && sourceValue.Contains(fillteredValue))
{
valid = true;
}
}
if (column == "ProjectControl_LeadByName")
{
string sourceValue = sourceObj.ToString();
@ -823,6 +836,7 @@ namespace FineUIPro.Web.Report
if (projectList.GetRow(rowIndex).GetCell(2) == null) projectList.GetRow(rowIndex).CreateCell(2);
projectList.GetRow(rowIndex).GetCell(2).SetCellValue(itemOver.ProjectControl_JobType);
projectList.GetRow(rowIndex).GetCell(2).CellStyle.SetFont(cs_content_Font);
//Lead By
if (projectList.GetRow(rowIndex).GetCell(3) == null) projectList.GetRow(rowIndex).CreateCell(3);
projectList.GetRow(rowIndex).GetCell(3).SetCellValue(itemOver.ProjectControl_LeadByName);
@ -1384,6 +1398,11 @@ namespace FineUIPro.Web.Report
projectList.GetRow(rowIndex).GetCell(73).SetCellValue(itemOver.Job_Hold);
projectList.GetRow(rowIndex).GetCell(73).CellStyle = styleQfw;
//Proj.Type
if (projectList.GetRow(rowIndex).GetCell(74) == null) projectList.GetRow(rowIndex).CreateCell(74);
projectList.GetRow(rowIndex).GetCell(74).SetCellValue(itemOver.ProjectControl_ProjectType);
projectList.GetRow(rowIndex).GetCell(74).CellStyle.SetFont(cs_content_Font);
#endregion
rowIndex++;

15
EProject/FineUIPro.Web/Report/ProjectListReport.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Report {
namespace FineUIPro.Web.Report
{
public partial class ProjectListReport {
public partial class ProjectListReport
{
/// <summary>
/// form1 控件。
@ -129,6 +131,15 @@ namespace FineUIPro.Web.Report {
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList2;
/// <summary>
/// DropDownList58 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList DropDownList58;
/// <summary>
/// DropDownList3 控件。
/// </summary>

27
EProject/FineUIPro.Web/Report/TimeSheetReport.aspx.cs
View File

@ -291,6 +291,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "1";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T02_OverTime"))
{
@ -300,6 +309,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "2";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else if (table.Rows[i]["Type"].ToString().Contains("T03_OverTime"))
@ -310,6 +328,15 @@ namespace FineUIPro.Web.Report
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
if (actType.Contains("1"))
{
string thirdParty = table.Rows[i]["IsThirdParty"].ToString();
if (thirdParty != "" && thirdParty == "是")
{
string actStr = actType + "3";
reportModel.GetRow(rowIndex).GetCell(6).SetCellValue(actStr);
}
}
}
else

2
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx
View File

@ -21,7 +21,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>

15
EProject/FineUIPro.Web/ResourcePlan/ResourcePlan.aspx.cs
View File

@ -75,7 +75,7 @@ namespace FineUIPro.Web.ResourcePlan
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));
@ -578,6 +578,19 @@ namespace FineUIPro.Web.ResourcePlan
#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>

20
EProject/FineUIPro.Web/ResourcePlan/ResourcePlanAdd.aspx.cs
View File

@ -617,15 +617,17 @@ namespace FineUIPro.Web.ResourcePlan
ProjectControlAccount = string.Empty;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going
if (eProject.PM_MA_ProjectApproval.HasValue && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
{
EProjects.ProjectControl_JobStatus = "On Going";
}
else
{
EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
}
// 后加条件，当创建第二个资源时，项目批准日期不为空时项目状态为On Going 不要了 修改于2024.07.03
//if (eProject.ProjectControl_JobType == "Other" && eProject.PM_MA_ProjectApproval.HasValue && !eProject.CM_MA_MC.HasValue
// && (eProject.ProjectControl_JobStatus == "Not Start" || eProject.ProjectControl_JobStatus == "Study"))
//{
// EProjects.ProjectControl_JobStatus = "On Going";
//}
//else
//{
// EProjects.ProjectControl_JobStatus = eProject.ProjectControl_JobStatus;
//}
//(现增加第二张资源一个月后关闭)
//if(eProject.ProjectControl_JobType == "MOC")
//{

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

@ -38,7 +38,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server">
<Items>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="dropDownList_Click" NextFocusControl="btnFind"></f:DropDownList>
<f:DropDownList ID="drpJobType" runat="server" AutoPostBack="true" OnSelectedIndexChanged="drpJobType_SelectedIndexChanged" NextFocusControl="btnFind"></f:DropDownList>
<f:DropDownList ID="drpJobStatus" runat="server" EnableCheckBoxSelect="true" EnableMultiSelect="true" NextFocusControl="btnFind" AutoPostBack="true" OnSelectedIndexChanged="drpJobStatus_Click"></f:DropDownList>
<f:DropDownList ID="drpDivision" runat="server" AutoPostBack="true" OnSelectedIndexChanged="dropDownList_Click" NextFocusControl="btnFind"></f:DropDownList>
<f:TextBox ID="txtJobNoS" runat="server" EmptyText="Enter the Job No." EnableBlurEvent="true" OnBlur="dropDownList_Click" NextFocusControl="btnFind"></f:TextBox>
@ -186,7 +186,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtProjType" runat="server" Label="Proj.Type" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCostEffectivity" runat="server" Label="Cost Effectivity" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtInstrumentEng" runat="server" Label="Instrument Eng." LabelWidth="120px"></f:TextBox>
<f:NumberBox ID="txtPendingQty" runat="server" Label="-Pending Qty" LabelWidth="160px" EnableCommas="true" Readonly="true"></f:NumberBox>
@ -194,7 +194,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtLeadBy" runat="server" Label="Lead By" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtJobTitle" runat="server" Label="Job Title" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtPVIPredition" runat="server" Label="PVI Predition" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtElectrialEng" runat="server" Label="Electrial Eng." LabelWidth="120px"></f:TextBox>
<f:NumberBox ID="txtPendingCost" runat="server" Label="-Pending Cost(RMB)" LabelWidth="160px" EnableCommas="true" Readonly="true"></f:NumberBox>
@ -202,7 +202,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtPriority" runat="server" Label="Priority" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtLeadBy" runat="server" Label="Lead By" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtProjManager" runat="server" Label="Proj.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtCivilEng" runat="server" Label="Civil Eng." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtDocStatus" runat="server" Label="Doc.Status" LabelWidth="160px"></f:TextBox>
@ -210,7 +210,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCategory" runat="server" Label="Category" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtPriority" runat="server" Label="Priority" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtConstManager" runat="server" Label="Const.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtCDI" runat="server" Label="CDI" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtMOCFormNo" runat="server" Label="MOC Form No." LabelWidth="160px"></f:TextBox>
@ -218,15 +218,16 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtOperationRep" runat="server" Label="Operation Rep." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCategory" runat="server" Label="Category" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtEngManager" runat="server" Label="Eng.Manager" LabelWidth="170px"></f:TextBox>
<f:TextBox ID="txtOutSourceType" runat="server" Label="OutSource Type" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtCAPEXPlanNo" runat="server" Label="CAPEX Plan No." LabelWidth="160px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<f:FormRow ColumnWidths="25% 75%">
<Items>
<f:TextBox ID="txtRemarks" runat="server" Label="Remarks" LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtOperationRep" runat="server" Label="Operation Rep." LabelWidth="120px"></f:TextBox>
<f:TextBox ID="txtRemarks" runat="server" Label="Remarks" LabelWidth="170px"></f:TextBox>
</Items>
</f:FormRow>
</Items>

17
EProject/FineUIPro.Web/common/Main.aspx.cs
View File

@ -75,7 +75,7 @@ namespace FineUIPro.Web.common
strSql += " AND eProject.ProjectControl_JobType=@jobType";
listStr.Add(new SqlParameter("@jobType", this.drpJobType.SelectedItem.Text));
} // AND CHARINDEX(Trust.ProjectId,@ProjectId)>0
if (this.drpJobStatus.SelectedValue != BLL.Const._Null)
if (this.drpJobStatus.SelectedValue != BLL.Const._Null && this.drpJobStatus.SelectedValue != null)
{
//strSql += " AND eProject.ProjectControl_JobStatus=@jobStatus";
strSql += " AND CHARINDEX(eProject.ProjectControl_JobStatus,@jobStatus)>0";
@ -232,6 +232,7 @@ namespace FineUIPro.Web.common
this.txtBuCode.Text = eProject.ProjectControl_BUCode; //部门代码
this.txtJobNo.Text = eProject.ProjectControl_JobNo;//项目号
this.txtJobType.Text = eProject.ProjectControl_JobType;//项目类型
this.txtProjType.Text = eProject.ProjectControl_ProjectType; //
this.txtJobTitle.Text = eProject.ProjectControl_JobTitle;//项目标题
if (!string.IsNullOrEmpty(eProject.ProjectControl_LeadBy))
{
@ -1183,6 +1184,20 @@ namespace FineUIPro.Web.common
BindGrid();
}
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);
}
BindGrid();
}
protected void dropDownList_Click(object sender, EventArgs e)
{
BindGrid();

35
EProject/FineUIPro.Web/common/Main.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common {
namespace FineUIPro.Web.common
{
public partial class main {
public partial class main
{
/// <summary>
/// Head1 控件。
@ -472,13 +474,13 @@ namespace FineUIPro.Web.common {
protected global::FineUIPro.NumberBox txtApprovedCost;
/// <summary>
/// txtJobTitle 控件。
/// txtProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJobTitle;
protected global::FineUIPro.TextBox txtProjType;
/// <summary>
/// txtCostEffectivity 控件。
@ -508,13 +510,13 @@ namespace FineUIPro.Web.common {
protected global::FineUIPro.NumberBox txtPendingQty;
/// <summary>
/// txtLeadBy 控件。
/// txtJobTitle 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtLeadBy;
protected global::FineUIPro.TextBox txtJobTitle;
/// <summary>
/// txtPVIPredition 控件。
@ -544,13 +546,13 @@ namespace FineUIPro.Web.common {
protected global::FineUIPro.NumberBox txtPendingCost;
/// <summary>
/// txtPriority 控件。
/// txtLeadBy 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPriority;
protected global::FineUIPro.TextBox txtLeadBy;
/// <summary>
/// txtProjManager 控件。
@ -580,13 +582,13 @@ namespace FineUIPro.Web.common {
protected global::FineUIPro.TextBox txtDocStatus;
/// <summary>
/// txtCategory 控件。
/// txtPriority 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCategory;
protected global::FineUIPro.TextBox txtPriority;
/// <summary>
/// txtConstManager 控件。
@ -616,13 +618,13 @@ namespace FineUIPro.Web.common {
protected global::FineUIPro.TextBox txtMOCFormNo;
/// <summary>
/// txtOperationRep 控件。
/// txtCategory 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOperationRep;
protected global::FineUIPro.TextBox txtCategory;
/// <summary>
/// txtEngManager 控件。
@ -651,6 +653,15 @@ namespace FineUIPro.Web.common {
/// </remarks>
protected global::FineUIPro.TextBox txtCAPEXPlanNo;
/// <summary>
/// txtOperationRep 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtOperationRep;
/// <summary>
/// txtRemarks 控件。
/// </summary>

20
EProject/FineUIPro.Web/common/PageBase.cs
View File

@ -1510,7 +1510,7 @@ namespace FineUIPro.Web
// MC Auto
if (sends.EmailUserYN == 0)
{
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人：改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@ -1552,10 +1552,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId==ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)
@ -1614,7 +1618,7 @@ namespace FineUIPro.Web
string[] mailCC = null;
string resultMessage = "";
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人)
// 收件人：CTE所有直线经理（CTE_Manager）、会计(当项目状态为Projects，Small Invest) and 项目组所有人员，抄送：CTE总监、PMs(CTE/M的所有人:改为项目的PM)
// 项目组所有人员
var Sendes2 = (from a in Funs.DB.ManHours_Plan
join b in Funs.DB.Sys_User
@ -1656,10 +1660,14 @@ namespace FineUIPro.Web
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
var conCC2 = (from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
where x.UserId == ep.ProjectControl_ProjectManagerId && (x.IsThirdParty == false || x.IsThirdParty == null)
select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
).Distinct().ToList();
//var conCC2 = (from x in Funs.DB.Sys_User
// join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
// where y.DepartId == Const.CTEM_DepartId && (x.IsThirdParty == false || x.IsThirdParty == null)
// select new { EmuaerEmailAddress = x.Email, senduserid = x.UserId }
// ).Distinct().ToList();
var conCC = conCC1.Union(conCC2);
if (conCC.Count() > 0)