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

Merge branch 'master' of http://47.104.102.122:3000/shecs/Basf_FCL

This commit is contained in:
佘春生 2025-10-17 11:26:19 +08:00
parent 87dd974100 4980555679
commit d4389d8716
23 changed files with 1384 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CreateModel.bat
View File

@ -27,7 +27,7 @@ REM --------------
@echo.
@call "%VS100COMNTOOLS%"vsvars32.bat
SqlMetal /views /server:.\SQL2016 /database:FCLDB /code:%Model_ROOT%\Model.cs /namespace:Model
SqlMetal /views /server:.\SQL2022 /database:FCLDB /code:%Model_ROOT%\Model.cs /namespace:Model
@ECHO 完成
pause

2
FCL/BLL/BaseInfo/DepartService.cs
View File

@ -56,6 +56,7 @@ namespace BLL
newDepart.DepartName = depart.DepartName;
newDepart.Remark = depart.Remark;
newDepart.DepartLeader = depart.DepartLeader;
newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
Funs.DB.Base_Depart.InsertOnSubmit(newDepart);
Funs.DB.SubmitChanges();
}
@ -73,6 +74,7 @@ namespace BLL
newDepart.DepartName = depart.DepartName;
newDepart.Remark = depart.Remark;
newDepart.DepartLeader = depart.DepartLeader;
newDepart.DelegatedRepresentative = depart.DelegatedRepresentative;
Funs.DB.SubmitChanges();
}
}

2
FCL/BLL/BaseInfo/ViolationClauseService.cs
View File

@ -17,7 +17,7 @@ namespace BLL
public static List<Model.EMC_ViolationClause> GetSupViolationClause()
{
return Funs.DB.EMC_ViolationClause.Where(e => e.SupViolationClause == null).ToList();
return Funs.DB.EMC_ViolationClause.Where(e => e.SupViolationClause == null).OrderBy(e => e.SortIndex).ToList();
}
/// <summary>

10
FCL/BLL/Common/Const.cs
View File

@ -57,6 +57,11 @@ namespace BLL
/// </summary>
public static string Role_CommonUsers = "bdb8c4fe-5082-4ce0-af5e-70f39f50ea41";
/// <summary>
/// 承包商管理角色ID
/// </summary>
public static string Role_Contractor_LeaderId = "48b2376d-421f-4b12-b5be-c0c538bfe3e9";
/// <summary>
/// 邮件配置Id
/// </summary>
@ -263,6 +268,11 @@ namespace BLL
public const string BtnConTab13View = "承包商View";
#endregion
/// <summary>
/// 质量事件报告修改全部
/// </summary>
public const string BtnModifyAll = "Modify All";
#endregion
#region 初始化上传路径

1
FCL/BLL/SES/PunishmentService.cs
View File

@ -130,6 +130,7 @@ namespace BLL
newPunishment.MainCoordinatorEndDate = punishment.MainCoordinatorEndDate;
newPunishment.UserDepStartDate = punishment.UserDepStartDate;
newPunishment.UserDepEndDate = punishment.UserDepEndDate;
newPunishment.Pause = punishment.Pause;
Funs.DB.SubmitChanges();
}

9
FCL/BLL/SES/SESRelatedDataService.cs
View File

@ -226,7 +226,7 @@ namespace BLL
}
/// <summary>
/// 根据承包商ID获取未关闭的FO
/// 根据承包商ID获取未关闭的且有效的及过期一年合同
/// </summary>
/// <param name="dropName"></param>
/// <param name="ContractorId"></param>
@ -235,7 +235,12 @@ namespace BLL
{
dropName.DataValueField = "FO_NO";
dropName.DataTextField = "FO_NO";
dropName.DataSource = (from x in Funs.DB.FC_SESRelatedData where x.Contractor == ContractorId && x.FC_Status != "Closed" orderby x.FO_NO select x.FO_NO).Distinct();
dropName.DataSource = (from x in Funs.DB.FC_SESRelatedData
where x.Contractor == ContractorId
&& x.FC_Status != "Closed"
&& x.Expire_Date.Value.AddYears(1) >= DateTime.Now
orderby x.FO_NO
select x.FO_NO).Distinct();
dropName.DataBind();
if (isShowPlease)
{

2
FCL/BLL/SysManage/Sys_UserService.cs
View File

@ -350,7 +350,7 @@ namespace BLL
/// <returns></returns>
public static List<Model.View_Sys_Users> GetUserViewList()
{
return (from x in Funs.DB.View_Sys_Users where x.IsPost == true orderby x.DepartName, x.UserName select x).ToList();
return (from x in Funs.DB.View_Sys_Users orderby x.DepartName, x.UserName select x).ToList();
}
/// <summary>

6
FCL/FineUIPro.Web/BaseInfo/Department.aspx
View File

@ -42,6 +42,9 @@
<f:RenderField Width="150px" ColumnID="UserName" DataField="UserName"
FieldType="String" HeaderText="Department leader" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="DelegatedRepresentativeName" DataField="DelegatedRepresentativeName"
FieldType="String" HeaderText="Delegated Representative" HeaderTextAlign="Center" TextAlign="Left">
</f:RenderField>
<f:RenderField Width="300px" ColumnID="Remark" DataField="Remark"
FieldType="String" HeaderText="Remark" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
@ -77,6 +80,7 @@
runat="server" LabelAlign="right" LabelWidth="140px">
</f:TextBox>
<f:DropDownList ID="drpDepartLeader" runat="server" Label="Department leader" LabelAlign="Right" EnableEdit="true" LabelWidth="140px"></f:DropDownList>
<f:DropDownList ID="drpDelegatedRepresentative" runat="server" Label="Delegated Representative" LabelAlign="Right" EnableEdit="true" LabelWidth="140px"></f:DropDownList>
<f:TextArea ID="txtRemark" Label="Remark" runat="server" LabelAlign="Right" LabelWidth="140px"></f:TextArea>
</Items>
<Toolbars>
@ -117,7 +121,7 @@
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
}
</script>
</body>
</html>

35
FCL/FineUIPro.Web/BaseInfo/Department.aspx.cs
View File

@ -1,6 +1,7 @@
using BLL;
using BLL.Common;
using Model;
using Org.BouncyCastle.Tls.Crypto;
using System;
using System.Collections.Generic;
using System.Data;
@ -23,14 +24,21 @@ namespace FineUIPro.Web.BaseInfo
if (!IsPostBack)
{
GetButtonPower();//按钮权限
//部门领导
drpDepartLeader.DataTextField = "UserName";
drpDepartLeader.DataValueField = "UserId";
this.drpDepartLeader.DataSource = BLL.Sys_UserService.GetUserList();
this.drpDepartLeader.DataBind();
Funs.FineUIPleaseSelect(this.drpDepartLeader);
this.drpDepartLeader.SelectedIndex = 0;
//部门代理人
drpDelegatedRepresentative.DataTextField = "UserName";
drpDelegatedRepresentative.DataValueField = "UserId";
this.drpDelegatedRepresentative.DataSource = BLL.Sys_UserService.GetUserList();
this.drpDelegatedRepresentative.DataBind();
Funs.FineUIPleaseSelect(this.drpDelegatedRepresentative);
this.drpDelegatedRepresentative.SelectedIndex = 0;
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
@ -42,9 +50,10 @@ namespace FineUIPro.Web.BaseInfo
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT dep.DepartId,dep.DepartCode,dep.DepartName,dep.DepartLeader,u.UserName
string strSql = @"SELECT dep.DepartId,dep.DepartCode,dep.DepartName,dep.DepartLeader,u.UserName,dep.DelegatedRepresentative,r.UserName as DelegatedRepresentativeName
FROM dbo.Base_Depart AS dep
LEFT JOIN dbo.Sys_User AS u ON u.UserId = dep.DepartLeader
LEFT JOIN dbo.Sys_User AS r ON r.UserId = dep.DelegatedRepresentative
Where 1=1";
// 2.获取当前分页数据
List<SqlParameter> listStr = new List<SqlParameter>();
@ -99,13 +108,11 @@ namespace FineUIPro.Web.BaseInfo
/// <param name="e"></param>
protected void btnDelete_Click(object sender, EventArgs e)
{
BLL.DepartService.DeleteDepartById(hfFormID.Text);
BLL.Sys_LogService.AddLog(this.CurrUser.UserId, "Delete department");
// 重新绑定表格，并模拟点击[新增按钮]
BindGrid();
//PageContext.RegisterStartupScript("onNewButtonClick();");
}
/// <summary>
/// 右键删除事件
@ -170,6 +177,18 @@ namespace FineUIPro.Web.BaseInfo
{
this.drpDepartLeader.SelectedValue = depart.DepartLeader;
}
else
{
this.drpDepartLeader.SelectedIndex = 0;
}
if (!string.IsNullOrEmpty(depart.DelegatedRepresentative))
{
this.drpDelegatedRepresentative.SelectedValue = depart.DelegatedRepresentative;
}
else
{
this.drpDelegatedRepresentative.SelectedIndex = 0;
}
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
}
@ -197,6 +216,10 @@ namespace FineUIPro.Web.BaseInfo
{
depart.DepartLeader = this.drpDepartLeader.SelectedValue;
}
if (this.drpDelegatedRepresentative.SelectedValue!=BLL.Const._Null)
{
depart.DelegatedRepresentative = this.drpDelegatedRepresentative.SelectedValue;
}
if (string.IsNullOrEmpty(strRowID))
{
depart.DepartId = SQLHelper.GetNewID(typeof(Model.Base_Depart));
@ -264,6 +287,7 @@ namespace FineUIPro.Web.BaseInfo
this.txtDepartCode.Text = string.Empty;
this.txtDepartName.Text = string.Empty;
this.drpDepartLeader.SelectedValue = Const._Null;
this.drpDelegatedRepresentative.SelectedValue= Const._Null;
this.txtRemark.Text = string.Empty;
this.btnDelete.Enabled = false;
}
@ -397,7 +421,6 @@ namespace FineUIPro.Web.BaseInfo
{
errorInfos += (i + 2) + "Line, [Manager] cannot be empty!</br>";
}
depList.Add(d);
#endregion
}

