zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-2-16

Browse Source
This commit is contained in:
李超
2023-03-16 19:28:52 +08:00
parent 30e0673db6
commit ba4e383388
42 changed files with 1442 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs
+182 -182
View File
@@ -40,10 +40,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);
BLL.InspectionEquipmentService.InitAttributeDropDownList(this.drpAttribute, true);
LoadAuditSelect();
this.agree.Hidden = true;
this.options.Hidden = true;
//this.agree.Hidden = true;
//this.options.Hidden = true;
this.btnSave.Hidden = true;
this.btnSubmit.Hidden = true;
//this.btnSubmit.Hidden = true;
this.InspectionEquipmentId = Request.Params["InspectionEquipmentId"];
var inspectionEquipment = BLL.InspectionEquipmentService.GetInspectionEquipmentById(this.InspectionEquipmentId);
if (inspectionEquipment != null)
@@ -86,7 +86,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{ //重新编制 编制人 可以 显示 提交 保存按钮
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionEquipment.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
//this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}//审核状态 审核人 可以显示 提交 保存按钮
else if (currApprove.ApproveType== BLL.Const.Comprehensive_Audit&&currApprove.ApproveMan== CurrUser.UserId)
@@ -103,13 +103,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemarkCode.Readonly = true;
this.txtEquipmentNo.Readonly = true;
this.txtUsedPlace.Readonly = true;
this.drpAudit.Readonly = true;
//this.drpAudit.Readonly = true;
this.txtSamplingCount.Readonly = true;
this.txtCounts.Readonly = true;
this.agree.Hidden = false;
this.options.Hidden = false;
this.btnSubmit.Hidden = false;
//this.agree.Hidden = false;
//this.options.Hidden = false;
//this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}//没有当前审核人，已完成状态 或者 待提交状态
@@ -117,7 +117,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
if(inspectionEquipment.Status == BLL.Const.Comprehensive_Compile && inspectionEquipment.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
// this.btnSubmit.Hidden = false;
this.btnSave.Hidden = false;
}
}
@@ -172,7 +172,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;
}
}
}
@@ -193,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.txtRemarkCode.Readonly = true;
this.txtEquipmentNo.Readonly = true;
this.txtUsedPlace.Readonly = true;
this.drpAudit.Readonly = true;
// this.drpAudit.Readonly = true;
this.txtSamplingCount.Readonly = true;
this.txtCounts.Readonly = true;
//this.btnAttach.Enabled = false;
@@ -207,19 +207,19 @@ namespace FineUIPro.Web.CQMS.Comprehensive
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_CD && 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_CD && 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
@@ -255,10 +255,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim();
newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim();
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
newInspectionEquipment.AuditMan = drpAudit.SelectedValue;
} //审核人
//if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
//{
// newInspectionEquipment.AuditMan = drpAudit.SelectedValue;
//} //审核人
if (this.drpAttribute.SelectedValue != BLL.Const._Null)
{
@@ -354,181 +354,181 @@ namespace FineUIPro.Web.CQMS.Comprehensive
#endregion
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;
// }
Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment();
newInspectionEquipment.ProjectId = this.CurrUser.LoginProjectId;
newInspectionEquipment.UnitId = this.drpUnitId.SelectedValue;
newInspectionEquipment.InspectionCode = this.txtInspectionCode.Text.Trim();
if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
{
newInspectionEquipment.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
}
newInspectionEquipment.InspectionName = this.txtInspectionName.Text.Trim();
newInspectionEquipment.Specifications = this.txtSpecifications.Text.Trim();
newInspectionEquipment.Supplier = this.txtSupplier.Text.Trim();
newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim();
newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim();
newInspectionEquipment.Counts = this.txtCounts.Text.Trim();
newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim();
newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim();
// Model.Comprehensive_InspectionEquipment newInspectionEquipment = new Model.Comprehensive_InspectionEquipment();
// newInspectionEquipment.ProjectId = this.CurrUser.LoginProjectId;
// newInspectionEquipment.UnitId = this.drpUnitId.SelectedValue;
// newInspectionEquipment.InspectionCode = this.txtInspectionCode.Text.Trim();
// if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null)
// {
// newInspectionEquipment.CNProfessionalId = this.drpCNProfessionalId.SelectedValue;
// }
// newInspectionEquipment.InspectionName = this.txtInspectionName.Text.Trim();
// newInspectionEquipment.Specifications = this.txtSpecifications.Text.Trim();
// newInspectionEquipment.Supplier = this.txtSupplier.Text.Trim();
// newInspectionEquipment.EquipmentNO = this.txtEquipmentNo.Text.Trim();
// newInspectionEquipment.RemarkCode = this.txtRemarkCode.Text.Trim();
// newInspectionEquipment.Counts = this.txtCounts.Text.Trim();
// newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim();
// newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim();
if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
{
newInspectionEquipment.AuditMan = drpAudit.SelectedValue;
} //审核人
// if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue))
// {
// newInspectionEquipment.AuditMan = drpAudit.SelectedValue;
// } //审核人
if (this.drpAttribute.SelectedValue != BLL.Const._Null)
{
newInspectionEquipment.Attribute = this.drpAttribute.SelectedValue;
}
if (this.drpSamplingResult.SelectedValue != BLL.Const._Null)
{
newInspectionEquipment.SamplingResult = this.drpSamplingResult.SelectedValue;
}
if (!string.IsNullOrEmpty(this.txtInspectionDate.Text))
{
newInspectionEquipment.InspectionDate = Convert.ToDateTime(this.txtInspectionDate.Text);
}
// if (this.drpAttribute.SelectedValue != BLL.Const._Null)
// {
// newInspectionEquipment.Attribute = this.drpAttribute.SelectedValue;
// }
// if (this.drpSamplingResult.SelectedValue != BLL.Const._Null)
// {
// newInspectionEquipment.SamplingResult = this.drpSamplingResult.SelectedValue;
// }
// if (!string.IsNullOrEmpty(this.txtInspectionDate.Text))
// {
// newInspectionEquipment.InspectionDate = Convert.ToDateTime(this.txtInspectionDate.Text);
// }
if (string.IsNullOrEmpty(this.InspectionEquipmentId))
{
newInspectionEquipment.CompileMan = this.CurrUser.UserId;
newInspectionEquipment.CompileDate = DateTime.Now;
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
// if (string.IsNullOrEmpty(this.InspectionEquipmentId))
// {
// newInspectionEquipment.CompileMan = this.CurrUser.UserId;
// newInspectionEquipment.CompileDate = DateTime.Now;
// newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
// newInspectionEquipment.InspectionEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
// var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == newInspectionEquipment.InspectionEquipmentId);
// if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
// {
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
// }
BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
}
else
{
var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
{
Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
return;
}
newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
if (oldInspectionEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态
{
newInspectionEquipment.CompileMan = this.CurrUser.UserId;
newInspectionEquipment.CompileDate = DateTime.Now;
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
}
else
{
newInspectionEquipment.CompileMan = oldInspectionEquipment.CompileMan;
newInspectionEquipment.CompileDate = oldInspectionEquipment.CompileDate;
if(oldInspectionEquipment.Status==BLL.Const.Comprehensive_Compile)//编制状态提交变审核
{
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
}
else if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
{
newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
}
else //审核状态 提交 变 完成 或者 重新编制
{
if (Convert.ToBoolean(rblIsAgree.SelectedValue))
{
newInspectionEquipment.Status = BLL.Const.Comprehensive_Complete;
}
else
{
newInspectionEquipment.Status = BLL.Const.Comprehensive_ReCompile;
}
}
// BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
// }
// else
// {
// var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.InspectionEquipmentId);
// if (sour == null || string.IsNullOrEmpty(sour.AttachUrl))
// {
// Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning);
// return;
// }
// newInspectionEquipment.InspectionEquipmentId = this.InspectionEquipmentId;
// var oldInspectionEquipment = Funs.DB.Comprehensive_InspectionEquipment.Where(u => u.InspectionEquipmentId == this.InspectionEquipmentId).FirstOrDefault();
// if (oldInspectionEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态
// {
// newInspectionEquipment.CompileMan = this.CurrUser.UserId;
// newInspectionEquipment.CompileDate = DateTime.Now;
// newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
// BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment);
// }
// else
// {
// newInspectionEquipment.CompileMan = oldInspectionEquipment.CompileMan;
// newInspectionEquipment.CompileDate = oldInspectionEquipment.CompileDate;
// if(oldInspectionEquipment.Status==BLL.Const.Comprehensive_Compile)//编制状态提交变审核
// {
// newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
// }
// else if (oldInspectionEquipment.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核
// {
// newInspectionEquipment.Status = BLL.Const.Comprehensive_Audit;
// }
// else //审核状态 提交 变 完成 或者 重新编制
// {
// if (Convert.ToBoolean(rblIsAgree.SelectedValue))
// {
// newInspectionEquipment.Status = BLL.Const.Comprehensive_Complete;
// }
// else
// {
// newInspectionEquipment.Status = BLL.Const.Comprehensive_ReCompile;
// }
// }
BLL.InspectionEquipmentService.UpdateInspectionEquipment(newInspectionEquipment);
// BLL.InspectionEquipmentService.UpdateInspectionEquipment(newInspectionEquipment);
}
// }
}
// }
#region 审核记录
// #region 审核记录
var currApprove = InspectionEquipmentApproveService.GetCurrentApprove(newInspectionEquipment.InspectionEquipmentId);
if (currApprove == null) //为获取到为 当前编制状态 直接提交
{
var approve = new Model.Comprehensive_InspectionEquipmentApprove();
approve.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
approve.ApproveMan = this.CurrUser.UserId;
approve.ApproveType = Const.Comprehensive_Compile;
approve.ApproveDate = DateTime.Now;
InspectionEquipmentApproveService.EditApprove(approve); //新增编制记录
// var currApprove = InspectionEquipmentApproveService.GetCurrentApprove(newInspectionEquipment.InspectionEquipmentId);
// if (currApprove == null) //为获取到为 当前编制状态 直接提交
// {
// var approve = new Model.Comprehensive_InspectionEquipmentApprove();
// approve.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
// approve.ApproveMan = this.CurrUser.UserId;
// approve.ApproveType = Const.Comprehensive_Compile;
// approve.ApproveDate = DateTime.Now;
// InspectionEquipmentApproveService.EditApprove(approve); //新增编制记录
Model.Comprehensive_InspectionEquipmentApprove newApprove = new Model.Comprehensive_InspectionEquipmentApprove();
newApprove.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionEquipmentApprove newApprove = new Model.Comprehensive_InspectionEquipmentApprove();
// newApprove.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}else if (currApprove.ApproveMan == CurrUser.UserId)
{
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
{
currApprove.ApproveDate = DateTime.Now;
//currApprove.IsAgree = true;
InspectionEquipmentApproveService.EditApprove(currApprove); //新增专业工程师审核记录
Model.Comprehensive_InspectionEquipmentApprove newApprove = new Model.Comprehensive_InspectionEquipmentApprove();
newApprove.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
newApprove.ApproveMan = this.drpAudit.SelectedValue;
newApprove.ApproveType = Const.InspectionManagement_Audit;
InspectionEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录
}
else
{
currApprove.ApproveDate = DateTime.Now; //更新审核时间
currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
currApprove.ApproveIdea = this.txtidea.Text;
InspectionEquipmentApproveService.EditApprove(currApprove);
// }else if (currApprove.ApproveMan == CurrUser.UserId)
// {
// if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile)
// {
// currApprove.ApproveDate = DateTime.Now;
// //currApprove.IsAgree = true;
// InspectionEquipmentApproveService.EditApprove(currApprove); //新增专业工程师审核记录
// Model.Comprehensive_InspectionEquipmentApprove newApprove = new Model.Comprehensive_InspectionEquipmentApprove();
// newApprove.InspectionEquipmentId = newInspectionEquipment.InspectionEquipmentId;
// newApprove.ApproveMan = this.drpAudit.SelectedValue;
// newApprove.ApproveType = Const.InspectionManagement_Audit;
// InspectionEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录
// }
// else
// {
// currApprove.ApproveDate = DateTime.Now; //更新审核时间
// currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
// currApprove.ApproveIdea = this.txtidea.Text;
// InspectionEquipmentApproveService.EditApprove(currApprove);
if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
{
Model.Comprehensive_InspectionEquipmentApprove reApprove = new Model.Comprehensive_InspectionEquipmentApprove();
reApprove.InspectionEquipmentId = currApprove.InspectionEquipmentId;
reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
reApprove.ApproveMan = CurrUser.UserId;
reApprove.ApproveType = Const.Comprehensive_Complete;
//reApprove.ApproveIdea = txtidea.Text;
InspectionEquipmentApproveService.EditApprove(reApprove);
}
else
{
Model.Comprehensive_InspectionEquipmentApprove reApprove = new Model.Comprehensive_InspectionEquipmentApprove();
reApprove.InspectionEquipmentId = currApprove.InspectionEquipmentId;
reApprove.ApproveMan = newInspectionEquipment.CompileMan;
reApprove.ApproveType = Const.Comprehensive_ReCompile;
InspectionEquipmentApproveService.EditApprove(reApprove);
}
}
}
// if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成
// {
// Model.Comprehensive_InspectionEquipmentApprove reApprove = new Model.Comprehensive_InspectionEquipmentApprove();
// reApprove.InspectionEquipmentId = currApprove.InspectionEquipmentId;
// reApprove.ApproveDate = DateTime.Now.AddSeconds(10);
// reApprove.ApproveMan = CurrUser.UserId;
// reApprove.ApproveType = Const.Comprehensive_Complete;
// //reApprove.ApproveIdea = txtidea.Text;
// InspectionEquipmentApproveService.EditApprove(reApprove);
// }
// else
// {
// Model.Comprehensive_InspectionEquipmentApprove reApprove = new Model.Comprehensive_InspectionEquipmentApprove();
// reApprove.InspectionEquipmentId = currApprove.InspectionEquipmentId;
// reApprove.ApproveMan = newInspectionEquipment.CompileMan;
// reApprove.ApproveType = Const.Comprehensive_ReCompile;
// InspectionEquipmentApproveService.EditApprove(reApprove);
// }
// }
// }
#endregion
// #endregion
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
// ShowNotify("保存成功！", MessageBoxIcon.Success);
// PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
//}
#region 附件上传