lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240614 菜单调整

Browse Source
This commit is contained in:
毕文静
2024-06-14 15:46:10 +08:00
parent 0860e6b9b1
commit c3a6231320
70 changed files with 3017 additions and 3683 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+313 -313
View File
@@ -50,9 +50,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
BLL.PostService.InitPostDownList(this.drpPostId, true);
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
LoadAuditSelect();
this.agree.Hidden = true;
this.options.Hidden = true;
//LoadAuditSelect();
//this.agree.Hidden = true;
//this.options.Hidden = true;
this.InspectionPersonId = Request.Params["InspectionPersonId"];
Model.Comprehensive_InspectionPerson inspectionPerson = BLL.InspectionPersonService.GetInspectionPersonById(this.InspectionPersonId);
@@ -109,35 +109,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemarkCode.Text = inspectionPerson.RemarkCode.HasValue ? inspectionPerson.RemarkCode.ToString() : "";
var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId);
if (currApprove != null)
{
this.drpAudit.SelectedValue = currApprove.ApproveMan;
//重新编制 编制人 可以 显示 提交 保存按钮
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionPerson.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}//审核状态 审核人 可以显示 提交 保存按钮
else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
{
//审核状态不可编辑
Readonly();
//var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId);
//if (currApprove != null)
//{
// this.drpAudit.SelectedValue = currApprove.ApproveMan;
// //重新编制 编制人 可以 显示 提交 保存按钮
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionPerson.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }//审核状态 审核人 可以显示 提交 保存按钮
// else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId)
// {
// //审核状态不可编辑
// Readonly();
this.agree.Hidden = false;
this.options.Hidden = false;
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}//没有当前审核人，已完成状态 或者 待提交状态
else
{
if (inspectionPerson.Status == BLL.Const.Comprehensive_Compile && inspectionPerson.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}
// this.agree.Hidden = false;
// this.options.Hidden = false;
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}//没有当前审核人，已完成状态 或者 待提交状态
//else
//{
// if (inspectionPerson.Status == BLL.Const.Comprehensive_Compile && inspectionPerson.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}
}
@@ -147,7 +147,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtApprovalTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtDepartureTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.btnSave.Hidden = false;
this.btnSubmit.Hidden = false;
//this.btnSubmit.Hidden = false;
}
}
}
@@ -172,7 +172,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemark.Readonly = true;
this.txtValidityDate.Readonly = true;
this.drpPostId.Readonly = true;
this.drpAudit.Readonly = true;
//this.drpAudit.Readonly = true;
this.drpUnitWorkIds.Readonly = true;
this.txtRemarkCode.Readonly = true;
//this.btnAttach.Enabled = false;
@@ -182,23 +182,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// <summary>
/// 加载专业工程师
/// </summary>
public void LoadAuditSelect()
{
//public void LoadAuditSelect()
//{
var db = Funs.DB;
var userList = from x in db.Sys_User
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
join p in db.Project_ProjectUser
on x.UserId equals p.UserId
where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
where p.RoleId.Contains(Const.ZBCNEngineer)
select new { UserId = x.UserId, UserName = x.UserName };
drpAudit.DataValueField = "UserId";
drpAudit.DataTextField = "UserName";
this.drpAudit.DataSource = userList.ToList();
this.drpAudit.DataBind();
}
// var db = Funs.DB;
// var userList = from x in db.Sys_User
// join y in db.Project_ProjectUnit
// on x.UnitId equals y.UnitId
// join p in db.Project_ProjectUser
// on x.UserId equals p.UserId
// where y.UnitId == Const.UnitId_CWCEC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId
// where p.RoleId.Contains(Const.ZBCNEngineer)
// select new { UserId = x.UserId, UserName = x.UserName };
// drpAudit.DataValueField = "UserId";
// drpAudit.DataTextField = "UserName";
// this.drpAudit.DataSource = userList.ToList();
// this.drpAudit.DataBind();
//}
@@ -266,10 +266,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
//人员报验
Model.Comprehensive_InspectionPerson inspectionPerson = new Model.Comprehensive_InspectionPerson();
inspectionPerson.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
inspectionPerson.AuditMan = drpAudit.SelectedValue;
} //审核人
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
//{
// inspectionPerson.AuditMan = drpAudit.SelectedValue;
//} //审核人
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
inspectionPerson.UnitId = this.drpUnitId.SelectedValue;
@@ -394,281 +394,281 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
protected void btnSubmit_Click(object sender, EventArgs e)
{
if (this.drpUnitId.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
return;
}
//protected void btnSubmit_Click(object sender, EventArgs e)
//{
// if (this.drpUnitId.SelectedValue == BLL.Const._Null)
// {
// Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
// return;
// }
if (this.drpPostId.SelectedText == "焊工")
{
if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
{
Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
return;
}
}
var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null)));
if (q != null)
{
Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
return;
}
// 焊工部分
Model.BS_Welder welder = new Model.BS_Welder();
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
welder.WED_Unit = this.drpUnitId.SelectedValue;
}
//welder.WED_Code = this.txtInspectionCode.Text.Trim();
welder.WED_Name = this.txtPersonName.Text.Trim();
if (!String.IsNullOrEmpty(this.txtValidityDate.Text.ToString()))
{
welder.LimitDate = Convert.ToDateTime(this.txtValidityDate.Text.ToString());
}
if (!String.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
welder.LeaveDate = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
}
if (!String.IsNullOrEmpty(this.txtApprovalTime.Text.ToString()))
{
welder.PostDate = Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
}
welder.WED_WorkCode = this.txtCertificateNumber.Text.Trim();
welder.WED_Class = this.txtQualifiedProjectCode.Text.Trim();
if (this.rblIsOnSite.SelectedValue == "true")
{
welder.WED_IfOnGuard = true;
}
else
{
welder.WED_IfOnGuard = false;
}
welder.WED_Code = txtWelderCode.Text.Trim();
welder.WED_Remark = this.txtRemark.Text.Trim();
welder.ProjectId = this.CurrUser.LoginProjectId;
//人员报验
Model.Comprehensive_InspectionPerson inspectionPerson = new Model.Comprehensive_InspectionPerson();
inspectionPerson.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
inspectionPerson.AuditMan = drpAudit.SelectedValue;
} //审核人
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
inspectionPerson.UnitId = this.drpUnitId.SelectedValue;
}
inspectionPerson.InspectionPersonCode = this.txtInspectionCode.Text.Trim();
if (this.drpPostId.SelectedValue != BLL.Const._Null)
{
inspectionPerson.PostId = this.drpPostId.SelectedValue;
}
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
inspectionPerson.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
inspectionPerson.PersonName = this.txtPersonName.Text.Trim();
inspectionPerson.CertificateNumber = this.txtCertificateNumber.Text.Trim();
inspectionPerson.QualifiedProjectCode = this.txtQualifiedProjectCode.Text.Trim();
if (!string.IsNullOrEmpty(this.txtValidityDate.Text.ToString()))
{
inspectionPerson.ValidityDate = Convert.ToDateTime(this.txtValidityDate.Text.ToString());
}
if (!string.IsNullOrEmpty(this.txtApprovalTime.Text.ToString()))
{
inspectionPerson.ApprovalTime = Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
}
if (this.rblIsOnSite.SelectedValue == "true")
{
inspectionPerson.IsOnSite = true;
}
else
{
inspectionPerson.IsOnSite = false;
}
if (this.rblIsTrain.SelectedValue == "true")
{
inspectionPerson.IsTrain = true;
}
else
{
inspectionPerson.IsTrain = false;
}
if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
}
inspectionPerson.Remark = this.txtRemark.Text.Trim();
inspectionPerson.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
string ids = string.Empty;
var lists = this.drpUnitWorkIds.SelectedValueArray;
foreach (var item in lists)
{
ids += item + ",";
}
if (!string.IsNullOrEmpty(ids))
{
ids = ids.Substring(0, ids.LastIndexOf(","));
}
inspectionPerson.UnitWorkId = ids;
if (string.IsNullOrEmpty(this.InspectionPersonId))
{
inspectionPerson.CompileMan = this.CurrUser.UserId;
inspectionPerson.CompileDate = DateTime.Now;
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
inspectionPerson.InspectionPersonId = this.hdAttachUrl.Text;
}
else
{
inspectionPerson.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
this.hdAttachUrl.Text = inspectionPerson.InspectionPersonId;
}
// if (this.drpPostId.SelectedText == "焊工")
// {
// if (string.IsNullOrEmpty(txtWelderCode.Text.Trim()))
// {
// Alert.ShowInTop("焊工编号必填！", MessageBoxIcon.Warning);
// return;
// }
// }
// var q = Funs.DB.Comprehensive_InspectionPerson.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode ==Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionPersonId != this.InspectionPersonId || (this.InspectionPersonId == null && x.InspectionPersonId != null)));
// if (q != null)
// {
// Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
// return;
// }
// // 焊工部分
// Model.BS_Welder welder = new Model.BS_Welder();
// if (this.drpUnitId.SelectedValue != BLL.Const._Null)
// {
// welder.WED_Unit = this.drpUnitId.SelectedValue;
// }
// //welder.WED_Code = this.txtInspectionCode.Text.Trim();
// welder.WED_Name = this.txtPersonName.Text.Trim();
// if (!String.IsNullOrEmpty(this.txtValidityDate.Text.ToString()))
// {
// welder.LimitDate = Convert.ToDateTime(this.txtValidityDate.Text.ToString());
// }
// if (!String.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
// {
// welder.LeaveDate = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
// }
// if (!String.IsNullOrEmpty(this.txtApprovalTime.Text.ToString()))
// {
// welder.PostDate = Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
// }
// welder.WED_WorkCode = this.txtCertificateNumber.Text.Trim();
// welder.WED_Class = this.txtQualifiedProjectCode.Text.Trim();
// if (this.rblIsOnSite.SelectedValue == "true")
// {
// welder.WED_IfOnGuard = true;
// }
// else
// {
// welder.WED_IfOnGuard = false;
// }
// welder.WED_Code = txtWelderCode.Text.Trim();
// welder.WED_Remark = this.txtRemark.Text.Trim();
// welder.ProjectId = this.CurrUser.LoginProjectId;
// //人员报验
// Model.Comprehensive_InspectionPerson inspectionPerson = new Model.Comprehensive_InspectionPerson();
// inspectionPerson.ProjectId = this.CurrUser.LoginProjectId;
// if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
// {
// inspectionPerson.AuditMan = drpAudit.SelectedValue;
// } //审核人
// if (this.drpUnitId.SelectedValue != BLL.Const._Null)
// {
// inspectionPerson.UnitId = this.drpUnitId.SelectedValue;
// }
// inspectionPerson.InspectionPersonCode = this.txtInspectionCode.Text.Trim();
// if (this.drpPostId.SelectedValue != BLL.Const._Null)
// {
// inspectionPerson.PostId = this.drpPostId.SelectedValue;
// }
// if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
// {
// inspectionPerson.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
// }
// inspectionPerson.PersonName = this.txtPersonName.Text.Trim();
// inspectionPerson.CertificateNumber = this.txtCertificateNumber.Text.Trim();
// inspectionPerson.QualifiedProjectCode = this.txtQualifiedProjectCode.Text.Trim();
// if (!string.IsNullOrEmpty(this.txtValidityDate.Text.ToString()))
// {
// inspectionPerson.ValidityDate = Convert.ToDateTime(this.txtValidityDate.Text.ToString());
// }
// if (!string.IsNullOrEmpty(this.txtApprovalTime.Text.ToString()))
// {
// inspectionPerson.ApprovalTime = Convert.ToDateTime(this.txtApprovalTime.Text.ToString());
// }
// if (this.rblIsOnSite.SelectedValue == "true")
// {
// inspectionPerson.IsOnSite = true;
// }
// else
// {
// inspectionPerson.IsOnSite = false;
// }
// if (this.rblIsTrain.SelectedValue == "true")
// {
// inspectionPerson.IsTrain = true;
// }
// else
// {
// inspectionPerson.IsTrain = false;
// }
// if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
// {
// inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
// }
// inspectionPerson.Remark = this.txtRemark.Text.Trim();
// inspectionPerson.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
// string ids = string.Empty;
// var lists = this.drpUnitWorkIds.SelectedValueArray;
// foreach (var item in lists)
// {
// ids += item + ",";
// }
// if (!string.IsNullOrEmpty(ids))
// {
// ids = ids.Substring(0, ids.LastIndexOf(","));
// }
// inspectionPerson.UnitWorkId = ids;
// if (string.IsNullOrEmpty(this.InspectionPersonId))
// {
// inspectionPerson.CompileMan = this.CurrUser.UserId;
// inspectionPerson.CompileDate = DateTime.Now;
// if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
// {
// inspectionPerson.InspectionPersonId = this.hdAttachUrl.Text;
// }
// else
// {
// inspectionPerson.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
// this.hdAttachUrl.Text = inspectionPerson.InspectionPersonId;
// }
inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// 人员报验
BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
// inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// // 人员报验
// BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
if (this.drpPostId.SelectedText == "焊工")
{
// 焊工部分
if (string.IsNullOrEmpty(welderId))
{
// 焊工部分
BLL.PersonManageService.AddBSWelder(welder);
}
else
{
welder.WED_ID = welderId;
BLL.PersonManageService.UpdateBSWelder(welder);
}
}
}
else
{
inspectionPerson.InspectionPersonId = this.InspectionPersonId;
// BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson);
var oldInspectionPerson = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault();
if (oldInspectionPerson == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{
inspectionPerson.CompileMan = this.CurrUser.UserId;
inspectionPerson.CompileDate = DateTime.Now;
inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
}
else
{
inspectionPerson.CompileMan = oldInspectionPerson.CompileMan;
inspectionPerson.CompileDate = oldInspectionPerson.CompileDate;
if (oldInspectionPerson.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
{
inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
}
else if (oldInspectionPerson.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
{
inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
}
else //审核状态 提交 变 完成 或者 重新编制
{
if (Convert.ToBoolean(rblIsAgree.SelectedValue))
{
inspectionPerson.Status = BLL.Const.Comprehensive_Complete;
}
else
{
inspectionPerson.Status = BLL.Const.Comprehensive_ReCompile;
}
}
// if (this.drpPostId.SelectedText == "焊工")
// {
// // 焊工部分
// if (string.IsNullOrEmpty(welderId))
// {
// // 焊工部分
// BLL.PersonManageService.AddBSWelder(welder);
// }
// else
// {
// welder.WED_ID = welderId;
// BLL.PersonManageService.UpdateBSWelder(welder);
// }
// }
// }
// else
// {
// inspectionPerson.InspectionPersonId = this.InspectionPersonId;
// // BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson);
// var oldInspectionPerson = Funs.DB.Comprehensive_InspectionPerson.Where(u => u.InspectionPersonId == this.InspectionPersonId).FirstOrDefault();
// if (oldInspectionPerson == null) //数据库没有记录 直接点提交 当前状态为 审核状态
// {
// inspectionPerson.CompileMan = this.CurrUser.UserId;
// inspectionPerson.CompileDate = DateTime.Now;
// inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// BLL.InspectionPersonService.AddInspectionPerson(inspectionPerson);
// }
// else
// {
// inspectionPerson.CompileMan = oldInspectionPerson.CompileMan;
// inspectionPerson.CompileDate = oldInspectionPerson.CompileDate;
// if (oldInspectionPerson.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
// {
// inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// }
// else if (oldInspectionPerson.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
// {
// inspectionPerson.Status = BLL.Const.Comprehensive_Audit;
// }
// else //审核状态 提交 变 完成 或者 重新编制
// {
// if (Convert.ToBoolean(rblIsAgree.SelectedValue))
// {
// inspectionPerson.Status = BLL.Const.Comprehensive_Complete;
// }
// else
// {
// inspectionPerson.Status = BLL.Const.Comprehensive_ReCompile;
// }
// }
BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson);
if (this.drpPostId.SelectedText == "焊工")
{
// 焊工部分
if (string.IsNullOrEmpty(welderId))
{
// 焊工部分
BLL.PersonManageService.AddBSWelder(welder);
}
else
{
welder.WED_ID = welderId;
BLL.PersonManageService.UpdateBSWelder(welder);
}
}
// BLL.InspectionPersonService.UpdateInspectionPerson(inspectionPerson);
// if (this.drpPostId.SelectedText == "焊工")
// {
// // 焊工部分
// if (string.IsNullOrEmpty(welderId))
// {
// // 焊工部分
// BLL.PersonManageService.AddBSWelder(welder);
// }
// else
// {
// welder.WED_ID = welderId;
// BLL.PersonManageService.UpdateBSWelder(welder);
// }
// }
}
// }
}
#region 审核记录
// }
// #region 审核记录
var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId);
if (currApprove == null) //为获取到为 当前编制状态 直接提交
{
var approve = new Model.Comprehensive_InspectionPersonApprove();
approve.InspectionPersonId = inspectionPerson.InspectionPersonId;
approve.ApproveMan = this.CurrUser.UserId;
approve.ApproveType = Const.Comprehensive_Compile;
approve.ApproveDate = DateTime.Now;
InspectionPersonApproveService.EditApprove(approve); //新增编制记录
// var currApprove = InspectionPersonApproveService.GetCurrentApprove(inspectionPerson.InspectionPersonId);
// if (currApprove == null) //为获取到为 当前编制状态 直接提交
// {
// var approve = new Model.Comprehensive_InspectionPersonApprove();
// approve.InspectionPersonId = inspectionPerson.InspectionPersonId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// InspectionPersonApproveService.EditApprove(approve); //新增编制记录
Model.Comprehensive_InspectionPersonApprove newApprove = new Model.Comprehensive_InspectionPersonApprove();
newApprove.InspectionPersonId = inspectionPerson.InspectionPersonId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionPersonApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionPersonApprove newApprove = new Model.Comprehensive_InspectionPersonApprove();
// newApprove.InspectionPersonId = inspectionPerson.InspectionPersonId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionPersonApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else if (currApprove.ApproveMan == CurrUser.UserId)
{
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
{
currApprove.ApproveDate = DateTime.Now;
//currApprove.IsAgree = true;
InspectionPersonApproveService.EditApprove(currApprove); //新增专业工程师审核记录
Model.Comprehensive_InspectionPersonApprove newApprove = new Model.Comprehensive_InspectionPersonApprove();
newApprove.InspectionPersonId = inspectionPerson.InspectionPersonId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionPersonApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else
{
currApprove.ApproveDate = DateTime.Now; //更新审核时间
currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
currApprove.ApproveIdea = this.txtidea.Text;
InspectionPersonApproveService.EditApprove(currApprove);
// }
// else if (currApprove.ApproveMan == CurrUser.UserId)
// {
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
// {
// currApprove.ApproveDate = DateTime.Now;
// //currApprove.IsAgree = true;
// InspectionPersonApproveService.EditApprove(currApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionPersonApprove newApprove = new Model.Comprehensive_InspectionPersonApprove();
// newApprove.InspectionPersonId = inspectionPerson.InspectionPersonId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionPersonApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// }
// else
// {
// currApprove.ApproveDate = DateTime.Now; //更新审核时间
// currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// currApprove.ApproveIdea = this.txtidea.Text;
// InspectionPersonApproveService.EditApprove(currApprove);
if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
{
Model.Comprehensive_InspectionPersonApprove reApprove = new Model.Comprehensive_InspectionPersonApprove();
reApprove.InspectionPersonId = currApprove.InspectionPersonId;
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
reApprove.ApproveIdea = txtidea.Text;
InspectionPersonApproveService.EditApprove(reApprove);
}
else
{
Model.Comprehensive_InspectionPersonApprove reApprove = new Model.Comprehensive_InspectionPersonApprove();
reApprove.InspectionPersonId = currApprove.InspectionPersonId;
reApprove.ApproveMan = inspectionPerson.CompileMan;
reApprove.ApproveType = Const.Comprehensive_ReCompile;
InspectionPersonApproveService.EditApprove(reApprove);
}
}
}
// if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
// {
// Model.Comprehensive_InspectionPersonApprove reApprove = new Model.Comprehensive_InspectionPersonApprove();
// reApprove.InspectionPersonId = currApprove.InspectionPersonId;
// reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
// reApprove.ApproveMan = CurrUser.UserId;
// reApprove.ApproveType = Const.Comprehensive_Complete;
// reApprove.ApproveIdea = txtidea.Text;
// InspectionPersonApproveService.EditApprove(reApprove);
// }
// else
// {
// Model.Comprehensive_InspectionPersonApprove reApprove = new Model.Comprehensive_InspectionPersonApprove();
// reApprove.InspectionPersonId = currApprove.InspectionPersonId;
// reApprove.ApproveMan = inspectionPerson.CompileMan;
// reApprove.ApproveType = Const.Comprehensive_ReCompile;
// InspectionPersonApproveService.EditApprove(reApprove);
// }
// }
// }
#endregion
// #endregion
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
// ShowNotify("保存成功！", MessageBoxIcon.Success);
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//}
#endregion