75
FCL/FineUIPro.Web/BaseInfo/Department.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.BaseInfo {
public partial class Department {
namespace FineUIPro.Web.BaseInfo
{
public partial class Department
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtDepCode 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDepCode;
/// <summary>
/// ToolbarFill2 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill2;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// hdFileName 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.SimpleForm SimpleForm1;
/// <summary>
/// hfFormID 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hfFormID;
/// <summary>
/// txtDepartCode 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDepartCode;
/// <summary>
/// txtDepartName 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDepartName;
/// <summary>
/// drpDepartLeader 控件。
/// </summary>
@ -182,7 +184,16 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDepartLeader;
/// <summary>
/// drpDelegatedRepresentative 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDelegatedRepresentative;
/// <summary>
/// txtRemark 控件。
/// </summary>
@ -191,7 +202,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -200,7 +211,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -209,7 +220,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@ -218,7 +229,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -227,7 +238,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -236,7 +247,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -245,7 +256,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
@ -254,7 +265,7 @@ namespace FineUIPro.Web.BaseInfo {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

60
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigation.aspx.cs
View File

@ -50,6 +50,7 @@ namespace FineUIPro.Web.ContractorQuality
left join Sys_User as u on u.UserId = p.Violation_Inspector
left join Base_Depart as d on d.DepartId = u.DepartId
left join Sys_User as du on du.UserId = d.DepartLeader
left join FC_SESRelatedData fo on fo.FO_NO = p.FO_NO
where Flag='2' ";
List<SqlParameter> listStr = new List<SqlParameter>();
var role = BLL.Sys_RoleService.GetRole(CurrUser.RoleId);
@ -72,7 +73,7 @@ namespace FineUIPro.Web.ContractorQuality
var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
if (user != null)
{
strSql += " and p.PunishmentId in (select PunishmentId from EMC_PunishmentAudit where (AuditMan='" + user.DepartId + "' or AuditMan='" + this.CurrUser.UserId + "') and AuditDate is null)";
strSql += " and p.PunishmentId in (select PunishmentId from EMC_PunishmentAudit where ((AuditMan='" + user.DepartId + "' or AuditMan='" + this.CurrUser.UserId + "') and AuditDate is null) or (p.States='3' and p.MainCoordinatorEndDate is not null and p.UserDepStartDate is null and fo.Main_Coordinator='" + this.CurrUser.UserId + "'))";
}
}
}
@ -207,14 +208,32 @@ namespace FineUIPro.Web.ContractorQuality
var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
if (user != null)
{
if (pun.IsFrame == true && user.DepartId == pun.UserDep)
if ((pun.MainCoordinatorEndDate.HasValue && pun.MainCoordinatorEndDate.Value.AddDays(3) < DateTime.Now) || pun.UserDepStartDate.HasValue)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IncidentInvestigationEdit.aspx?punishmentId={0}", rowID, "编辑 - ")));
if (pun.IsFrame == true && user.DepartId == pun.UserDep)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IncidentInvestigationEdit.aspx?punishmentId={0}", rowID, "编辑 - ")));
}
else
{
var depart = BLL.DepartService.GetDepartNameById(pun.UserDep);
ShowAlert("您不是" + depart + "部门用户,不能操作！", MessageBoxIcon.Warning);
}
}
else
{
var depart = BLL.DepartService.GetDepartNameById(pun.UserDep);
ShowAlert("您不是" + depart + "部门用户,不能操作！", MessageBoxIcon.Warning);
Model.FC_SESRelatedData fc = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(pun.FO_NO);
if (fc != null)
{
if (this.CurrUser.UserId == fc.Main_Coordinator || this.CurrUser.RoleId == BLL.Const.Role_Contractor_LeaderId)//当前用户等于主协调员
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("IncidentInvestigationEdit.aspx?punishmentId={0}", rowID, "编辑 - ")));
}
else
{
ShowAlert("您不是" + BLL.Sys_UserService.GetUserNameByUserId(fc.Main_Coordinator) + "，不能操作！", MessageBoxIcon.Warning);
}
}
}
}
}
@ -614,6 +633,8 @@ namespace FineUIPro.Web.ContractorQuality
}
#endregion
#region 格式化字符串
#region 审批人
/// <summary>
/// 审批人
/// </summary>
@ -655,7 +676,19 @@ namespace FineUIPro.Web.ContractorQuality
}
else if (pun.States == "3" && pun.IsFrame == true)
{
name = BLL.DepartService.GetDepartNameById(pun.UserDep);
//承包商联系人有异议或3天未有动作
if ((pun.MainCoordinatorEndDate.HasValue && pun.MainCoordinatorEndDate.Value.AddDays(3) < DateTime.Now) || pun.UserDepStartDate.HasValue)
{
name = BLL.DepartService.GetDepartNameById(pun.UserDep);
}
else
{
Model.FC_SESRelatedData fc = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(pun.FO_NO);
if (fc != null)
{
name = BLL.Sys_UserService.GetUserNameByUserId(fc.Main_Coordinator);
}
}
}
else if (pun.States == "4" && pun.IsFrame == true)
{
@ -669,7 +702,9 @@ namespace FineUIPro.Web.ContractorQuality
}
return name;
}
#endregion
#region 状态
/// <summary>
/// 当期状态
/// </summary>
@ -697,13 +732,23 @@ namespace FineUIPro.Web.ContractorQuality
}
else
{
s = "进行中";
if (pun.Pause == true)
{
s = "已暂停";
}
else
{
s = "进行中";
}
}
}
}
return s;
}
#endregion
#endregion
#region 筛选
/// <summary>
/// 筛选
/// </summary>
@ -713,5 +758,6 @@ namespace FineUIPro.Web.ContractorQuality
{
BindGrid();
}
#endregion
}
}

42
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx
View File

@ -177,8 +177,8 @@
</f:Label>
<f:Button ID="btnAttach2" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
</f:Button>
<f:Label ID="Label6" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
<f:LinkButton ID="lbtnViewAttach2" runat="server" Text="查看" OnClick="lbtnViewAttach2_Click"></f:LinkButton>
<f:Label ID="Label6" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
<f:LinkButton ID="lbtnViewAttach2" runat="server" Text="查看" OnClick="lbtnViewAttach2_Click"></f:LinkButton>
</Items>
</f:Panel>
</Items>
@ -246,7 +246,8 @@
<f:Form ShowBorder="false" ShowHeader="false" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items><f:DropDownList ID="drpBuyer2" runat="server" Label="采购员" LabelAlign="Right" LabelWidth="150px" EnableEdit="true"></f:DropDownList>
<Items>
<f:DropDownList ID="drpBuyer2" runat="server" Label="采购员" LabelAlign="Right" LabelWidth="150px" EnableEdit="true"></f:DropDownList>
<f:DropDownList ID="drpViolationClause2" runat="server" Label="违章条款" EnableEdit="true" LabelAlign="Right" LabelWidth="150px" EnableGroup="true"
AutoPostBack="true" OnSelectedIndexChanged="drpViolationClause2_OnSelectedIndexChanged" ShowRedStar="true" Required="true">
</f:DropDownList>
@ -273,7 +274,7 @@
</f:Label>
<f:Button ID="btnAttach3" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnAttach2_Click">
</f:Button>
<f:Label ID="Label8" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
<f:Label ID="Label8" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
<f:LinkButton ID="lbtnAttach3" runat="server" Text="查看" OnClick="lbtnViewAttach2_Click"></f:LinkButton>
</Items>
</f:Panel>
@ -313,10 +314,41 @@
</f:GroupPanel>
</Items>
</f:FormRow>
<f:FormRow ID="frModifyDef" runat="server" Hidden="true">
<Items>
<f:TextArea ID="txtModifyDef" runat="server" Label="修改内容说明" LabelAlign="Right" LabelWidth="140px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow ID="frModifyDefUrl" runat="server" Hidden="true">
<Items>
<f:Panel ID="Panel4" Width="500px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server" BodyPadding="10px" >
<Items>
<f:Label ID="Label13" runat="server" Label="修改内容说明" LabelAlign="Right" LabelWidth="140px">
</f:Label>
<f:Button ID="btnModifyAttach" Icon="TableCell" EnablePostBack="true" Text="上传" runat="server" OnClick="btnModifyAttach_Click">
</f:Button>
<f:Label ID="Label14" runat="server" Text="（最大不超过20M）" CssClass="customlabel"></f:Label>
<f:LinkButton ID="lbtnModifyAttach" runat="server" Text="查看" OnClick="lbtnModifyAttach_Click"></f:LinkButton>
</Items>
</f:Panel>
</Items>
</f:FormRow>
<f:FormRow ID="frPassResult" runat="server" Hidden="true">
<Items>
<f:RadioButtonList ID="rblPass" runat="server" Label="最终审核结果" LabelAlign="Right" LabelWidth="140px">
<f:RadioItem Value="True" Text="通过" />
<f:RadioItem Value="False" Text="不通过" />
</f:RadioButtonList>
<f:Label ID="Label15" runat="server"></f:Label>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:HiddenField ID="hdModifyContent" runat="server"></f:HiddenField>
<f:HiddenField ID="hdId" runat="server"></f:HiddenField>
<f:Button ID="btnReturn" Icon="ArrowRedo" runat="server" Text="退回到上一流程" ToolTip="退回到上一流程" OnClick="btnReturn_Click" Hidden="true">
</f:Button>
@ -331,6 +363,8 @@
<f:Button ID="btnSbumit" Icon="DatabaseSave" runat="server" Text="提交" ToolTip="提交" ValidateForms="SimpleForm1"
OnClick="btnSbumit_Click" Hidden="true">
</f:Button>
<f:Button ID="btnPause" Icon="ControlPauseBlue" runat="server" Text="暂停" ToolTip="暂停" Hidden="true" OnClick="btnPause_Click"></f:Button>
<f:Button ID="btnSureModify" Icon="DatabaseSave" runat="server" Text="确认修改" ToolTip="确认修改" Hidden="true" OnClick="btnSureModify_Click"></f:Button>
</Items>
</f:Toolbar>
</Toolbars>

