diff --git a/EProject/BLL/Common/Const.cs b/EProject/BLL/Common/Const.cs
index 03c7bd3..f237347 100644
--- a/EProject/BLL/Common/Const.cs
+++ b/EProject/BLL/Common/Const.cs
@@ -747,6 +747,11 @@ namespace BLL
///
public const string CMTDCString = "CMTDC";
+ ///
+ /// 设计输入策划
+ ///
+ public const string DesignPlanString = "DesignPlan";
+
///
/// 设计输入提醒
///
diff --git a/EProject/FineUIPro.Web/Design/DesignInputPlan.aspx.cs b/EProject/FineUIPro.Web/Design/DesignInputPlan.aspx.cs
index e050b5d..baff42b 100644
--- a/EProject/FineUIPro.Web/Design/DesignInputPlan.aspx.cs
+++ b/EProject/FineUIPro.Web/Design/DesignInputPlan.aspx.cs
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.Design
string designInputId = Request.Params["designInputId"];
if (!string.IsNullOrEmpty(designInputId))
{
-
+
var input = BLL.DesignInputService.GetDesignInputById(designInputId);
var project = BLL.EProjectService.GeteProjectById(input.EProjectId);
@@ -159,7 +159,7 @@ namespace FineUIPro.Web.Design
Alert.ShowInTop("请选择提出人!", MessageBoxIcon.Warning);
return;
}
-
+
if (drpReceivedMan.SelectedValue != BLL.Const._Null)
{
receivedMan = drpReceivedMan.SelectedValue;
@@ -196,21 +196,23 @@ namespace FineUIPro.Web.Design
var input = BLL.DesignInputService.GetDesignInputById(designInputId);
var project = BLL.EProjectService.GeteProjectById(input.EProjectId);
-
- NameValueCollection nameValue = new NameValueCollection();
- nameValue.Add("projectNo", project.ProjectControl_JobNo);
- nameValue.Add("IssuedDiscOrNo", project.ProjectControl_JobNo + "-" + project.ProjectControl_JobTitle + "," + input.DesignInputChName + " " + input.DesignInputEnName + " " + input.DesignInputNo);
- nameValue.Add("Person_Ch", CurrUser.ChineseName);
- nameValue.Add("Person_En", CurrUser.UserName);
- if (!string.IsNullOrEmpty(issuedMan))
+ if (input != null)
{
- Model.Sys_User sys_User = new Model.Sys_User();
- sys_User = BLL.Sys_UserService.GetUsersByUserId(issuedMan);
- nameValue.Add("UserName", sys_User.UserName);
- List list = new List();
+ NameValueCollection nameValue = new NameValueCollection();
+ nameValue.Add("projectNo", project.ProjectControl_JobNo);
+ nameValue.Add("IssuedDiscOrNo", project.ProjectControl_JobNo + "-" + project.ProjectControl_JobTitle + "," + input.DesignInputChName + " " + input.DesignInputEnName + " " + input.DesignInputNo);
+ nameValue.Add("Person_Ch", CurrUser.ChineseName);
+ nameValue.Add("Person_En", CurrUser.UserName);
+ if (!string.IsNullOrEmpty(issuedMan))
+ {
+ Model.Sys_User sys_User = new Model.Sys_User();
+ sys_User = BLL.Sys_UserService.GetUsersByUserId(issuedMan);
+ nameValue.Add("UserName", sys_User.UserName);
+ List list = new List();
- list.Add(sys_User);
- EmailSendMessage(BLL.Const.DesignInputString, nameValue, BLL.Const.CustomString, list, "");
+ list.Add(sys_User);
+ EmailSendMessage(BLL.Const.DesignInputString, nameValue, BLL.Const.CustomString, list, "");
+ }
}
#endregion
ShowNotify("Save Successfully!", MessageBoxIcon.Success);
diff --git a/EProject/FineUIPro.Web/Global.asax.cs b/EProject/FineUIPro.Web/Global.asax.cs
index 0d2fce1..c734e7a 100644
--- a/EProject/FineUIPro.Web/Global.asax.cs
+++ b/EProject/FineUIPro.Web/Global.asax.cs
@@ -281,22 +281,25 @@
///
private void MCEmial(object sender, System.Timers.ElapsedEventArgs e)
{
- var eplist = (from x in Funs.DB.Editor_EProject
- where x.CM_MA_MC.Value.AddMonths(3).Year == DateTime.Now.Year
- && x.CM_MA_MC.Value.AddMonths(3).Month == DateTime.Now.Month
- && x.CM_MA_MC.Value.AddMonths(3).Day == DateTime.Now.Day
- select x).ToList();
- if (eplist.Count > 0)
+ if (DateTime.Now.Hour == 10)
{
- for (int i = 0; i < eplist.Count; i++)
+ var eplist = (from x in Funs.DB.Editor_EProject
+ where x.CM_MA_MC.Value.AddMonths(3).Year == DateTime.Now.Year
+ && x.CM_MA_MC.Value.AddMonths(3).Month == DateTime.Now.Month
+ && x.CM_MA_MC.Value.AddMonths(3).Day == DateTime.Now.Day
+ select x).ToList();
+ if (eplist.Count > 0)
{
- PageBase bg = new PageBase();
- NameValueCollection nameValue = new NameValueCollection();
- nameValue.Add("projectName", eplist[i].ProjectControl_JobTitle.ToString().Trim());
- nameValue.Add("projectNo", eplist[i].ProjectControl_JobNo.ToString().Trim());
- nameValue.Add("CM_MA_MC", Convert.ToDateTime(eplist[i].CM_MA_MC).AddMonths(4).ToString("yyyy-MM-dd"));
- nameValue.Add("BUCode", eplist[i].ProjectControl_BUCode);
- bg.EmailSendMessage(eplist[i], BLL.Const.FIRILHString, nameValue, BLL.Const.CustomString, BLL.Const.projectString2);
+ for (int i = 0; i < eplist.Count; i++)
+ {
+ PageBase bg = new PageBase();
+ NameValueCollection nameValue = new NameValueCollection();
+ nameValue.Add("projectName", eplist[i].ProjectControl_JobTitle.ToString().Trim());
+ nameValue.Add("projectNo", eplist[i].ProjectControl_JobNo.ToString().Trim());
+ nameValue.Add("CM_MA_MC", Convert.ToDateTime(eplist[i].CM_MA_MC).AddMonths(4).ToString("yyyy-MM-dd"));
+ nameValue.Add("BUCode", eplist[i].ProjectControl_BUCode);
+ bg.EmailSendMessage(eplist[i], BLL.Const.FIRILHString, nameValue, BLL.Const.CustomString, BLL.Const.projectString2);
+ }
}
}
//项目的人员的人工时自动关闭（MC时间 + 4个月-- >> 项目成员的人工时disable置为1）（由原来的6个月改为4个月）
@@ -534,8 +537,8 @@
// 1、 系统在项目计划(改为实际)批准当天自动给项目经理发送提醒邮件，提醒项目经理完成设计输入策划工作,并只适用于CTE设计的项目。
var eprojectList = from x in BLL.Funs.DB.Editor_EProject
- where x.PM_General_CDI == "CTE" && x.PM_MA_ProjectApproval.HasValue &&
- x.PM_MA_ProjectApproval.Value.Date == DateTime.Now.Date && x.DesignInputMailIsSend == null
+ where x.PM_General_CDI == "CTE" && x.ProjectControl_MS_Approval.HasValue &&
+ x.ProjectControl_MS_Approval.Value.Date == DateTime.Now.Date
select x;
if (eprojectList.Count() > 0)
{
@@ -555,7 +558,7 @@
List list = new List();
list.Add(sys_User);
- bg.EmailSendMessage(BLL.Const.DesignInputString, nameValue, BLL.Const.CustomString, list, "");
+ bg.EmailSendMessage(BLL.Const.DesignPlanString, nameValue, BLL.Const.NoCustomString, list, "");
}
}
}