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/InspectionMachineEdit.aspx.cs
+209 -209
View File
@@ -47,9 +47,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.drpUnitId.Enabled = false;
}
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.InspectionMachineId = Request.Params["InspectionMachineId"];
Model.Comprehensive_InspectionMachine inspectionMachine = BLL.InspectionMachineService.GetInspectionMachineById(this.InspectionMachineId);
@@ -89,39 +89,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.txtUnitsCount.Text = inspectionMachine.UnitsCount.ToString();
}
if (!string.IsNullOrEmpty(inspectionMachine.AuditMan))
{
drpAudit.SelectedValue = inspectionMachine.AuditMan;
}
//if (!string.IsNullOrEmpty(inspectionMachine.AuditMan))
//{
// drpAudit.SelectedValue = inspectionMachine.AuditMan;
//}
this.txtRemarkCode.Text = inspectionMachine.RemarkCode.HasValue ? inspectionMachine.RemarkCode.ToString() : "";
var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId);
if (currApprove != null)
{ //重新编制 编制人 可以 显示 提交 保存按钮
this.drpAudit.SelectedValue = currApprove.ApproveMan;
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionMachine.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 = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId);
//if (currApprove != null)
//{ //重新编制 编制人 可以 显示 提交 保存按钮
// this.drpAudit.SelectedValue = currApprove.ApproveMan;
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionMachine.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 (inspectionMachine.Status == BLL.Const.Comprehensive_Compile && inspectionMachine.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 (inspectionMachine.Status == BLL.Const.Comprehensive_Compile && inspectionMachine.CompileMan == CurrUser.UserId)
// {
// this.btnSubmit.Hidden = false;
// this.btnSave.Hidden = false;
// }
//}
}
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.txtInspectionDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.btnSave.Hidden = false;
this.btnSubmit.Hidden = false;
//this.btnSubmit.Hidden = false;
}
}
}
@@ -151,7 +151,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtSpecificationModel.Readonly = true;
this.txtTestCycle.Readonly = true;
this.txtUnitsCount.Readonly = true;
this.drpAudit.Readonly = true;
//this.drpAudit.Readonly = true;
this.txtRemarkCode.Readonly = true;
//this.btnAttach.Enabled = false;
@@ -160,23 +160,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();
//}
#endregion
@@ -222,10 +222,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
inspectionMachone.UnitsCount = Funs.GetNewInt(this.txtUnitsCount.Text.Trim());
inspectionMachone.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
inspectionMachone.AuditMan = drpAudit.SelectedValue;
} //审核人
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
//{
// inspectionMachone.AuditMan = drpAudit.SelectedValue;
//} //审核人
if (string.IsNullOrEmpty(this.InspectionMachineId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
@@ -261,178 +261,178 @@ 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;
}
var q = Funs.DB.Comprehensive_InspectionMachine.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionMachineId != this.InspectionMachineId || (this.InspectionMachineId == null && x.InspectionMachineId != null)));
if (q != null)
{
Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
return;
}
Model.Comprehensive_InspectionMachine inspectionMachone = new Model.Comprehensive_InspectionMachine();
inspectionMachone.ProjectId = this.CurrUser.LoginProjectId;
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
inspectionMachone.UnitId = this.drpUnitId.SelectedValue;
}
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
inspectionMachone.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
inspectionMachone.InspectionType = this.rblInspectionType.SelectedValue;
inspectionMachone.InspectionMachineCode = this.txtInspectionMachineCode.Text.Trim();
inspectionMachone.InspectionMachineName = this.txtInspectionMachineName.Text.Trim();
inspectionMachone.SpecificationModel = this.txtSpecificationModel.Text.Trim();
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
inspectionMachone.UnitsCount = Funs.GetNewInt(this.txtUnitsCount.Text.Trim());
inspectionMachone.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
inspectionMachone.AuditMan = drpAudit.SelectedValue;
} //审核人
if (string.IsNullOrEmpty(this.InspectionMachineId))
{
if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
{
inspectionMachone.InspectionMachineId = this.hdAttachUrl.Text;
}
else
{
inspectionMachone.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
this.hdAttachUrl.Text = inspectionMachone.InspectionMachineId;
}
//protected void btnSubmit_Click(object sender, EventArgs e)
//{
// if (this.drpUnitId.SelectedValue == BLL.Const._Null)
// {
// Alert.ShowInTop("请选择报验单位！", MessageBoxIcon.Warning);
// return;
// }
// var q = Funs.DB.Comprehensive_InspectionMachine.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionMachineId != this.InspectionMachineId || (this.InspectionMachineId == null && x.InspectionMachineId != null)));
// if (q != null)
// {
// Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning);
// return;
// }
// Model.Comprehensive_InspectionMachine inspectionMachone = new Model.Comprehensive_InspectionMachine();
// inspectionMachone.ProjectId = this.CurrUser.LoginProjectId;
// if (this.drpUnitId.SelectedValue != BLL.Const._Null)
// {
// inspectionMachone.UnitId = this.drpUnitId.SelectedValue;
// }
// if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
// {
// inspectionMachone.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
// }
// inspectionMachone.InspectionType = this.rblInspectionType.SelectedValue;
// inspectionMachone.InspectionMachineCode = this.txtInspectionMachineCode.Text.Trim();
// inspectionMachone.InspectionMachineName = this.txtInspectionMachineName.Text.Trim();
// inspectionMachone.SpecificationModel = this.txtSpecificationModel.Text.Trim();
// inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
// inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
// inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
// inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
// inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
// inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
// inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
// inspectionMachone.UnitsCount = Funs.GetNewInt(this.txtUnitsCount.Text.Trim());
// inspectionMachone.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim());
// if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
// {
// inspectionMachone.AuditMan = drpAudit.SelectedValue;
// } //审核人
// if (string.IsNullOrEmpty(this.InspectionMachineId))
// {
// if (!string.IsNullOrEmpty(this.hdAttachUrl.Text))
// {
// inspectionMachone.InspectionMachineId = this.hdAttachUrl.Text;
// }
// else
// {
// inspectionMachone.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
// this.hdAttachUrl.Text = inspectionMachone.InspectionMachineId;
// }
inspectionMachone.CompileMan = this.CurrUser.UserId;
inspectionMachone.CompileDate = DateTime.Now;
inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
BLL.InspectionMachineService.AddInspectionMachine(inspectionMachone);
}
else
{
inspectionMachone.InspectionMachineId = this.InspectionMachineId;
// inspectionMachone.CompileMan = this.CurrUser.UserId;
// inspectionMachone.CompileDate = DateTime.Now;
// inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
// BLL.InspectionMachineService.AddInspectionMachine(inspectionMachone);
// }
// else
// {
// inspectionMachone.InspectionMachineId = this.InspectionMachineId;
//BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone);
// //BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone);
var oldInspectionMachine = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault();
if (oldInspectionMachine == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{
inspectionMachone.CompileMan = this.CurrUser.UserId;
inspectionMachone.CompileDate = DateTime.Now;
inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
BLL.InspectionMachineService.AddInspectionMachine(inspectionMachone);
}
else
{
inspectionMachone.CompileMan = oldInspectionMachine.CompileMan;
inspectionMachone.CompileDate = oldInspectionMachine.CompileDate;
if (oldInspectionMachine.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
{
inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
}
else if (oldInspectionMachine.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
{
inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
}
else //审核状态 提交 变 完成 或者 重新编制
{
if (Convert.ToBoolean(rblIsAgree.SelectedValue))
{
inspectionMachone.Status = BLL.Const.Comprehensive_Complete;
}
else
{
inspectionMachone.Status = BLL.Const.Comprehensive_ReCompile;
}
}
// var oldInspectionMachine = Funs.DB.Comprehensive_InspectionMachine.Where(u => u.InspectionMachineId == this.InspectionMachineId).FirstOrDefault();
// if (oldInspectionMachine == null) //数据库没有记录 直接点提交 当前状态为 审核状态
// {
// inspectionMachone.CompileMan = this.CurrUser.UserId;
// inspectionMachone.CompileDate = DateTime.Now;
// inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
// BLL.InspectionMachineService.AddInspectionMachine(inspectionMachone);
// }
// else
// {
// inspectionMachone.CompileMan = oldInspectionMachine.CompileMan;
// inspectionMachone.CompileDate = oldInspectionMachine.CompileDate;
// if (oldInspectionMachine.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核
// {
// inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
// }
// else if (oldInspectionMachine.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
// {
// inspectionMachone.Status = BLL.Const.Comprehensive_Audit;
// }
// else //审核状态 提交 变 完成 或者 重新编制
// {
// if (Convert.ToBoolean(rblIsAgree.SelectedValue))
// {
// inspectionMachone.Status = BLL.Const.Comprehensive_Complete;
// }
// else
// {
// inspectionMachone.Status = BLL.Const.Comprehensive_ReCompile;
// }
// }
BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone);
// BLL.InspectionMachineService.UpdateInspectionMachine(inspectionMachone);
}
// }
}
#region 审核记录
// }
// #region 审核记录
var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachone.InspectionMachineId);
if (currApprove == null) //为获取到为 当前编制状态 直接提交
{
var approve = new Model.Comprehensive_InspectionMachineApprove();
approve.InspectionMachineId = inspectionMachone.InspectionMachineId;
approve.ApproveMan = this.CurrUser.UserId;
approve.ApproveType = Const.Comprehensive_Compile;
approve.ApproveDate = DateTime.Now;
InspectionMachineApproveService.EditApprove(approve); //新增编制记录
// var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachone.InspectionMachineId);
// if (currApprove == null) //为获取到为 当前编制状态 直接提交
// {
// var approve = new Model.Comprehensive_InspectionMachineApprove();
// approve.InspectionMachineId = inspectionMachone.InspectionMachineId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// InspectionMachineApproveService.EditApprove(approve); //新增编制记录
Model.Comprehensive_InspectionMachineApprove newApprove = new Model.Comprehensive_InspectionMachineApprove();
newApprove.InspectionMachineId = inspectionMachone.InspectionMachineId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionMachineApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionMachineApprove newApprove = new Model.Comprehensive_InspectionMachineApprove();
// newApprove.InspectionMachineId = inspectionMachone.InspectionMachineId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionMachineApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else if (currApprove.ApproveMan == CurrUser.UserId)
{
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
{
currApprove.ApproveDate = DateTime.Now;
//currApprove.IsAgree = true;
InspectionMachineApproveService.EditApprove(currApprove); //新增专业工程师审核记录
Model.Comprehensive_InspectionMachineApprove newApprove = new Model.Comprehensive_InspectionMachineApprove();
newApprove.InspectionMachineId = inspectionMachone.InspectionMachineId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionMachineApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else
{
currApprove.ApproveDate = DateTime.Now; //更新审核时间
currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
currApprove.ApproveIdea = this.txtidea.Text;
InspectionMachineApproveService.EditApprove(currApprove);
// }
// else if (currApprove.ApproveMan == CurrUser.UserId)
// {
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
// {
// currApprove.ApproveDate = DateTime.Now;
// //currApprove.IsAgree = true;
// InspectionMachineApproveService.EditApprove(currApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionMachineApprove newApprove = new Model.Comprehensive_InspectionMachineApprove();
// newApprove.InspectionMachineId = inspectionMachone.InspectionMachineId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionMachineApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// }
// else
// {
// currApprove.ApproveDate = DateTime.Now; //更新审核时间
// currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// currApprove.ApproveIdea = this.txtidea.Text;
// InspectionMachineApproveService.EditApprove(currApprove);
if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
{
Model.Comprehensive_InspectionMachineApprove reApprove = new Model.Comprehensive_InspectionMachineApprove();
reApprove.InspectionMachineId = currApprove.InspectionMachineId;
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
// reApprove.ApproveIdea = txtidea.Text;
InspectionMachineApproveService.EditApprove(reApprove);
}
else
{
Model.Comprehensive_InspectionMachineApprove reApprove = new Model.Comprehensive_InspectionMachineApprove();
reApprove.InspectionMachineId = currApprove.InspectionMachineId;
reApprove.ApproveMan = inspectionMachone.CompileMan;
reApprove.ApproveType = Const.Comprehensive_ReCompile;
InspectionMachineApproveService.EditApprove(reApprove);
}
}
}
// if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
// {
// Model.Comprehensive_InspectionMachineApprove reApprove = new Model.Comprehensive_InspectionMachineApprove();
// reApprove.InspectionMachineId = currApprove.InspectionMachineId;
// reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
// reApprove.ApproveMan = CurrUser.UserId;
// reApprove.ApproveType = Const.Comprehensive_Complete;
// // reApprove.ApproveIdea = txtidea.Text;
// InspectionMachineApproveService.EditApprove(reApprove);
// }
// else
// {
// Model.Comprehensive_InspectionMachineApprove reApprove = new Model.Comprehensive_InspectionMachineApprove();
// reApprove.InspectionMachineId = currApprove.InspectionMachineId;
// reApprove.ApproveMan = inspectionMachone.CompileMan;
// reApprove.ApproveType = Const.Comprehensive_ReCompile;
// InspectionMachineApproveService.EditApprove(reApprove);
// }
// }
// }
#endregion
// #endregion
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
// ShowNotify("保存成功！", MessageBoxIcon.Success);
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//}
#endregion