623
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.cs
View File

@ -1,7 +1,9 @@
using BLL;
using BLL.Common;
using NPOI.POIFS.Crypt.Dsig;
using Org.BouncyCastle.Bcpg.OpenPgp;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Drawing;
using System.Linq;
@ -69,7 +71,6 @@ namespace FineUIPro.Web.ContractorQuality
this.PunishmentId = Request.Params["punishmentId"];
if (!string.IsNullOrEmpty(this.PunishmentId))
{
var att1 = from x in Funs.DB.AttachFile where x.ToKeyId == this.PunishmentId + "#1" select x;
if (att1.Count() == 0)
{
@ -107,6 +108,9 @@ namespace FineUIPro.Web.ContractorQuality
GroupPanel3.Hidden = false;
GroupPanel4.Hidden = false;
GroupPanel5.Hidden = false;
frModifyDef.Hidden = false;
frModifyDefUrl.Hidden = false;
//frPassResult.Hidden = false;
var audit = BLL.PunishmentAuditService.GetAuditBypunishmentIdAndAuditMan(this.PunishmentId, this.CurrUser.UserId);
if (pun.IsPass == false && audit != null)
@ -308,15 +312,44 @@ namespace FineUIPro.Web.ContractorQuality
}
else if (pun.States == "3" && pun.IsFrame == true)//用户部门填写
{
//GroupPanel1.Enabled = false;
GroupPanel1Enabled();
GroupPanel2.Hidden = false;
GroupPanel2.Enabled = false;
//GroupPanel3.Enabled = false;
GroupPanel3Enabled();
GroupPanel3.Hidden = false;
GroupPanel4.Hidden = false;
this.btnSbumit.Hidden = false;
//用户部门操作前主协调员可暂停
Model.FC_SESRelatedData fc = BLL.SESRelatedDataService.GetSESRelatedDataByFoNo(pun.FO_NO);
if (fc != null)
{
if (this.CurrUser.UserId == fc.Main_Coordinator)//当前用户等于主协调员
{
Panel4.Hidden = false;
if (pun.MainCoordinatorEndDate.HasValue && pun.MainCoordinatorEndDate.Value.AddDays(3) >= DateTime.Now)
{
this.btnPause.Hidden = false;
//this.btnSave.Hidden = true;
//this.btnSbumit.Hidden = true;
this.GroupPanel4.Hidden = true;
}
if (pun.Pause == true)
{
this.btnPause.Hidden = true;
this.frPassResult.Hidden = false;
}
}
// 承包商管理角色可编辑提交后的申报人填写、SSR填写、主协调员填写内容
if (this.CurrUser.RoleId == BLL.Const.Role_Contractor_LeaderId)
{
GroupPanel1.Enabled = true;
GroupPanel2.Enabled = true;
GroupPanel3.Enabled = true;
GroupPanel4.Hidden = true;
frModifyDef.Hidden = false;
frModifyDefUrl.Hidden = false;
this.btnSave.Hidden = true;
this.btnSbumit.Hidden = true;
this.btnSureModify.Hidden = false;
}
}
}
else if (pun.States == "4" && pun.IsFrame == true)//合同管理员填写
{
@ -490,7 +523,9 @@ namespace FineUIPro.Web.ContractorQuality
this.txtIndividualSESReason.Text = pun.IndividualSESReason;
this.txtSESReson.Text = pun.SESReason;
this.txtBuyerReson.Text = pun.BuyerReson;
#endregion
this.hdModifyContent.Text = pun.ModifyContent;
this.txtModifyDef.Text = pun.ModifyContent;
#endregion
}
}
else
@ -500,7 +535,7 @@ namespace FineUIPro.Web.ContractorQuality
}
}
}
#region 不可编辑
/// <summary>
/// 申报人填写不可编辑
/// </summary>
@ -551,6 +586,7 @@ namespace FineUIPro.Web.ContractorQuality
Label10.Enabled = false;
}
#endregion
#endregion
#region 保存、提交
/// <summary>
@ -577,6 +613,7 @@ namespace FineUIPro.Web.ContractorQuality
{
if (!string.IsNullOrEmpty(this.PunishmentId))
{
List<string> emialLists = new List<string>(); //承包商联系人Email
var pun = BLL.PunishmentService.GetPunishmentById(this.PunishmentId);
if (pun != null)
{
@ -596,6 +633,10 @@ namespace FineUIPro.Web.ContractorQuality
{
pun.ContractAdmin = this.drpContractAdmin.SelectedValue;
}
if (!string.IsNullOrEmpty(fc.Email))
{
emialLists.Add(fc.Email);//承包商联系人Email
}
}
else
{
@ -759,7 +800,7 @@ namespace FineUIPro.Web.ContractorQuality
{
pun.States = "3";//主协调员提交
pun.MainCoordinatorEndDate = DateTime.Now;//主协调员审批时间
pun.UserDepStartDate = DateTime.Now;//用户部门审批到达时间
//pun.UserDepStartDate = DateTime.Now;//用户部门审批到达时间
var updateAudit = BLL.PunishmentAuditService.GetAuditByAuditMan(this.PunishmentId, this.CurrUser.UserId);
if (updateAudit != null)
@ -769,14 +810,14 @@ namespace FineUIPro.Web.ContractorQuality
updateAudit.IsPass = true;
BLL.PunishmentAuditService.UpdatePunishmentAudit(updateAudit);
}
//通知承包商联系人，有3天反馈时间，若3天后未处理，进入下一审批，否则暂停重新评估
//Model.EMC_PunishmentAudit audit = new Model.EMC_PunishmentAudit();
//audit.AuditId = SQLHelper.GetNewID(typeof(Model.EMC_PunishmentAudit));
//audit.PunishmentId = this.PunishmentId;
//audit.AuditMan = pun.UserDep;
//BLL.PunishmentAuditService.AddPunishmentAudit(audit);
Model.EMC_PunishmentAudit audit = new Model.EMC_PunishmentAudit();
audit.AuditId = SQLHelper.GetNewID(typeof(Model.EMC_PunishmentAudit));
audit.PunishmentId = this.PunishmentId;
audit.AuditMan = pun.UserDep;
BLL.PunishmentAuditService.AddPunishmentAudit(audit);
#region 主协调员审批通过邮件:发送给部门经理，抄送流程经办人
#region 主协调员通过-通知承包商联系人
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
@ -786,44 +827,76 @@ namespace FineUIPro.Web.ContractorQuality
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("承包商联系人通知"));
if (emailTemplate.Count() > 0)
{
string departLeader = string.Empty;
var depart = BLL.DepartService.GetDepartById(drpUserDep.SelectedValue);
if (depart != null)
{
departLeader = depart.DepartLeader;
}
if (!string.IsNullOrEmpty(departLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departLeader) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
//var userTo = from x in Funs.DB.Sys_User
// where x.RoleId == BLL.Const.Role_Contractor_LeaderId && x.Email != null && x.Email != ""
// select x;
//if (userTo != null)
//{
// mailTo = userTo.Select(x => x.Email).ToArray();
//}
mailTo = emialLists.ToArray();
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "主协调员填写完成后审批通过通知", mailTo, mailCC, out resultMessage);
MailHelper.SendPunishSesMail(pops, myPram, "承包商联系人通知", mailTo, mailCC, out resultMessage);
}
}
#endregion
#region 主协调员审批通过邮件:发送给部门经理，抄送流程经办人
//Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
//if (pops == null)
//{
// return;
//}
//string[] mailTo = null;
//string[] mailCC = null;
//string resultMessage = "";
//var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
//if (emailTemplate.Count() > 0)
//{
// string departLeader = string.Empty;
// var depart = BLL.DepartService.GetDepartById(drpUserDep.SelectedValue);
// if (depart != null)
// {
// departLeader = depart.DepartLeader;
// }
// if (!string.IsNullOrEmpty(departLeader))
// {
// var userTo = from x in Funs.DB.Sys_User
// where x.UserId.Contains(departLeader) && x.Email != null && x.Email != ""
// select x;
// if (userTo != null)
// {
// mailTo = userTo.Select(x => x.Email).ToArray();
// }
// }
// var userCc = from x in Funs.DB.View_EMail_UserTo
// where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
// && x.Email != null && x.Email != ""
// select x;
// if (userCc != null)
// {
// mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
// }
// if (mailTo.Length > 0)
// {
// NameValueCollection myPram = new NameValueCollection();
// myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
// myPram.Add("位置", pun.Location);
// myPram.Add("质量事件描述", pun.Description);
// MailHelper.SendPunishSesMail(pops, myPram, "主协调员填写完成后审批通过通知", mailTo, mailCC, out resultMessage);
// }
//}
#endregion
}
}
else //非框架合同
@ -974,87 +1047,220 @@ namespace FineUIPro.Web.ContractorQuality
}
else if (pun.States == "3")//用户部门提交
{
if (!string.IsNullOrEmpty(this.txtIndividualSES.Text.Trim()))
var user = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
if (user != null)
{
pun.ViolationRelatedSes = this.txtIndividualSES.Text.Trim();
}
else
{
if (!string.IsNullOrEmpty(this.txtIndividualSESReason.Text.Trim()))
if (user.DepartId == pun.UserDep)
{
pun.IndividualSESReason = this.txtIndividualSESReason.Text.Trim();
if (!string.IsNullOrEmpty(this.txtIndividualSES.Text.Trim()))
{
pun.ViolationRelatedSes = this.txtIndividualSES.Text.Trim();
}
else
{
if (!string.IsNullOrEmpty(this.txtIndividualSESReason.Text.Trim()))
{
pun.IndividualSESReason = this.txtIndividualSESReason.Text.Trim();
}
else
{
Alert.ShowInTop("如不填写，请描述原因！", MessageBoxIcon.Warning);
return;
}
}
if (type == BLL.Const.BtnSubmit)
{
pun.States = "4";//用户部门提交
pun.UserDepEndDate = DateTime.Now;//用户部门审批时间
var u = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
if (u != null)
{
var updateAudit = BLL.PunishmentAuditService.GetAuditByAuditMan(this.PunishmentId, u.DepartId);
if (updateAudit != null)
{
updateAudit.AuditMan = this.CurrUser.UserId;
updateAudit.AuditDate = DateTime.Now;
updateAudit.IsPass = true;
BLL.PunishmentAuditService.UpdatePunishmentAudit(updateAudit);
}
}
Model.EMC_PunishmentAudit audit = new Model.EMC_PunishmentAudit();
audit.AuditId = SQLHelper.GetNewID(typeof(Model.EMC_PunishmentAudit));
audit.PunishmentId = this.PunishmentId;
audit.AuditMan = pun.ContractAdmin;
BLL.PunishmentAuditService.AddPunishmentAudit(audit);
#region 用户部门填写后审批邮件：发送给合同管理员，抄送给流程经办人
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("用户部门填写后审核通知"));
if (emailTemplate.Count() > 0)
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(this.drpContractAdmin.SelectedValue)
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where (x.PunishmentId == this.PunishmentId && x.AuditDate != null)
|| (x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "用户部门填写后审核通知", mailTo, mailCC, out resultMessage);
}
}
#endregion
}
}
else
{
Alert.ShowInTop("如不填写，请描述原因！", MessageBoxIcon.Warning);
return;
}
}
if (type == BLL.Const.BtnSubmit)
{
pun.States = "4";//用户部门提交
pun.UserDepEndDate = DateTime.Now;//用户部门审批时间
var u = BLL.Sys_UserService.GetUsersByUserId(this.CurrUser.UserId);
if (u != null)
{
var updateAudit = BLL.PunishmentAuditService.GetAuditByAuditMan(this.PunishmentId, u.DepartId);
if (updateAudit != null)
#region 最终审核通过，发送给用户部门办理,未通过发送给所有经办人
Model.View_FC_SESRelatedData fc = BLL.SESRelatedDataService.GetSESRelatedDataViewByFO(pun.FO_NO);
if (fc != null)
{
updateAudit.AuditMan = this.CurrUser.UserId;
updateAudit.AuditDate = DateTime.Now;
updateAudit.IsPass = true;
BLL.PunishmentAuditService.UpdatePunishmentAudit(updateAudit);
if (this.CurrUser.UserId == fc.Main_CoordinatorId && type == BLL.Const.BtnSubmit)
{
if (rblPass.SelectedValue == "False")
{
//最终审核未通过通知
pun.States = "7";//已拒绝
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
//string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批未通过通知"));
if (emailTemplate.Count() > 0)
{
var userTo = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).Distinct().ToArray();
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "主协调员填写完成后审批未通过通知", mailTo, null, out resultMessage);
}
}
}
else
{
pun.UserDepStartDate = DateTime.Now;//用户部门审批到达时间
pun.Pause = false;//如果审核通过，取消暂停
#region 主协调员审批通过邮件:如果部门有部门代理人，发送给部门代理人，抄送给部门经理及流程经办人；如果没有部门代理人，发送给部门经理，抄送给流程经办人
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
if (emailTemplate.Count() > 0)
{
string delegatedRepresentative = string.Empty;//部门代理人
string departmentLeader = string.Empty;//部门经理
var depart = BLL.DepartService.GetDepartById(drpUserDep.SelectedValue);
if (depart != null)
{
delegatedRepresentative = depart.DelegatedRepresentative;
departmentLeader = depart.DepartLeader;
}
if (!string.IsNullOrEmpty(delegatedRepresentative))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(delegatedRepresentative) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector) || x.UserId.Contains(departmentLeader))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
else
{
if(!string.IsNullOrEmpty(departmentLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departmentLeader) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == this.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "主协调员填写完成后审批通过通知", mailTo, mailCC, out resultMessage);
}
}
#endregion
}
}
}
#endregion
}
Model.EMC_PunishmentAudit audit = new Model.EMC_PunishmentAudit();
audit.AuditId = SQLHelper.GetNewID(typeof(Model.EMC_PunishmentAudit));
audit.PunishmentId = this.PunishmentId;
audit.AuditMan = pun.ContractAdmin;
BLL.PunishmentAuditService.AddPunishmentAudit(audit);
#region 用户部门填写后审批邮件：发送给合同管理员，抄送给流程经办人
Model.EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string[] mailCC = null;
string resultMessage = "";
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("用户部门填写后审核通知"));
if (emailTemplate.Count() > 0)
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(this.drpContractAdmin.SelectedValue)
&& x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where (x.PunishmentId == this.PunishmentId && x.AuditDate != null)
|| (x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "用户部门填写后审核通知", mailTo, mailCC, out resultMessage);
}
}
#endregion
}
}
else if (pun.States == "4")//合同管理员
@ -1699,12 +1905,12 @@ namespace FineUIPro.Web.ContractorQuality
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=view&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=1", this.hdId.Text, BLL.Const.IncidentInvestigationMenuId)));
}
/// <summary>
/// 质量调查相关附件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach2_Click(object sender, EventArgs e)
/// <summary>
/// 质量调查相关附件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAttach2_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.hdId.Text)) //新增记录
{
@ -1722,6 +1928,31 @@ namespace FineUIPro.Web.ContractorQuality
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=view&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=2", this.PunishmentId, BLL.Const.IncidentInvestigationMenuId)));
}
#region 修改内容说明附件
/// <summary>
/// 上传
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnModifyAttach_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.hdId.Text))
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=edit&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=3", this.PunishmentId, BLL.Const.IncidentInvestigationMenuId)));
}
}
/// <summary>
/// 查看
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtnModifyAttach_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../AttachFile/webuploader2.aspx?type=view&toKeyId={0}&path=FileUpload/SES/EMC_Punishment&menuId={1}&strParam=3", this.PunishmentId, BLL.Const.IncidentInvestigationMenuId)));
}
#endregion
#endregion
#region 拒绝
@ -1771,8 +2002,156 @@ namespace FineUIPro.Web.ContractorQuality
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
#region 暂停
/// <summary>
/// 承包商联系人有异议线下通知主协调员，主协调员可暂停重新评估
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnPause_Click(object sender, EventArgs e)
{
var pun = BLL.PunishmentService.GetPunishmentById(this.PunishmentId);
if (pun != null)
{
pun.Pause = true;
pun.PauseDate = DateTime.Now;
Funs.DB.SubmitChanges();
ShowNotify("已暂停，请联合发起人及承包商调查审核！", MessageBoxIcon.Information);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
}
#endregion
#region 保存修改
/// <summary>
/// 确认修改
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSureModify_Click(object sender, EventArgs e)
{
string con = string.Empty;
if (!string.IsNullOrEmpty(this.PunishmentId))
{
var pun = BLL.PunishmentService.GetPunishmentById(this.PunishmentId);
if (pun != null)
{
if (pun.States == "3" && !pun.UserDepStartDate.HasValue && rblSeType.SelectedValue == "1")
{
Model.View_FC_SESRelatedData fc = BLL.SESRelatedDataService.GetSESRelatedDataViewByFO(pun.FO_NO);
if (fc != null)
{
#region 承包商管理角色可修改用户部门前的所有内容
if (this.CurrUser.RoleId == BLL.Const.Role_Contractor_LeaderId)
{
if (pun.PunishDate.Value.ToShortDateString() != Funs.GetNewDateTime(this.txtPunishDate.Text.Trim()).Value.ToShortDateString())
{
con += "发现日期由【" + string.Format("{0:yyyy-MM-dd}", pun.PunishDate) + "】改为【" + string.Format("{0:yyyy-MM-dd}", Funs.GetNewDateTime(this.txtPunishDate.Text.Trim())) + "】；";
pun.PunishDate = Funs.GetNewDateTime(this.txtPunishDate.Text.Trim());
}
if (pun.Location != this.txtLocation.Text.Trim())
{
con += "位置由【" + pun.Location + "】改为【" + this.txtLocation.Text.Trim() + "】；";
pun.Location = this.txtLocation.Text.Trim();
}
if (pun.Description != this.txtDescription.Text.Trim())
{
con += "质量事件描述由【" + pun.Description + "】改为【" + this.txtDescription.Text.Trim() + "】；";
pun.Description = this.txtDescription.Text.Trim();
}
if (pun.MIContractor != this.txtMIContractor.Text.Trim())
{
con += "可能涉及的承包商由【" + pun.MIContractor + "】改为【" + this.txtMIContractor.Text.Trim() + "】；";
pun.MIContractor = this.txtMIContractor.Text.Trim();
}
if (pun.SeType != this.rblSeType.SelectedValue)
{
con += "类型由【" + pun.SeType == "1" ? "服务" : "物资" + "】改为【" + this.rblSeType.SelectedValue == "1" ? "服务" : "物资" + "】；";
pun.SeType = this.rblSeType.SelectedValue;
}
if (pun.FO_NO != this.txtFO_No.Text.Trim())
{
con += "合同号由【" + pun.FO_NO + "】改为【" + this.txtFO_No.Text.Trim() + "】；";
pun.FO_NO = this.txtFO_No.Text.Trim();
}
if (pun.Contractor != this.txtContractor.Text.Trim())
{
con += "涉及承包商由【" + pun.Contractor + "】改为【" + this.txtContractor.Text.Trim() + "】；";
pun.Contractor = this.txtContractor.Text.Trim();
}
if (pun.ContractAdmin != this.drpContractAdmin.SelectedValue)
{
if (this.drpContractAdmin.SelectedValue != BLL.Const._Null)
{
con += "合同管理员由【" + Sys_UserService.GetUserNameByUserId(pun.Contractor) + "】改为【" + Sys_UserService.GetUserNameByUserId(this.drpContractAdmin.SelectedValue) + "】；";
pun.ContractAdmin = this.drpContractAdmin.SelectedValue;
}
}
if (pun.ContractRequester != this.drpContractRequester.SelectedValue)
{
if (this.drpContractRequester.SelectedValue != BLL.Const._Null)
{
con += "合同需求人由【" + Sys_UserService.GetUserNameByUserId(pun.ContractRequester) + "】改为【" + Sys_UserService.GetUserNameByUserId(this.drpContractRequester.SelectedValue) + "】；";
pun.ContractRequester = this.drpContractRequester.SelectedValue;
}
}
//if (pun.ContractRequesterDep != txtContractRequesterDep.Text.Trim())
//{
// con += "需求人部门由" + pun.ContractRequesterDep + "改为" + txtContractRequesterDep.Text.Trim() + "；";
// pun.ContractRequester = this.drpContractRequester.SelectedValue;
//}
//if (pun.Buyer != this.drpBuyer.SelectedValue)
//{
// con += "采购员由" + Sys_UserService.GetUserNameByUserId(pun.Buyer) + "改为" + Sys_UserService.GetUserNameByUserId(this.drpBuyer.SelectedValue) + "；";
// pun.ContractRequester = this.drpContractRequester.SelectedValue;
//}
if (pun.ViolationDegree != this.drpViolationDegree.SelectedValue)
{
if (this.drpViolationDegree.SelectedValue != BLL.Const._Null)
{
con += "违章条款由【" + BLL.ViolationClauseService.GetViolationClause(pun.ViolationDegree).ClauseDef + "】改为【" + BLL.ViolationClauseService.GetViolationClause(this.drpViolationDegree.SelectedValue).ClauseDef + "】；";
pun.ViolationDegree = this.drpViolationDegree.SelectedValue;
}
}
if (pun.Company != Funs.GetNewDecimal(this.txtCompany.Text.Trim()))
{
con += "违章扣款（公司）由【" + pun.Company + "】改为【" + Funs.GetNewDecimal(this.txtCompany.Text.Trim()) + "】；";
pun.Company = Funs.GetNewDecimal(this.txtCompany.Text.Trim());
}
if (pun.IndividualPerson != this.txtIndividualPerson.Text.Trim())
{
con += "违章人员由【" + pun.IndividualPerson + "】改为【" + this.txtIndividualPerson.Text.Trim() + "】；";
pun.IndividualPerson = this.txtIndividualPerson.Text.Trim();
}
if (pun.Individual != Funs.GetNewDecimal(this.txtIndividual.Text.Trim()))
{
con += "违章扣款（个人）由【" + pun.Individual + "】改为【" + Funs.GetNewDecimal(this.txtIndividual.Text.Trim()) + "】；";
pun.Individual = Funs.GetNewDecimal(this.txtIndividual.Text.Trim());
}
if (pun.UserDep != this.drpUserDep.SelectedValue)
{
if (this.drpUserDep.SelectedValue != BLL.Const._Null)
{
con += "用户部门由【" + DepartService.GetDepartNameById(pun.UserDep) + "】改为【" + DepartService.GetDepartNameById(this.drpUserDep.SelectedValue) + "】；";
pun.UserDep = this.drpUserDep.SelectedValue;
}
}
this.txtModifyDef.Text = this.hdModifyContent.Text + con;
pun.ModifyContent = this.txtModifyDef.Text.Trim();
pun.Modifyer = this.CurrUser.UserId;
pun.ModifyDate = DateTime.Now;
Funs.DB.SubmitChanges();
ShowNotify("修改成功！", MessageBoxIcon.Success);
}
#endregion
}
}
}
}
}
#endregion
}
}

