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

成达修改20230724

Browse Source
This commit is contained in:
李超
2023-07-24 16:47:13 +08:00
parent dc33ea0366
commit f0b0eca670
28 changed files with 794 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs
+18 -87
View File
@@ -21,7 +21,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
if (!IsPostBack)
{
GetButtonPower();
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商
drpUnit.DataValueField = "UnitId";
drpUnit.DataTextField = "UnitName";
@@ -52,23 +52,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
//抄送单位
gvCCUnit.DataSource = UnitService.GetUnitByProjectIdList(CurrUser.LoginProjectId);
gvCCUnit.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();
this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
this.hdInspectionNoticeId.Text = Request.Params["inspectionId"];
if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text))
{
Model.ProcessControl_InspectionManagement inspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim());
@@ -107,11 +94,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
if (!string.IsNullOrEmpty(inspectionManagement.CCUnitIds))
{
txtCCUnit.Values = inspectionManagement.CCUnitIds.Split(',');
}
if (!string.IsNullOrEmpty(inspectionManagement.AuditMan))
{
drpAudit.SelectedValue = inspectionManagement.AuditMan;
}
}
if (inspectionManagement.PlanComplateDate != null)
{
this.dpPlanComplateDate.Text = string.Format("{0:yyyy-MM-dd HH:mm:ss}", inspectionManagement.PlanComplateDate);
@@ -123,7 +106,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.Grid1.DataSource = BLL.InspectionManagementDetailService.GetInspectionDetails(this.hdInspectionNoticeId.Text.Trim());
this.Grid1.DataBind();
if (inspectionManagement.Status == "3" ||(inspectionManagement.Status=="2" && inspectionManagement.AuditMan!=CurrUser.UserId)||(inspectionManagement.Status=="1"&&inspectionManagement.CompileMan!=CurrUser.UserId))
if (inspectionManagement.Status == "3" ||(inspectionManagement.Status=="1"&&inspectionManagement.CompileMan!=CurrUser.UserId))
{
this.drpWorkArea.Enabled = false;
this.drpUnit.Enabled = false;
@@ -138,30 +121,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
this.btnSubmit.Hidden = true;
this.btnSave.Hidden = true;
this.txtCCUnit.Enabled = false;
this.drpAudit.Enabled = false;
this.Grid1.Columns[9].Hidden = true;
}
else if(inspectionManagement.Status == "2" && inspectionManagement.AuditMan == CurrUser.UserId)
{
this.drpWorkArea.Enabled = false;
this.drpUnit.Enabled = false;
this.drpCNProfessionalId.Enabled = false;
this.txtNoticeCode.Enabled = false;
this.txtAcceptanceSite.Enabled = false;
this.txtAcceptanceCheckMan.Enabled = false;
this.dpPlanComplateDate.Enabled = false;
this.drpMainSendUnit.Enabled = false;
this.txtCCUnit.EnableEdit = false;
this.Toolbar4.Hidden = true;
this.txtCCUnit.Enabled = false;
this.Grid1.Columns[9].Hidden = true;
this.btnSubmit.ToolTip = "确认";
this.btnSubmit.Text = "确认";
this.dpRePlanComplateDate.Hidden = false;
this.dpRePlanComplateDate.Enabled = false;
this.btnSave.Hidden = true;
this.drpAudit.Hidden = true;
}
}
}
}
@@ -197,8 +159,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
Alert.ShowInTop("请先选择专业！", MessageBoxIcon.Warning);
return;
}
if (this.Grid1.Rows.Count == 0)
}
if (this.Grid1.Rows.Count == 0)
{
Alert.ShowInTop("请先选择共检内容！", MessageBoxIcon.Warning);
return;
@@ -226,8 +188,10 @@ namespace FineUIPro.Web.CQMS.ProcessControl
inspectionManagement.NoticeCode = this.txtNoticeCode.Text.Trim();
inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim();
inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim();
inspectionManagement.Status = "2";
if (!string.IsNullOrEmpty(this.dpPlanComplateDate.Text.Trim()))
inspectionManagement.Status = "3";
inspectionManagement.AuditMan = this.CurrUser.UserId;
if (!string.IsNullOrEmpty(this.dpPlanComplateDate.Text.Trim()))
{
inspectionManagement.PlanComplateDate = Convert.ToDateTime(this.dpPlanComplateDate.Text.Trim());
}
@@ -235,10 +199,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
inspectionManagement.RePlanComplateDate = Convert.ToDateTime(this.dpRePlanComplateDate.Text.Trim());
}
if (this.drpAudit.SelectedValue != BLL.Const._Null)
{
inspectionManagement.AuditMan = drpAudit.SelectedValue;
}
if (string.IsNullOrEmpty(Request.Params["inspectionId"]))
{
inspectionManagement.CompileMan = this.CurrUser.UserId;
@@ -259,19 +220,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
Model.ProcessControl_InspectionManagement oldInspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim());
inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2;
inspectionManagement.InspectionCode = oldInspectionManagement.InspectionCode;
inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
if (oldInspectionManagement.Status == "2")
{
inspectionManagement.Status = "3";
}
if (oldInspectionManagement.AuditMan != inspectionManagement.AuditMan)
{
changeAudit = true;
inspectionManagement.Status = "2";
}
BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement);
inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
inspectionManagement.Status = "3";
BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement);
BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId);
}
var details = jerqueSaveList();
@@ -280,18 +231,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
detail.InspectionId = inspectionManagement.InspectionId;
BLL.InspectionManagementDetailService.AddInspectionDetail(detail);
}
if (inspectionManagement.Status == "2")
{
APICommonService.SendSubscribeMessage(inspectionManagement.AuditMan, "控制点通知单待办理", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
ShowNotify("提交成功！", MessageBoxIcon.Success);
}
else
{
APICommonService.SendSubscribeMessage(inspectionManagement.CompileMan, "控制点通知单已确认", this.CurrUser.UserName, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now));
ShowNotify("确认成功！", MessageBoxIcon.Success);
}
ShowNotify("提交成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存
@@ -346,10 +286,6 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
inspectionManagement.PlanComplateDate = Convert.ToDateTime(this.dpPlanComplateDate.Text.Trim());
}
if (this.drpAudit.SelectedValue != BLL.Const._Null)
{
inspectionManagement.AuditMan = drpAudit.SelectedValue;
}
if (string.IsNullOrEmpty(Request.Params["inspectionId"]))
{
inspectionManagement.CompileMan = this.CurrUser.UserId;
@@ -369,12 +305,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
{
Model.ProcessControl_InspectionManagement oldInspectionManagement = BLL.InspectionManagementService.GetInspectionManagementById(this.hdInspectionNoticeId.Text.Trim());
inspectionManagement.AttachUrl2 = oldInspectionManagement.AttachUrl2;
inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
if (oldInspectionManagement.Status == "2")
{
inspectionManagement.Status = "2";
}
inspectionManagement.InspectionId = this.hdInspectionNoticeId.Text.Trim();
BLL.InspectionManagementService.UpdateInspectionManagement(inspectionManagement);
BLL.InspectionManagementDetailService.DeleteAllInspectionDetail(inspectionManagement.InspectionId);
}