126
FCL/FineUIPro.Web/ContractorQuality/IncidentInvestigationEdit.aspx.designer.cs generated
View File

@ -761,6 +761,105 @@ namespace FineUIPro.Web.ContractorQuality
/// </remarks>
protected global::FineUIPro.TextBox txtBuyerReson;
/// <summary>
/// frModifyDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow frModifyDef;
/// <summary>
/// txtModifyDef 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtModifyDef;
/// <summary>
/// frModifyDefUrl 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow frModifyDefUrl;
/// <summary>
/// Panel4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel4;
/// <summary>
/// Label13 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label13;
/// <summary>
/// btnModifyAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnModifyAttach;
/// <summary>
/// Label14 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label14;
/// <summary>
/// lbtnModifyAttach 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.LinkButton lbtnModifyAttach;
/// <summary>
/// frPassResult 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FormRow frPassResult;
/// <summary>
/// rblPass 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.RadioButtonList rblPass;
/// <summary>
/// Label15 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label15;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -770,6 +869,15 @@ namespace FineUIPro.Web.ContractorQuality
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// hdModifyContent 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdModifyContent;
/// <summary>
/// hdId 控件。
/// </summary>
@ -824,6 +932,24 @@ namespace FineUIPro.Web.ContractorQuality
/// </remarks>
protected global::FineUIPro.Button btnSbumit;
/// <summary>
/// btnPause 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPause;
/// <summary>
/// btnSureModify 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSureModify;
/// <summary>
/// Window1 控件。
/// </summary>

10
FCL/FineUIPro.Web/Evaluation/EvaluationNew.aspx.cs
View File

@ -791,7 +791,7 @@ namespace FineUIPro.Web.Evaluation
fsModel.Timely = homelyModel.Timely;
}
}
else if (fotype.Trim() == "TAR")
else if (fotype.Trim().Contains("TAR"))
{
if (tar_homelyModel != null && tar_homelyModel.Timely != null)
{
@ -834,6 +834,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null)
{
punish.IsUserEvaluated = true;
//punish.IsUserEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges();
}
@ -914,7 +915,7 @@ namespace FineUIPro.Web.Evaluation
fsModel.Timely = homelyModel.Timely;
}
}
else if (fotype.Trim() == "TAR")
else if (fotype.Trim().Contains("TAR"))
{
if (tar_homelyModel != null && tar_homelyModel.Timely != null)
{
@ -965,6 +966,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null)
{
punish.IsDepEvaluated = true;
//punish.IsDepEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges();
}
}
@ -1303,7 +1305,7 @@ namespace FineUIPro.Web.Evaluation
fsModel.Timely = homelyModel.Timely;
}
}
else if (fotype.Trim() == "TAR")
else if (fotype.Trim().Contains("TAR"))
{
if (tar_homelyModel != null && tar_homelyModel.Timely != null)
{
@ -1387,7 +1389,7 @@ namespace FineUIPro.Web.Evaluation
fsModel.Timely = homelyModel.Timely;
}
}
else if (fotype.Trim() == "TAR")
else if (fotype.Trim().Contains("TAR"))
{
if (tar_homelyModel != null && tar_homelyModel.Timely != null)
{

8
FCL/FineUIPro.Web/Evaluation/PerformanceReport.aspx.cs
View File

@ -2120,6 +2120,8 @@ namespace FineUIPro.Web.Evaluation
ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if (ws.GetRow(rowIndex).GetCell(26) == null) ws.GetRow(rowIndex).CreateCell(26);
ws.GetRow(rowIndex).GetCell(26).SetCellValue(p.CreateDate != null ? p.CreateDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)(90 * (rowIndex) / totalNum) > percent)
{
@ -2244,6 +2246,8 @@ namespace FineUIPro.Web.Evaluation
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
if (wsCm.GetRow(rowIndex).GetCell(16) == null) wsCm.GetRow(rowIndex).CreateCell(16);
wsCm.GetRow(rowIndex).GetCell(16).SetCellValue(p.UploadDate != null ? p.UploadDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount )) / totalNum) > percent)
{
@ -2910,6 +2914,8 @@ namespace FineUIPro.Web.Evaluation
ws.GetRow(rowIndex).GetCell(24).SetCellValue(p.SES_No);
if (ws.GetRow(rowIndex).GetCell(25) == null) ws.GetRow(rowIndex).CreateCell(25);
ws.GetRow(rowIndex).GetCell(25).SetCellValue(p.CompletionDate != null ? p.CompletionDate.Value.ToString("yyyy/MM/dd") : "");
if (ws.GetRow(rowIndex).GetCell(26) == null) ws.GetRow(rowIndex).CreateCell(26);
ws.GetRow(rowIndex).GetCell(26).SetCellValue(p.CreateDate != null ? p.CreateDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)(90 * (rowIndex) / totalNum) > percent)
{
@ -3034,6 +3040,8 @@ namespace FineUIPro.Web.Evaluation
wsCm.GetRow(rowIndex).GetCell(14).SetCellValue(p.User_Representative);
if (wsCm.GetRow(rowIndex).GetCell(15) == null) wsCm.GetRow(rowIndex).CreateCell(15);
wsCm.GetRow(rowIndex).GetCell(15).SetCellValue(p.BycDept);
if (wsCm.GetRow(rowIndex).GetCell(16) == null) wsCm.GetRow(rowIndex).CreateCell(16);
wsCm.GetRow(rowIndex).GetCell(16).SetCellValue(p.UploadDate != null ? p.UploadDate.Value.ToString("yyyy/MM/dd") : "");
if ((int)((90 * (rowIndex + punishCount)) / totalNum) > percent)
{

2
FCL/FineUIPro.Web/Evaluation/SafetyEvaluation.aspx.cs
View File

@ -835,6 +835,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null)
{
punish.IsUserEvaluated = true;
punish.IsUserEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges();
}
}
@ -964,6 +965,7 @@ namespace FineUIPro.Web.Evaluation
if (punish != null)
{
punish.IsDepEvaluated = true;
punish.IsDepEvaluatedTime = DateTime.Now;
Funs.DB.SubmitChanges();
}
}

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_CN.xlsx
View File

Binary file not shown.

BIN
FCL/FineUIPro.Web/File/Excel/Performance Report_EN.xlsx
View File

Binary file not shown.

349
FCL/FineUIPro.Web/Global.asax.cs
View File

@ -15,6 +15,7 @@
using FineUIPro.Web.common;
using Model;
using NPOI.SS.Formula.Functions;
using Newtonsoft.Json;
public class Global : System.Web.HttpApplication
{
@ -25,7 +26,7 @@
protected void Application_Start(object sender, EventArgs e)
{
Application["OnlineUserCount"] = 0;
try
{
@ -45,9 +46,8 @@
AppDomain.Unload(AppDomain.CurrentDomain);
}
//每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
if ((DateTime.Now.Day == 2 || DateTime.Now.Day == 5 || DateTime.Now.Day == 8 || DateTime.Now.Day == 10))
if ((DateTime.Now.Day == 2 || DateTime.Now.Day == 5 || DateTime.Now.Day == 8 || DateTime.Now.Day == 10) && DateTime.Now.Hour == 8)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_Elapsed);
@ -55,20 +55,20 @@
aTimer.Interval = 1000 * 60 * 60;
aTimer.Enabled = true;
aTimer.Start();
}
//自动填写评价
if (DateTime.Now.Day == 12)
{
System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_AutoFill);
//30分钟执行一次
aTimer.Interval = 1800000;
aTimer.Interval = 1000 * 60 * 30;
aTimer.Enabled = true;
aTimer.Start();
}
// 过期提示
//var foList = from x in Funs.DB.FC_SESRelatedData
// where x.Expire_Date != null
@ -83,7 +83,7 @@
aTimer.Interval = 1000 * 60 * 60;
aTimer.Enabled = true;
aTimer.Start();
}
// 框架承包商评估表的填写邮件通知
@ -91,7 +91,7 @@
{
System.Timers.Timer aTimer = new System.Timers.Timer();
aTimer.Elapsed += new System.Timers.ElapsedEventHandler(aTimer_FC_AutoSend);
//4小时执行一次
//1小时执行一次
aTimer.Interval = 1000 * 60 * 60;
aTimer.Enabled = true;
aTimer.Start();
@ -102,9 +102,9 @@
{
System.Timers.Timer fcTimer = new System.Timers.Timer();
fcTimer.Elapsed += new System.Timers.ElapsedEventHandler(FC_AutoStatus);
//120分钟执行一次
//60分钟执行一次
fcTimer.Interval = 1000 * 60 * 60;
fcTimer.Enabled = true;
fcTimer.Enabled = true;
fcTimer.Start();
}
@ -187,6 +187,28 @@
fcTimer.Enabled = true;
fcTimer.Start();
}
//合同绩效违规处理
if (DateTime.Now.Hour == 10)
{
System.Timers.Timer fcTimer = new System.Timers.Timer();
fcTimer.Elapsed += new System.Timers.ElapsedEventHandler(queTimer_ViolationHandling);
//1小时执行一次
fcTimer.Interval = 1000 * 60 * 60;
fcTimer.Enabled = true;
fcTimer.Start();
}
//承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门经理
if (DateTime.Now.Hour == 10)
{
System.Timers.Timer fcTimer = new System.Timers.Timer();
fcTimer.Elapsed += new System.Timers.ElapsedEventHandler(PunTimer_PunishmentTimer);
//1小时执行一次
fcTimer.Interval = 1000 * 60 * 60;
fcTimer.Enabled = true;
fcTimer.Start();
}
}
private void queTimer_AutoSendOne(object sender, System.Timers.ElapsedEventArgs e)
@ -230,7 +252,7 @@
userName = contractAdmin.First().UserName;
departId = contractAdmin.First().DepartId;
}
var depart = BLL.DepartService.GetDepartById(departId);
if (depart != null)
{
@ -309,9 +331,9 @@
if (que.QueType == "3")
{
var cts = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
where x.Email != null && x.Email != "" && (y.RoleName == "CTS/S")
select x;
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
where x.Email != null && x.Email != "" && (y.RoleName == "CTS/S")
select x;
if (cts.Count() > 0)
{
mailTo = cts.Select(x => x.Email).ToArray();
@ -424,12 +446,12 @@
myCol.Add("Contractor_En", contractor.Contractor);
myCol.Add("Expire_En", que.LimitEndDate.Value.ToShortDateString());
myCol.Add("ContractNo", fo.FO_NO);
myCol.Add("Contractor", (contractor.ContractorCN != null && contractor.ContractorCN!="") ? contractor.ContractorCN : contractor.Contractor);
myCol.Add("Contractor", (contractor.ContractorCN != null && contractor.ContractorCN != "") ? contractor.ContractorCN : contractor.Contractor);
myCol.Add("QuaName", que.QueName);
myCol.Add("Expire", que.LimitEndDate.Value.ToShortDateString());
mailBody = TemplateHelper.BulidByFile2(templetpath, myCol);
string mailName = EmailTemplate.Select(p => p.EmailName).FirstOrDefault();
@ -470,7 +492,7 @@
}
string[] mailTo = null;
string mailBody = string.Empty;
string mailSubject = string.Empty;
string mailPriority = string.Empty;
string[] mailCC = null;
@ -706,13 +728,13 @@
}
private void aTimer_AutoSend(object sender, System.Timers.ElapsedEventArgs e)
{
{
// 过期提示,30天范围
var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null
var foList = from x in Funs.DB.FC_SESRelatedData where x.Expire_Date != null
&& x.Expire_Date.Value.AddMonths(-6).AddDays(-7).Date <= DateTime.Now.Date
&& x.Expire_Date.Value.AddMonths(-5).AddDays(-7).Date >= DateTime.Now.Date
select x;
if (foList.Count() > 0)
if (foList.Count() > 0)
{
foreach (var fo in foList)
{
@ -800,7 +822,7 @@
var cost = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
where (y.RoleName == "Cost Engineer Leader" || y.RoleName == "Contractor_Leader" || z.DepartCode== "CT/K") && x.Email != null && x.Email != ""
where (y.RoleName == "Cost Engineer Leader" || y.RoleName == "Contractor_Leader" || z.DepartCode == "CT/K") && x.Email != null && x.Email != ""
select x;
if (cost.Count() > 0)
{
@ -829,8 +851,8 @@
var cc = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
where x.Email != null && x.Email != ""
&& (y.RoleName == "CTE/D Manager" || x.UserId== deparatLeader || y.RoleName == "CGP Director" || (y.RoleName== "CT Director" && x.DepartId== departId))
where x.Email != null && x.Email != ""
&& (y.RoleName == "CTE/D Manager" || x.UserId == deparatLeader || y.RoleName == "CGP Director" || (y.RoleName == "CT Director" && x.DepartId == departId))
select x;
mailTo = userList.Select(x => x.Email).ToArray();
@ -838,7 +860,7 @@
//var nowDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00");
//&& p.CreateTime.Value >= nowDate
var email = Funs.DB.SendEmail.Where(p => p.EmailStatus == "发送成功"
var email = Funs.DB.SendEmail.Where(p => p.EmailStatus == "发送成功"
&& p.EmailTile.Contains("到期提醒") && p.EmailTile.Contains(discipline.Discipline.Replace("\r\n", ""))
&& p.EmailTile.Contains(fo.FO_NO) && mailTo.Contains(p.EmailURL)).ToList();
if (email.Count > 0)
@ -889,7 +911,7 @@
string resultMessage = "";
string departId = string.Empty;
var discipline = BLL.DisciplineService.GetDisciplineById(fo.DisciplineId);
//string disc = discipline.Discipline;
//if (!string.IsNullOrEmpty(discipline.DisciplineCN))
@ -905,7 +927,7 @@
var buyer = from x in Funs.DB.Sys_User where x.UserId == fo.BuyerId && x.Email != null && x.Email != "" select x;
if (buyer.Count() > 0)
{
userList.Add(buyer.First());
userList.Add(buyer.First());
}
var mainCoor = from x in Funs.DB.Sys_User where x.UserId == fo.Main_Coordinator && x.Email != null && x.Email != "" select x;
if (mainCoor.Count() > 0)
@ -917,7 +939,7 @@
{
userList.Add(userRepresentative.First());
}
//var ctk = from x in Funs.DB.Sys_User
// join z in Funs.DB.Base_Depart on x.DepartId equals z.DepartId
// where z.DepartCode == "CT/K" && x.Email != null && x.Email != ""
@ -975,6 +997,7 @@
}
#endregion
#region 每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
/// <summary>
/// 每月（2，5，8，10）邮件自动发送给SSR提交人员和主协调人及合同员，用户代表等评价
/// </summary>
@ -1082,7 +1105,7 @@
{
mailCC = mailCCLs.Where(p => !string.IsNullOrEmpty(p)).ToArray();
}
}
// 总监
@ -1090,7 +1113,7 @@
var mailToDirector = from x in Funs.DB.Sys_User
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where departCode.Contains(y.DepartCode) && x.RoleId == Const.Role_DirectorId select x;
if (DateTime.Now.Day == 11 && mailToDirector.Count() > 0)
if (DateTime.Now.Day == 10 && mailToDirector.Count() > 0)
{
var mailccLs = new List<string>();
// 部门经理
@ -1156,7 +1179,7 @@
join y in Funs.DB.Base_Depart on x.DepartId equals y.DepartId
where departCode.Contains(y.DepartCode) && x.RoleId == Const.Role_DirectorId
select x;
if (DateTime.Now.Day == 11 && mailToDirector.Count() > 0)
if (DateTime.Now.Day == 10 && mailToDirector.Count() > 0)
{
var mailccLs = new List<string>();
// 部门经理
@ -1181,7 +1204,9 @@
}
}
}
#endregion
#region 自动填写评价
/// <summary>
/// 自动填写评价
/// </summary>
@ -1360,6 +1385,7 @@
Funs.DB.SubmitChanges();
}
}
#endregion
private void FC_AutoStatus(object sender, System.Timers.ElapsedEventArgs e)
{
@ -1422,7 +1448,7 @@
catch (Exception ex)
{
ErrLogInfo.WriteLog($"执行当前sql:{strSql}错误:{ex.Message},当前ID={d.ID},当前status={status}");
//记录日志到数据中。
//记录日志到数据中。
}
}
}
@ -1577,6 +1603,265 @@
}
#endregion
#region 合同绩效违规处理
/// <summary>
/// 合同绩效规格处理
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void queTimer_ViolationHandling(object sender, System.Timers.ElapsedEventArgs e)
{
var foData = (from x in Funs.DB.FC_SESRelatedData where x.FO_NO== "4988606499" && x.FC_Status != "Closed" select x).ToList();
if (foData.Count() > 0)
{
foreach (var fo in foData)
{
string Contract_Admin = BLL.Sys_UserService.GetUserNameByUserId(fo.Contract_Admin);//合同管理员
string Contractor = BLL.ContractorService.GetContractorById(fo.Contractor).ContractorCN;//承包商
List<Model.Sys_User> userList = new List<Sys_User>();
EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string mailSubject = string.Empty;
string mailBody = string.Empty;
string mailPriority = string.Empty;
string[] mailCC = null;
string resultMessage = "";
string userName = string.Empty;
string violation_type = string.Empty;//违规类型
string consequence_action = string.Empty;//处理结果
//零容忍违章
var punishments = (from x in Funs.DB.EMC_Punishment where x.FO_NO == fo.FO_NO && x.Flag == "1" && x.ViolationDegree == "3" select x).ToList();
if (punishments.Count == 1) //一次零容忍违章：约谈
{
violation_type = "一次零容忍违章";
consequence_action = "约谈";
}
else if (punishments.Count == 3)//三次零容忍违章：NCR
{
violation_type = "三次零容忍违章";
consequence_action = "NCR";
}
DateTime startDate = DateTime.Now.AddMonths(-23);
DateTime startTime = DateTime.Parse(startDate.Year + "-" + startDate.Month + "-01");
DateTime endTime = DateTime.Parse(DateTime.Now.Year + "-" + DateTime.Now.Month + "-13");
List<SqlParameter> yearToDateParam = new List<SqlParameter>();
yearToDateParam.Add(new SqlParameter("@StartTime", startTime));
yearToDateParam.Add(new SqlParameter("@EndTime", endTime));
yearToDateParam.Add(new SqlParameter("@FoNo", fo.FO_NO));
SqlParameter[] yearToDateParList = yearToDateParam.ToArray();
var sesDataTable = SQLHelper.GetDataTableRunProc("Sp_ContractorEvaluation", yearToDateParList);
int s = 0;
for (int i = 0; i < sesDataTable.Rows.Count; i++)
{
decimal sumScore = Convert.ToDecimal(sesDataTable.Rows[i]["SumScore"]);
if (sumScore < 60)
{
s++;
}
}
if (s >= 3)
{
violation_type = "累计三次月度评估低于60分";
consequence_action = "不得参与下轮合同";
}
else
{
decimal? score = (from x in Funs.DB.FC_Score where x.Contract_No == fo.FO_NO select x).Sum(x => x.Score1 + x.Score2 + x.Score3 + x.Score4 + x.Score5 + x.Score6);
if (s == 2 || score < 12)
{
violation_type = "累计两次月度评估低于60分或安全评估低于12分";
consequence_action = "约谈";
}
}
var ncrs = (from x in Funs.DB.FC_ContractManagement where x.FC_ID == fo.ID && x.FileTypeId == "6" select x).ToList();
if (ncrs.Count == 3)
{
violation_type = "三次NCR";
consequence_action = "提前终止合同，不得参与下轮合同";
}
if (!string.IsNullOrEmpty(violation_type) && !string.IsNullOrEmpty(consequence_action))
{
//发送对应合同管理员
var contractAdmin = from x in Funs.DB.Sys_User where x.UserId == fo.Contract_Admin && x.Email != null && x.Email != "" select x;
if (contractAdmin.Count() > 0)
{
mailTo = contractAdmin.Select(x => x.Email).ToArray();
userName = contractAdmin.First().UserName;
}
//抄送
var cc = from x in Funs.DB.Sys_User
join y in Funs.DB.Sys_Role on x.RoleId equals y.RoleId
where x.Email != null && x.Email != ""
&& (y.RoleName == "CTE/D Manager" || y.RoleName == "Cost Engineer Leader" || y.RoleName == "Contractor_Leader")
select x;
if (cc.Count() > 0)
{
foreach (var c in cc)
{
userList.Add(c);
}
}
mailCC = userList.Select(x => x.Email).ToArray();
if (mailTo == null || mailTo.Length == 0) return;
var email = Funs.DB.SendEmail.Where(p => p.EmailStatus == "发送成功"
&& p.EmailTile.Contains("合同绩效违规处理")
&& p.EmailTile.Contains(fo.FO_NO) && mailTo.Contains(p.EmailURL));
if (email.Count() > 0)
{
var emailurl = email.Select(p => p.EmailURL).ToList();
mailTo = mailTo.Where(p => !emailurl.Contains(p)).ToArray();
}
var EmailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("合同绩效违规处理通知"));
if (EmailTemplate.Count() > 0)
{
string templetpath = EmailTemplate.Select(p => p.EmailContext).FirstOrDefault();
NameValueCollection myCol = new NameValueCollection();
myCol.Add("ContractAdmin", Contract_Admin);//合同管理员
myCol.Add("contract_number", fo.FO_NO);//合同号
myCol.Add("Contractor_name", Contractor);//承包商名称
myCol.Add("Contractor_contact", fo.MainHead);//承包商负责人
myCol.Add("violation type", violation_type);//违规类型
myCol.Add("consequence_action", consequence_action);//处理后果
mailBody = TemplateHelper.BulidByFile2(templetpath, myCol);
string mailName = EmailTemplate.Select(p => p.EmailName).FirstOrDefault();
NameValueCollection myCol1 = new NameValueCollection();
myCol1.Add("contract_number", fo.FO_NO);
myCol1.Add("violation type", violation_type);
mailSubject = TemplateHelper.BulidByFile2(mailName, myCol1);
var sendMail = from x in Funs.DB.SendEmail where x.EmailTile == mailSubject && (mailTo.Contains(x.EmailURL) || mailCC.Contains(x.EmailURL)) select x;
if (sendMail.Count() == 0)
{
MailHelper.SendNetMail2(pops, pops.EmailYx, mailTo, mailSubject, mailBody, mailPriority, mailCC, null, out resultMessage);
}
}
}
}
}
}
#endregion
# region 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门（有部门代理人发送给部门代理人抄送给部门经理，无部门代理人发送则发送给部门经理）
/// <summary>
/// 承包商报告主协调员提交后通知承包商联系人，若无异议或3天未操作，发送邮件给用户部门（有部门代理人发送给部门代理人抄送给部门经理，无部门代理人发送则发送给部门经理）
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void PunTimer_PunishmentTimer(object sender, System.Timers.ElapsedEventArgs e)
{
var punishments = (from x in Funs.DB.EMC_Punishment
where x.Flag == "2" && x.States == "3" && x.SeType == "1"
&& (x.Pause == false || x.Pause == null) && x.MainCoordinatorEndDate.Value.AddDays(3) < DateTime.Now
orderby x.CreateDate descending
select x).ToList();
if (punishments.Count() > 0)
{
foreach (var pun in punishments)
{
var audit = BLL.PunishmentAuditService.GetAuditByAuditMan(pun.PunishmentId, pun.UserDep);
if (audit == null)
{
//新增用户部门操作流程
Model.EMC_PunishmentAudit newAudit = new EMC_PunishmentAudit();
newAudit.AuditId = SQLHelper.GetNewID(typeof(Model.EMC_PunishmentAudit));
newAudit.PunishmentId = pun.PunishmentId;
newAudit.AuditMan = pun.UserDep;
BLL.PunishmentAuditService.AddPunishmentAudit(newAudit);
}
List<Model.Sys_User> userList = new List<Sys_User>();
EmailPop pops = Funs.DB.EmailPop.FirstOrDefault(x => x.EmailID == BLL.Const.EmailPopId);
if (pops == null)
{
return;
}
string[] mailTo = null;
string mailSubject = string.Empty;
string mailBody = string.Empty;
string mailPriority = string.Empty;
string[] mailCC = null;
string resultMessage = "";
string departLeader = string.Empty;
string delegatedRepresentative = string.Empty;
var emailTemplate = Funs.DB.SendEmailTemplate.Where(x => x.EmailName.Contains("主协调员填写完成后审批通过通知"));
if (emailTemplate.Count() > 0)
{
var depart = BLL.DepartService.GetDepartById(pun.UserDep);
if (depart != null)
{
departLeader = depart.DepartLeader;
delegatedRepresentative = depart.DelegatedRepresentative;
}
if (!string.IsNullOrEmpty(delegatedRepresentative))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(delegatedRepresentative) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == pun.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector) || x.UserId.Contains(departLeader))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
else
{
if (!string.IsNullOrEmpty(departLeader))
{
var userTo = from x in Funs.DB.Sys_User
where x.UserId.Contains(departLeader) && x.Email != null && x.Email != ""
select x;
if (userTo != null)
{
mailTo = userTo.Select(x => x.Email).ToArray();
}
}
var userCc = from x in Funs.DB.View_EMail_UserTo
where ((x.PunishmentId == pun.PunishmentId && x.AuditDate != null) || x.UserId.Contains(pun.Violation_Inspector))
&& x.Email != null && x.Email != ""
select x;
if (userCc != null)
{
mailCC = userCc.Select(x => x.Email).Distinct().ToArray();
}
}
if (mailTo.Length > 0)
{
NameValueCollection myPram = new NameValueCollection();
myPram.Add("发现日期", pun.PunishDate != null ? pun.PunishDate.Value.ToString("yyyy-MM-dd") : "");
myPram.Add("位置", pun.Location);
myPram.Add("质量事件描述", pun.Description);
MailHelper.SendPunishSesMail(pops, myPram, "主协调员填写完成后审批通过通知", mailTo, mailCC, out resultMessage);
}
}
}
}
}
#endregion
private void Sync_HR(object sender, System.Timers.ElapsedEventArgs e)
{
//调用接口

20
FCL/FineUIPro.Web/SES/CSafePunishEdit.aspx.cs
View File

@ -55,16 +55,16 @@ namespace FineUIPro.Web.SES
}
// BLL.SESRelatedDataService.InitFONoDropDownList(this.drpFO_No, true);//合同号
//BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商;
var contractorLists = from x in Funs.DB.FC_SESRelatedData
join y in Funs.DB.Base_Contractor on x.Contractor equals y.ContractorId
where x.Expire_Date.Value.AddYears(1) >= DateTime.Now
select new { y.ContractorId, Contractor = y.Contractor + y.ContractorCN };
this.drpContractor.DataTextField = "Contractor";
this.drpContractor.DataValueField = "ContractorId";
this.drpContractor.DataSource = contractorLists.Distinct();
this.drpContractor.DataBind();
Funs.FineUIPleaseSelect(this.drpContractor);
BLL.ContractorService.InitDropDownList(drpContractor, true); //承包商;
//var contractorLists = from x in Funs.DB.FC_SESRelatedData
// join y in Funs.DB.Base_Contractor on x.Contractor equals y.ContractorId
// where x.Expire_Date.Value.AddYears(1) >= DateTime.Now
// select new { y.ContractorId, Contractor = y.Contractor + y.ContractorCN };
//this.drpContractor.DataTextField = "Contractor";
//this.drpContractor.DataValueField = "ContractorId";
//this.drpContractor.DataSource = contractorLists.Distinct();
//this.drpContractor.DataBind();
//Funs.FineUIPleaseSelect(this.drpContractor);
BLL.DepartService.InitDepartToWhere(this.drpBYC_RU, true);//BYC负责部门
BLL.Sys_UserService.InitUserDropDownList(this.drpViolationInspector, true);//违章检查人

2
FCL/FineUIPro.Web/SES/SESRelatedDataContractManage2.aspx.cs
View File

@ -238,7 +238,7 @@ namespace FineUIPro.Web.SES
{
totalSupp += item.SupplementedBudget;
}
this.txtTotalBudget.Text = (Funs.GetNewIntOrZero(txtInitialBudget.Text.Trim()) + totalSupp + Funs.GetNewDecimalOrZero(this.txtSupplementedBudget.Text.Trim())).ToString();
this.txtTotalBudget.Text = (Funs.GetNewDecimalOrZero(txtInitialBudget.Text.Trim()) + totalSupp + Funs.GetNewDecimalOrZero(this.txtSupplementedBudget.Text.Trim())).ToString();
}
}
}

234
FCL/Model/Model.cs
View File

@ -1739,6 +1739,8 @@ namespace Model
private string _DepartLeader;
private string _DelegatedRepresentative;
private EntitySet<EMC_CTSalesContracts> _EMC_CTSalesContracts;
private EntitySet<EMC_CTSalesContracts> _Depart;
@ -1763,6 +1765,8 @@ namespace Model
partial void OnRemarkChanged();
partial void OnDepartLeaderChanging(string value);
partial void OnDepartLeaderChanged();
partial void OnDelegatedRepresentativeChanging(string value);
partial void OnDelegatedRepresentativeChanged();
#endregion
public Base_Depart()
@ -1875,6 +1879,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DelegatedRepresentative", DbType="NVarChar(50)")]
public string DelegatedRepresentative
{
get
{
return this._DelegatedRepresentative;
}
set
{
if ((this._DelegatedRepresentative != value))
{
this.OnDelegatedRepresentativeChanging(value);
this.SendPropertyChanging();
this._DelegatedRepresentative = value;
this.SendPropertyChanged("DelegatedRepresentative");
this.OnDelegatedRepresentativeChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_EMC_CTSalesContracts_Base_Depart", Storage="_EMC_CTSalesContracts", ThisKey="DepartId", OtherKey="DeptOfRevenue", DeleteRule="NO ACTION")]
public EntitySet<EMC_CTSalesContracts> EMC_CTSalesContracts
{
@ -9916,6 +9940,8 @@ namespace Model
private string _BuyerReson;
private string _SSRAdminId;
private System.Nullable<System.DateTime> _SSRStaratDate;
private System.Nullable<System.DateTime> _SSREndDate;
@ -9928,7 +9954,19 @@ namespace Model
private System.Nullable<System.DateTime> _UserDepEndDate;
private string _SSRAdminId;
private System.Nullable<bool> _Pause;
private System.Nullable<System.DateTime> _PauseDate;
private string _ModifyContent;
private string _Modifyer;
private System.Nullable<System.DateTime> _ModifyDate;
private System.Nullable<System.DateTime> _IsUserEvaluatedTime;
private System.Nullable<System.DateTime> _IsDepEvaluatedTime;
private EntityRef<Base_Depart> _Base_Depart;
@ -10042,6 +10080,8 @@ namespace Model
partial void OnSESReasonChanged();
partial void OnBuyerResonChanging(string value);
partial void OnBuyerResonChanged();
partial void OnSSRAdminIdChanging(string value);
partial void OnSSRAdminIdChanged();
partial void OnSSRStaratDateChanging(System.Nullable<System.DateTime> value);
partial void OnSSRStaratDateChanged();
partial void OnSSREndDateChanging(System.Nullable<System.DateTime> value);
@ -10054,8 +10094,20 @@ namespace Model
partial void OnUserDepStartDateChanged();
partial void OnUserDepEndDateChanging(System.Nullable<System.DateTime> value);
partial void OnUserDepEndDateChanged();
partial void OnSSRAdminIdChanging(string value);
partial void OnSSRAdminIdChanged();
partial void OnPauseChanging(System.Nullable<bool> value);
partial void OnPauseChanged();
partial void OnPauseDateChanging(System.Nullable<System.DateTime> value);
partial void OnPauseDateChanged();
partial void OnModifyContentChanging(string value);
partial void OnModifyContentChanged();
partial void OnModifyerChanging(string value);
partial void OnModifyerChanged();
partial void OnModifyDateChanging(System.Nullable<System.DateTime> value);
partial void OnModifyDateChanged();
partial void OnIsUserEvaluatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnIsUserEvaluatedTimeChanged();
partial void OnIsDepEvaluatedTimeChanging(System.Nullable<System.DateTime> value);
partial void OnIsDepEvaluatedTimeChanged();
#endregion
public EMC_Punishment()
@ -11094,6 +11146,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRAdminId", DbType="NVarChar(50)")]
public string SSRAdminId
{
get
{
return this._SSRAdminId;
}
set
{
if ((this._SSRAdminId != value))
{
this.OnSSRAdminIdChanging(value);
this.SendPropertyChanging();
this._SSRAdminId = value;
this.SendPropertyChanged("SSRAdminId");
this.OnSSRAdminIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRStaratDate", DbType="DateTime")]
public System.Nullable<System.DateTime> SSRStaratDate
{
@ -11214,22 +11286,142 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SSRAdminId", DbType="NVarChar(50)")]
public string SSRAdminId
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Pause", DbType="Bit")]
public System.Nullable<bool> Pause
{
get
{
return this._SSRAdminId;
return this._Pause;
}
set
{
if ((this._SSRAdminId != value))
if ((this._Pause != value))
{
this.OnSSRAdminIdChanging(value);
this.OnPauseChanging(value);
this.SendPropertyChanging();
this._SSRAdminId = value;
this.SendPropertyChanged("SSRAdminId");
this.OnSSRAdminIdChanged();
this._Pause = value;
this.SendPropertyChanged("Pause");
this.OnPauseChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PauseDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PauseDate
{
get
{
return this._PauseDate;
}
set
{
if ((this._PauseDate != value))
{
this.OnPauseDateChanging(value);
this.SendPropertyChanging();
this._PauseDate = value;
this.SendPropertyChanged("PauseDate");
this.OnPauseDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyContent", DbType="NVarChar(2000)")]
public string ModifyContent
{
get
{
return this._ModifyContent;
}
set
{
if ((this._ModifyContent != value))
{
this.OnModifyContentChanging(value);
this.SendPropertyChanging();
this._ModifyContent = value;
this.SendPropertyChanged("ModifyContent");
this.OnModifyContentChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Modifyer", DbType="NVarChar(50)")]
public string Modifyer
{
get
{
return this._Modifyer;
}
set
{
if ((this._Modifyer != value))
{
this.OnModifyerChanging(value);
this.SendPropertyChanging();
this._Modifyer = value;
this.SendPropertyChanged("Modifyer");
this.OnModifyerChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ModifyDate", DbType="DateTime")]
public System.Nullable<System.DateTime> ModifyDate
{
get
{
return this._ModifyDate;
}
set
{
if ((this._ModifyDate != value))
{
this.OnModifyDateChanging(value);
this.SendPropertyChanging();
this._ModifyDate = value;
this.SendPropertyChanged("ModifyDate");
this.OnModifyDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUserEvaluatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> IsUserEvaluatedTime
{
get
{
return this._IsUserEvaluatedTime;
}
set
{
if ((this._IsUserEvaluatedTime != value))
{
this.OnIsUserEvaluatedTimeChanging(value);
this.SendPropertyChanging();
this._IsUserEvaluatedTime = value;
this.SendPropertyChanged("IsUserEvaluatedTime");
this.OnIsUserEvaluatedTimeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsDepEvaluatedTime", DbType="DateTime")]
public System.Nullable<System.DateTime> IsDepEvaluatedTime
{
get
{
return this._IsDepEvaluatedTime;
}
set
{
if ((this._IsDepEvaluatedTime != value))
{
this.OnIsDepEvaluatedTimeChanging(value);
this.SendPropertyChanging();
this._IsDepEvaluatedTime = value;
this.SendPropertyChanged("IsDepEvaluatedTime");
this.OnIsDepEvaluatedTimeChanged();
}
}
}
@ -33778,6 +33970,8 @@ namespace Model
private string _FileType;
private System.Nullable<System.DateTime> _UploadDate;
public View_FC_ContractManagement()
{
}
@ -34037,6 +34231,22 @@ namespace Model
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UploadDate", DbType="DateTime")]
public System.Nullable<System.DateTime> UploadDate
{
get
{
return this._UploadDate;
}
set
{
if ((this._UploadDate != value))
{
this._UploadDate = value;
}
}
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_FC_ContractManagementLists")]
@ -38579,7 +38789,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(50)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(60)")]
public string UserName
{
get