diff --git a/DataBase/版本日志/SGGLDB_WH_2024-06-14-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-06-14-bwj.sql new file mode 100644 index 00000000..18966d16 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-06-14-bwj.sql @@ -0,0 +1,52 @@ + +update Sys_Menu set SortIndex=10 where MenuId='F5585C62-1F12-4073-8733-C0826FB692DB' +update Sys_Menu set MenuName='ƻ/λֲ̻',SortIndex=20 where MenuId='3B322232-38A1-4291-9832-CD4A01C2A975' +update Sys_Menu set SortIndex=60 where MenuId='A54EC449-5F77-4068-83B9-AA305B721A0B' +update Sys_Menu set SortIndex=70 where MenuId='BBBF69F1-9520-4E0A-B0C0-9F4D3FBF4C10' +update Sys_Menu set SortIndex=80 where MenuId='E632DCA0-5A68-49C4-90CE-793EFC693C4A' +update Sys_Menu set SortIndex=90 where MenuId='D1BB76A7-B273-4636-B414-49B93231780D' +go + +update Sys_Menu set MenuName='ƻ' where MenuId='1D3CAAD1-690B-4F30-9E3E-6B31D0CF60FA' +update Sys_Menu set SortIndex=20 where MenuId='B340205A-8857-4D0D-9E4C-41D91A417A77' +update Sys_Menu set SortIndex=30 where MenuId='46E6F0A6-A6A2-4904-9B69-CD91342D7DF8' +update Sys_Menu set SortIndex=40 where MenuId='6769098A-53D7-4585-87CC-2DADBCBC2C74' +go + +update Sys_Menu set MenuName='ʩ֯Ƽʩ',SortIndex=10 where MenuId='681eab0b-11ae-4829-b421-408918beaed0' +update Sys_Menu set MenuName='Σ󹤳ʩ',SortIndex=20 where MenuId='fd116c94-714b-4b92-a3c9-cc83d358e2b3' +update Sys_Menu set SortIndex=30 where MenuId='A16CFA9D-2783-4573-95F9-EBA2B682B7EA' +update Sys_Menu set MenuName='ƻ',SortIndex=40 where MenuId='A70EA41D-0B45-4753-AC77-BF28DA066402' +update Sys_Menu set SortIndex=50 where MenuId='318589ea-2367-4e68-905a-9d7957138df5' +update Sys_Menu set SortIndex=60 where MenuId='856D53B3-C5FB-443F-917B-39E83BE685DB' +update Sys_Menu set MenuName='Ʊ',SortIndex=70 where MenuId='92b7d653-f32a-4694-a77e-74ba63586d3f' +update Sys_Menu set MenuName='Ա',SortIndex=80 where MenuId='8ed133de-5899-4687-878a-20b1f5280f18' +update Sys_Menu set MenuName='豸ϱ',SortIndex=90 where MenuId='6c2c1e5e-1812-4e1c-a683-7125518e28c7' +update Sys_Menu set MenuName='ʩ/߱',SortIndex=100 where MenuId='aa55fad1-6c51-43f5-8c99-3c6aaae79118' +update Sys_Menu set SortIndex=110 where MenuId='9ac06df6-b91a-42bb-9a51-5cd59d8733a9' +update Sys_Menu set SortIndex=120 where MenuId='49b87812-c07d-4b0e-9909-960e5cd822c7' +update Sys_Menu set SortIndex=130 where MenuId='7e628f48-385f-4d52-8063-d0f812514316' +update Sys_Menu set SortIndex=140 where MenuId='E7C8C938-661C-438F-852F-F0A4C285306B' +update Sys_Menu set SortIndex=150 where MenuId='d8de4143-b680-44cf-9a78-acd3d49a8d00' +update Sys_Menu set SortIndex=160 where MenuId='CFD19410-DF80-494A-A2DD-D23A03438742' +update Sys_Menu set SortIndex=170 where MenuId='1da8fd71-f653-4764-bbfd-65e43f0220e5' +update Sys_Menu set SortIndex=180 where MenuId='B2086D3A-2384-487E-AFFB-6FACDD09B621' +update Sys_Menu set SortIndex=190 where MenuId='fea46798-e040-47c3-be55-9634b9a04d48' +go + +update Sys_Menu set MenuName='ͳ' where MenuId='D3B1433E-00DE-432B-A30A-0EFB513480A8' +go + +update Inspection_SummaryMb set MenuC='豸ϱ' where InspectionSummaryMbId='11' +update Inspection_SummaryMb set MenuC='Ա' where InspectionSummaryMbId='12' +update Inspection_SummaryMb set MenuC='ʩ/߱' where InspectionSummaryMbId='13' +update Inspection_SummaryMb set MenuC='Ʊ' where InspectionSummaryMbId='14' +update Inspection_SummaryMb set MenuC='ʩ֯Ƽʩ' where InspectionSummaryMbId='15' +update Inspection_SummaryMb set MenuC='NRC' where InspectionSummaryMbId='17' +update Inspection_SummaryMb set MenuC='Ŀܱ' where InspectionSummaryMbId='18' +update Inspection_SummaryMb set MenuC='Ŀ±' where InspectionSummaryMbId='19' +update Inspection_SummaryMb set MenuC='һιϸ' where InspectionSummaryMbId='22' +go + + + diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx index aa073ff7..41f57c8c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrder.aspx @@ -85,13 +85,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label3; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx index 0d6fa5ff..96b99aef 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx @@ -69,7 +69,7 @@ - + <%-- @@ -93,7 +93,7 @@ - + --%> @@ -104,8 +104,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index 971fdfe0..1fe4e6ce 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -39,9 +39,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorks, this.CurrUser.LoginProjectId, false); BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.DesignChangeOrderId = Request.Params["DesignChangeOrderId"]; Model.Comprehensive_DesignChangeOrder designChangeOrder = BLL.DesignChangeOrderService.GetDesignChangeOrderById(this.DesignChangeOrderId); if (designChangeOrder != null) @@ -79,35 +79,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpImplementationFrontState.SelectedValue= designChangeOrder.ImplementationFrontState; this.txtRemarkCode.Text = designChangeOrder.RemarkCode.HasValue ? designChangeOrder.RemarkCode.ToString() : ""; - var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designChangeOrder.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 = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designChangeOrder.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 (designChangeOrder.Status == BLL.Const.Comprehensive_Compile && designChangeOrder.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 (designChangeOrder.Status == BLL.Const.Comprehensive_Compile && designChangeOrder.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } else @@ -116,7 +116,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtApprovalDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive drpCNProfessionalId.Readonly = true; drpUnitIds.Readonly = true; drpUnitWorks.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; // this.btnAttach.Enabled = false; @@ -147,23 +147,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 @@ -200,10 +200,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designChangeOrder.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // designChangeOrder.AuditMan = drpAudit.SelectedValue; + //} //审核人 string unitWorks = string.Empty; var unitWorksList = this.drpUnitWorks.SelectedValueArray; foreach (var item in unitWorksList) @@ -262,186 +262,186 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_DesignChangeOrder.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignChangeOrderId != this.DesignChangeOrderId || (this.DesignChangeOrderId == null && x.DesignChangeOrderId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_DesignChangeOrder designChangeOrder = new Model.Comprehensive_DesignChangeOrder(); - designChangeOrder.ProjectId = this.CurrUser.LoginProjectId; - if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) - { - designChangeOrder.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - } - designChangeOrder.ChangeOrderCode = this.txtChangeOrderCode.Text.Trim(); - designChangeOrder.ChangeReason = this.txtChangeReason.Text.Trim(); - designChangeOrder.Contents = this.txtContents.Text.Trim(); - designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); - designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); - designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); - designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designChangeOrder.AuditMan = drpAudit.SelectedValue; - } //审核人 - string unitWorks = string.Empty; - var unitWorksList = this.drpUnitWorks.SelectedValueArray; - foreach (var item in unitWorksList) - { - unitWorks += item + ","; - } - if (!string.IsNullOrEmpty(unitWorks)) - { - unitWorks = unitWorks.Substring(0, unitWorks.LastIndexOf(',')); - } - designChangeOrder.UnitWorkId = unitWorks; + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_DesignChangeOrder.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignChangeOrderId != this.DesignChangeOrderId || (this.DesignChangeOrderId == null && x.DesignChangeOrderId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_DesignChangeOrder designChangeOrder = new Model.Comprehensive_DesignChangeOrder(); + // designChangeOrder.ProjectId = this.CurrUser.LoginProjectId; + // if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + // { + // designChangeOrder.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // } + // designChangeOrder.ChangeOrderCode = this.txtChangeOrderCode.Text.Trim(); + // designChangeOrder.ChangeReason = this.txtChangeReason.Text.Trim(); + // designChangeOrder.Contents = this.txtContents.Text.Trim(); + // designChangeOrder.IssuedDate = Funs.GetNewDateTime(this.txtIssuedDate.Text); + // designChangeOrder.ApprovalDate = Funs.GetNewDateTime(this.txtApprovalDate.Text); + // designChangeOrder.CompleteDate = Funs.GetNewDateTime(this.txtCompleteDate.Text); + // designChangeOrder.ImplementationFrontState = this.drpImplementationFrontState.SelectedValue; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // designChangeOrder.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // string unitWorks = string.Empty; + // var unitWorksList = this.drpUnitWorks.SelectedValueArray; + // foreach (var item in unitWorksList) + // { + // unitWorks += item + ","; + // } + // if (!string.IsNullOrEmpty(unitWorks)) + // { + // unitWorks = unitWorks.Substring(0, unitWorks.LastIndexOf(',')); + // } + // designChangeOrder.UnitWorkId = unitWorks; - string unitIds = string.Empty; - var unitLists = this.drpUnitIds.SelectedValueArray; - foreach (var item in unitLists) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(',')); - } - designChangeOrder.UnitId = unitIds; - designChangeOrder.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.DesignChangeOrderId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - designChangeOrder.DesignChangeOrderId = this.hdAttachUrl.Text; - } - else - { - designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); - this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; - } - designChangeOrder.CompileMan = this.CurrUser.UserId; - designChangeOrder.CompileDate = DateTime.Now; - designChangeOrder.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); - } - else - { - designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; + // string unitIds = string.Empty; + // var unitLists = this.drpUnitIds.SelectedValueArray; + // foreach (var item in unitLists) + // { + // unitIds += item + ","; + // } + // if (!string.IsNullOrEmpty(unitIds)) + // { + // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(',')); + // } + // designChangeOrder.UnitId = unitIds; + // designChangeOrder.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.DesignChangeOrderId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // designChangeOrder.DesignChangeOrderId = this.hdAttachUrl.Text; + // } + // else + // { + // designChangeOrder.DesignChangeOrderId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignChangeOrder)); + // this.hdAttachUrl.Text = designChangeOrder.DesignChangeOrderId; + // } + // designChangeOrder.CompileMan = this.CurrUser.UserId; + // designChangeOrder.CompileDate = DateTime.Now; + // designChangeOrder.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); + // } + // else + // { + // designChangeOrder.DesignChangeOrderId = this.DesignChangeOrderId; - var oldDesignChangeOrder = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); - if (oldDesignChangeOrder == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - designChangeOrder.CompileMan = this.CurrUser.UserId; - designChangeOrder.CompileDate = DateTime.Now; - designChangeOrder.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); - } - else - { - designChangeOrder.CompileMan = oldDesignChangeOrder.CompileMan; - designChangeOrder.CompileDate = oldDesignChangeOrder.CompileDate; - if (oldDesignChangeOrder.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - designChangeOrder.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldDesignChangeOrder.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - designChangeOrder.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - designChangeOrder.Status = BLL.Const.Comprehensive_Complete; - } - else - { - designChangeOrder.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // var oldDesignChangeOrder = Funs.DB.Comprehensive_DesignChangeOrder.Where(u => u.DesignChangeOrderId == this.DesignChangeOrderId).FirstOrDefault(); + // if (oldDesignChangeOrder == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // designChangeOrder.CompileMan = this.CurrUser.UserId; + // designChangeOrder.CompileDate = DateTime.Now; + // designChangeOrder.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignChangeOrderService.AddDesignChangeOrder(designChangeOrder); + // } + // else + // { + // designChangeOrder.CompileMan = oldDesignChangeOrder.CompileMan; + // designChangeOrder.CompileDate = oldDesignChangeOrder.CompileDate; + // if (oldDesignChangeOrder.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // designChangeOrder.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldDesignChangeOrder.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // designChangeOrder.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // designChangeOrder.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // designChangeOrder.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.DesignChangeOrderService.UpdateDesignChangeOrder(designChangeOrder); + // BLL.DesignChangeOrderService.UpdateDesignChangeOrder(designChangeOrder); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_DesignChangeOrderApprove(); - approve.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - DesignChangeOrderApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = DesignChangeOrderApproveService.GetCurrentApprove(designChangeOrder.DesignChangeOrderId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_DesignChangeOrderApprove(); + // approve.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // DesignChangeOrderApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_DesignChangeOrderApprove newApprove = new Model.Comprehensive_DesignChangeOrderApprove(); - newApprove.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignChangeOrderApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignChangeOrderApprove newApprove = new Model.Comprehensive_DesignChangeOrderApprove(); + // newApprove.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignChangeOrderApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - DesignChangeOrderApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_DesignChangeOrderApprove newApprove = new Model.Comprehensive_DesignChangeOrderApprove(); - newApprove.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignChangeOrderApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - DesignChangeOrderApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // DesignChangeOrderApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignChangeOrderApprove newApprove = new Model.Comprehensive_DesignChangeOrderApprove(); + // newApprove.DesignChangeOrderId = designChangeOrder.DesignChangeOrderId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignChangeOrderApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // DesignChangeOrderApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_DesignChangeOrderApprove reApprove = new Model.Comprehensive_DesignChangeOrderApprove(); - reApprove.DesignChangeOrderId = currApprove.DesignChangeOrderId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - //reApprove.ApproveIdea = txtidea.Text; - DesignChangeOrderApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_DesignChangeOrderApprove reApprove = new Model.Comprehensive_DesignChangeOrderApprove(); - reApprove.DesignChangeOrderId = currApprove.DesignChangeOrderId; - reApprove.ApproveMan = designChangeOrder.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - DesignChangeOrderApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_DesignChangeOrderApprove reApprove = new Model.Comprehensive_DesignChangeOrderApprove(); + // reApprove.DesignChangeOrderId = currApprove.DesignChangeOrderId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // //reApprove.ApproveIdea = txtidea.Text; + // DesignChangeOrderApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_DesignChangeOrderApprove reApprove = new Model.Comprehensive_DesignChangeOrderApprove(); + // reApprove.DesignChangeOrderId = currApprove.DesignChangeOrderId; + // reApprove.ApproveMan = designChangeOrder.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // DesignChangeOrderApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs index c47a3c19..c1f02934 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.designer.cs @@ -165,51 +165,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.NumberBox txtRemarkCode; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -237,15 +192,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx index 96063d19..10f2e990 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetails.aspx @@ -63,13 +63,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label1; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx index 8903ba25..e31d4c8a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx @@ -58,7 +58,7 @@ - + <%-- @@ -84,7 +84,7 @@ - + --%> @@ -95,8 +95,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index 8728e512..ada4f4be 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -37,12 +37,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorks, this.CurrUser.LoginProjectId, false); BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.DesignDetailsId = Request.Params["DesignDetailsId"]; Model.Comprehensive_DesignDetails designDetails = BLL.DesignDetailsService.GetDesignDetailsById(this.DesignDetailsId); if (designDetails != null) @@ -72,42 +72,42 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString(); } this.txtRemarkCode.Text = designDetails.RemarCode.HasValue ? designDetails.RemarCode.ToString() : ""; - var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit); - if (auditApprove != null) - { - drpAudit.SelectedValue = auditApprove.ApproveMan; + //var auditApprove = DesignDetailsApproveService.GetAuditApprove(designDetails.DesignDetailsId, BLL.Const.Comprehensive_Audit); + //if (auditApprove != null) + //{ + // drpAudit.SelectedValue = auditApprove.ApproveMan; - } - var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDetails.CompileMan == CurrUser.UserId) - { - this.btnSubmit.Hidden = false; - this.btnSave.Hidden = false; - }//审核状态 审核人 可以显示 提交 保存按钮 - else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId) - { + //} + //var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDetails.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // }//审核状态 审核人 可以显示 提交 保存按钮 + // else if (currApprove.ApproveType == BLL.Const.Comprehensive_Audit && currApprove.ApproveMan == CurrUser.UserId) + // { - //审核状态不可编辑 - Readonly(); + // //审核状态不可编辑 + // Readonly(); - this.agree.Hidden = false; - this.options.Hidden = false; - this.btnSubmit.Hidden = false; - this.btnSave.Hidden = false; - } - }//没有当前审核人，已完成状态 或者 待提交状态 - else - { - if (designDetails.Status == BLL.Const.Comprehensive_Compile && designDetails.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 (designDetails.Status == BLL.Const.Comprehensive_Compile && designDetails.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } @@ -115,7 +115,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtDetailsDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitIds.Readonly = true; this.drpUnitWorks.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; @@ -143,23 +143,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 @@ -184,10 +184,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails(); designDetails.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designDetails.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // designDetails.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) { designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; @@ -256,190 +256,190 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_DesignDetails.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDetailsId != this.DesignDetailsId || (this.DesignDetailsId == null && x.DesignDetailsId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } - Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails(); - designDetails.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designDetails.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) - { - designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - } - designDetails.DesignDetailsCode = this.txtDesignDetailsCode.Text.Trim(); - designDetails.DetailsMan = this.txtDetailsMan.Text.Trim(); - designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim()); - if (!string.IsNullOrEmpty(this.txtDetailsDate.Text)) - { - designDetails.DetailsDate = Convert.ToDateTime(this.txtDetailsDate.Text); - } - string ids = string.Empty; - var lists = this.drpUnitWorks.SelectedValueArray; - foreach (var item in lists) - { - ids += item + ","; - } - if (!string.IsNullOrEmpty(ids)) - { - ids = ids.Substring(0, ids.LastIndexOf(",")); - } - designDetails.UnitWorkId = ids; + // Model.Comprehensive_DesignDetails designDetails = new Model.Comprehensive_DesignDetails(); + // designDetails.ProjectId = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // designDetails.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + // { + // designDetails.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // } + // designDetails.DesignDetailsCode = this.txtDesignDetailsCode.Text.Trim(); + // designDetails.DetailsMan = this.txtDetailsMan.Text.Trim(); + // designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim()); + // if (!string.IsNullOrEmpty(this.txtDetailsDate.Text)) + // { + // designDetails.DetailsDate = Convert.ToDateTime(this.txtDetailsDate.Text); + // } + // string ids = string.Empty; + // var lists = this.drpUnitWorks.SelectedValueArray; + // foreach (var item in lists) + // { + // ids += item + ","; + // } + // if (!string.IsNullOrEmpty(ids)) + // { + // ids = ids.Substring(0, ids.LastIndexOf(",")); + // } + // designDetails.UnitWorkId = ids; - string unitIds = string.Empty; - var units = this.drpUnitIds.SelectedValueArray; - foreach (var item in units) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); - } - designDetails.UnitName = unitIds; - designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.DesignDetailsId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - designDetails.DesignDetailsId = this.hdAttachUrl.Text; - } - else - { - designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails)); - this.hdAttachUrl.Text = designDetails.DesignDetailsId; - } + // string unitIds = string.Empty; + // var units = this.drpUnitIds.SelectedValueArray; + // foreach (var item in units) + // { + // unitIds += item + ","; + // } + // if (!string.IsNullOrEmpty(unitIds)) + // { + // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + // } + // designDetails.UnitName = unitIds; + // designDetails.RemarCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.DesignDetailsId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // designDetails.DesignDetailsId = this.hdAttachUrl.Text; + // } + // else + // { + // designDetails.DesignDetailsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDetails)); + // this.hdAttachUrl.Text = designDetails.DesignDetailsId; + // } - designDetails.CompileMan = this.CurrUser.UserId; - designDetails.CompileDate = DateTime.Now; - designDetails.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignDetailsService.AddDesignDetails(designDetails); - } - else - { - designDetails.DesignDetailsId = this.DesignDetailsId; + // designDetails.CompileMan = this.CurrUser.UserId; + // designDetails.CompileDate = DateTime.Now; + // designDetails.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignDetailsService.AddDesignDetails(designDetails); + // } + // else + // { + // designDetails.DesignDetailsId = this.DesignDetailsId; - var oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault(); - if (oldDesignDetails == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - designDetails.CompileMan = this.CurrUser.UserId; - designDetails.CompileDate = DateTime.Now; - designDetails.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignDetailsService.AddDesignDetails(designDetails); - } - else - { - designDetails.CompileMan = oldDesignDetails.CompileMan; - designDetails.CompileDate = oldDesignDetails.CompileDate; - if (oldDesignDetails.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - designDetails.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldDesignDetails.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - designDetails.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - designDetails.Status = BLL.Const.Comprehensive_Complete; - } - else - { - designDetails.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // var oldDesignDetails = Funs.DB.Comprehensive_DesignDetails.Where(u => u.DesignDetailsId == this.DesignDetailsId).FirstOrDefault(); + // if (oldDesignDetails == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // designDetails.CompileMan = this.CurrUser.UserId; + // designDetails.CompileDate = DateTime.Now; + // designDetails.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignDetailsService.AddDesignDetails(designDetails); + // } + // else + // { + // designDetails.CompileMan = oldDesignDetails.CompileMan; + // designDetails.CompileDate = oldDesignDetails.CompileDate; + // if (oldDesignDetails.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // designDetails.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldDesignDetails.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // designDetails.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // designDetails.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // designDetails.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.DesignDetailsService.UpdateDesignDetails(designDetails); + // BLL.DesignDetailsService.UpdateDesignDetails(designDetails); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_DesignDetailsApprove(); - approve.DesignDetailsId = designDetails.DesignDetailsId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - DesignDetailsApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_DesignDetailsApprove(); + // approve.DesignDetailsId = designDetails.DesignDetailsId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // DesignDetailsApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove(); - newApprove.DesignDetailsId = designDetails.DesignDetailsId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove(); + // newApprove.DesignDetailsId = designDetails.DesignDetailsId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - DesignDetailsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove(); - newApprove.DesignDetailsId = designDetails.DesignDetailsId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - DesignDetailsApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // DesignDetailsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDetailsApprove newApprove = new Model.Comprehensive_DesignDetailsApprove(); + // newApprove.DesignDetailsId = designDetails.DesignDetailsId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDetailsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // DesignDetailsApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove(); - reApprove.DesignDetailsId = currApprove.DesignDetailsId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; - DesignDetailsApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove(); - reApprove.DesignDetailsId = currApprove.DesignDetailsId; - reApprove.ApproveMan = designDetails.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - DesignDetailsApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove(); + // reApprove.DesignDetailsId = currApprove.DesignDetailsId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // // reApprove.ApproveIdea = txtidea.Text; + // DesignDetailsApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_DesignDetailsApprove reApprove = new Model.Comprehensive_DesignDetailsApprove(); + // reApprove.DesignDetailsId = currApprove.DesignDetailsId; + // reApprove.ApproveMan = designDetails.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // DesignDetailsApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs index 965fc383..16b18a17 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs @@ -138,51 +138,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -210,15 +165,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx index f9bd525c..2a94911c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawings.aspx @@ -83,13 +83,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label3; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx index c18cb356..8fa17bcc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx @@ -73,7 +73,7 @@ - + <%-- @@ -97,7 +97,7 @@ - + --%> @@ -108,8 +108,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 7167b13b..8f4effba 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -38,12 +38,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false); BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.DesignDrawingsId = Request.Params["DesignDrawingsId"]; Model.Comprehensive_DesignDrawings designDrawings = BLL.DesignDrawingsService.GetDesignDrawingsById(this.DesignDrawingsId); if (designDrawings != null) @@ -73,39 +73,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemarkCode.Text = designDrawings.RemarkCode.HasValue ? designDrawings.RemarkCode.ToString() : ""; - var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId); - if (currApprove != null) - { //重新编制 编制人 可以 显示 提交 保存按钮 + //var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId); + //if (currApprove != null) + //{ //重新编制 编制人 可以 显示 提交 保存按钮 - this.drpAudit.SelectedValue = currApprove.ApproveMan; - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDrawings.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 (designDrawings.Status == BLL.Const.Comprehensive_Compile && designDrawings.CompileMan == CurrUser.UserId) - { - this.btnSubmit.Hidden = false; - this.btnSave.Hidden = false; - } - } + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && designDrawings.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 (designDrawings.Status == BLL.Const.Comprehensive_Compile && designDrawings.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } else { this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -128,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemark.Readonly = true; this.txtRemarkCode.Readonly = true; this.txtSendDate.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; //this.btnAttach.Enabled = false; } @@ -136,23 +136,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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(); + //} @@ -191,10 +191,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive designDrawings.Remark = this.txtRemark.Text.Trim(); designDrawings.CompileMan = this.CurrUser.UserId; designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designDrawings.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // designDrawings.AuditMan = drpAudit.SelectedValue; + //} //审核人 string ids = string.Empty; var lists = this.drpUnitWorkIds.SelectedValueArray; foreach (var item in lists) @@ -250,185 +250,185 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_DesignDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings(); - designDrawings.ProjectId = this.CurrUser.LoginProjectId; - designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - designDrawings.DesignDrawingsCode = this.txtDesignDrawingsCode.Text.Trim(); - designDrawings.DesignDrawingsContent = this.txtDesignDrawingsContent.Text.Trim(); - designDrawings.Edition = this.txtEdition.Text.Trim(); - designDrawings.PageNumber = Funs.GetNewInt(this.txtPageNumber.Text.Trim()); - designDrawings.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text); - designDrawings.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); - designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim(); - designDrawings.Remark = this.txtRemark.Text.Trim(); - designDrawings.CompileMan = this.CurrUser.UserId; - designDrawings.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - designDrawings.AuditMan = drpAudit.SelectedValue; - } //审核人 - 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(",")); - } - designDrawings.UnitWorkId = ids; + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_DesignDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.DesignDrawingsId != this.DesignDrawingsId || (this.DesignDrawingsId == null && x.DesignDrawingsId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_DesignDrawings designDrawings = new Model.Comprehensive_DesignDrawings(); + // designDrawings.ProjectId = this.CurrUser.LoginProjectId; + // designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // designDrawings.DesignDrawingsCode = this.txtDesignDrawingsCode.Text.Trim(); + // designDrawings.DesignDrawingsContent = this.txtDesignDrawingsContent.Text.Trim(); + // designDrawings.Edition = this.txtEdition.Text.Trim(); + // designDrawings.PageNumber = Funs.GetNewInt(this.txtPageNumber.Text.Trim()); + // designDrawings.ReceiveDate = Funs.GetNewDateTime(this.txtReceiveDate.Text); + // designDrawings.SendDate = Funs.GetNewDateTime(this.txtSendDate.Text); + // designDrawings.ReceiveMan = this.txtReceiveMan.Text.Trim(); + // designDrawings.Remark = this.txtRemark.Text.Trim(); + // designDrawings.CompileMan = this.CurrUser.UserId; + // designDrawings.RemarkCode =Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // designDrawings.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // 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(",")); + // } + // designDrawings.UnitWorkId = ids; - string unitIds = string.Empty; - var unitLists = this.drpUnitIds.SelectedValueArray; - foreach (var item in unitLists) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); - } - designDrawings.ReceiveUnits = unitIds; - if (!string.IsNullOrEmpty(this.DesignDrawingsId)) - { - designDrawings.DesignDrawingsId = this.DesignDrawingsId; - //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); - var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault(); - if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - designDrawings.CompileMan = this.CurrUser.UserId; - designDrawings.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); - } - else - { - designDrawings.CompileMan = oldDesignDrawings.CompileMan; - if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - designDrawings.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - designDrawings.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - designDrawings.Status = BLL.Const.Comprehensive_Complete; - } - else - { - designDrawings.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // string unitIds = string.Empty; + // var unitLists = this.drpUnitIds.SelectedValueArray; + // foreach (var item in unitLists) + // { + // unitIds += item + ","; + // } + // if (!string.IsNullOrEmpty(unitIds)) + // { + // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + // } + // designDrawings.ReceiveUnits = unitIds; + // if (!string.IsNullOrEmpty(this.DesignDrawingsId)) + // { + // designDrawings.DesignDrawingsId = this.DesignDrawingsId; + // //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); + // var oldDesignDrawings = Funs.DB.Comprehensive_DesignDrawings.Where(u => u.DesignDrawingsId == this.DesignDrawingsId).FirstOrDefault(); + // if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // designDrawings.CompileMan = this.CurrUser.UserId; + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); + // } + // else + // { + // designDrawings.CompileMan = oldDesignDrawings.CompileMan; + // if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // designDrawings.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // designDrawings.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); + // BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); - } - } - else - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - designDrawings.DesignDrawingsId = this.hdAttachUrl.Text; - } - else - { - designDrawings.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); - this.hdAttachUrl.Text = designDrawings.DesignDrawingsId; - } + // } + // } + // else + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // designDrawings.DesignDrawingsId = this.hdAttachUrl.Text; + // } + // else + // { + // designDrawings.DesignDrawingsId = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); + // this.hdAttachUrl.Text = designDrawings.DesignDrawingsId; + // } - designDrawings.Status = BLL.Const.Comprehensive_Audit; - BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); - } + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // BLL.DesignDrawingsService.AddDesignDrawings(designDrawings); + // } - #region 审核记录 + // #region 审核记录 - var currApprove =DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_DesignDrawingsApprove(); - approve.DesignDrawingsId = designDrawings.DesignDrawingsId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - DesignDrawingsApproveService.EditApprove(approve); //新增编制记录 + // var currApprove =DesignDrawingsApproveService.GetCurrentApprove(designDrawings.DesignDrawingsId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_DesignDrawingsApprove(); + // approve.DesignDrawingsId = designDrawings.DesignDrawingsId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // DesignDrawingsApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); - newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); - newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - DesignDrawingsApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // newApprove.DesignDrawingsId = designDrawings.DesignDrawingsId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // DesignDrawingsApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); - reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; - DesignDrawingsApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); - reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; - reApprove.ApproveMan = designDrawings.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - DesignDrawingsApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // // reApprove.ApproveIdea = txtidea.Text; + // DesignDrawingsApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + // reApprove.ApproveMan = designDrawings.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // DesignDrawingsApproveService.EditApprove(reApprove); + // } + // } + // } - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - #endregion + // #endregion - } + //} /// /// 保存方法 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.designer.cs index 0f444405..d17141d8 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.designer.cs @@ -7,13 +7,11 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.CQMS.Comprehensive -{ - - - public partial class DesignDrawingsEdit - { - +namespace FineUIPro.Web.CQMS.Comprehensive { + + + public partial class DesignDrawingsEdit { + /// /// form1 控件。 /// @@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + /// /// drpCNProfessionalId 控件。 /// @@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpCNProfessionalId; - + /// /// drpUnitWorkIds 控件。 /// @@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitWorkIds; - + /// /// txtDesignDrawingsCode 控件。 /// @@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtDesignDrawingsCode; - + /// /// txtEdition 控件。 /// @@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtEdition; - + /// /// txtDesignDrawingsContent 控件。 /// @@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDesignDrawingsContent; - + /// /// txtRemarkCode 控件。 /// @@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtRemarkCode; - + /// /// txtPageNumber 控件。 /// @@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.NumberBox txtPageNumber; - + /// /// txtReceiveDate 控件。 /// @@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtReceiveDate; - + /// /// txtSendDate 控件。 /// @@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtSendDate; - + /// /// drpUnitIds 控件。 /// @@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitIds; - + /// /// txtReceiveMan 控件。 /// @@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtReceiveMan; - + /// /// txtRemark 控件。 /// @@ -148,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Panel2 控件。 /// @@ -157,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// Label1 控件。 /// @@ -166,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// btnAttach 控件。 /// @@ -175,52 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAttach; - - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - + /// /// Toolbar1 控件。 /// @@ -229,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// hdAttachUrl 控件。 /// @@ -238,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdAttachUrl; - + /// /// btnSave 控件。 /// @@ -247,16 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx index 93cbcdde..009f38c2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx @@ -92,14 +92,14 @@ HeaderTextAlign="Center" Width="120px"> - + <%-- + Text="审批列表" ToolTip="审批列表" DataIFrameUrlFields="InspectionEquipmentId" DataIFrameUrlFormatString="./InspectionEquipmentApprove.aspx?InspectionEquipmentId={0}" />--%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs index 27b36933..47074cb2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipment.aspx.designer.cs @@ -147,15 +147,6 @@ namespace FineUIPro.Web.Comprehensive { /// protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx index 2e9ef024..71938b0b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx @@ -85,7 +85,7 @@ - + <%-- @@ -109,7 +109,7 @@ - + --%> @@ -121,8 +121,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index f5199e0c..d0112b53 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -39,9 +39,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitId.SelectedValue = CurrUser.UnitId; BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.InspectionEquipmentService.InitAttributeDropDownList(this.drpAttribute, true); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.InspectionEquipmentId = Request.Params["InspectionEquipmentId"]; var inspectionEquipment = BLL.InspectionEquipmentService.GetInspectionEquipmentById(this.InspectionEquipmentId); if (inspectionEquipment != null) @@ -85,48 +85,48 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemarkCode.Text = inspectionEquipment.RemarkCode.HasValue ? inspectionEquipment.RemarkCode.ToString() : ""; this.txtEquipmentNo.Text = inspectionEquipment.EquipmentNO; this.txtUsedPlace.Text = inspectionEquipment.UsedPlace; - var currApprove = InspectionEquipmentApproveService.GetCurrentApprove(inspectionEquipment.InspectionEquipmentId); - if(currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionEquipment.CompileMan == CurrUser.UserId) - { - this.btnSubmit.Hidden = false; - this.btnSave.Hidden = false; - }//审核状态 审核人 可以显示 提交 保存按钮 - else if (currApprove.ApproveType== BLL.Const.Comprehensive_Audit&&currApprove.ApproveMan== CurrUser.UserId) - { - //审核状态不可编辑 - this.txtInspectionName.Readonly = true; - this.drpUnitId.Readonly = true; - this.drpCNProfessionalId.Readonly = true; - this.txtSpecifications.Readonly = true; - this.txtSupplier.Readonly = true; - this.drpAttribute.Readonly = true; - this.drpSamplingResult.Readonly = true; - this.txtInspectionDate.Readonly = true; - this.txtRemarkCode.Readonly = true; - this.txtEquipmentNo.Readonly = true; - this.txtUsedPlace.Readonly = true; - this.drpAudit.Readonly = true; - this.txtSamplingCount.Readonly = true; - this.txtCounts.Readonly = true; + //var currApprove = InspectionEquipmentApproveService.GetCurrentApprove(inspectionEquipment.InspectionEquipmentId); + //if(currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionEquipment.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // }//审核状态 审核人 可以显示 提交 保存按钮 + // else if (currApprove.ApproveType== BLL.Const.Comprehensive_Audit&&currApprove.ApproveMan== CurrUser.UserId) + // { + // //审核状态不可编辑 + // this.txtInspectionName.Readonly = true; + // this.drpUnitId.Readonly = true; + // this.drpCNProfessionalId.Readonly = true; + // this.txtSpecifications.Readonly = true; + // this.txtSupplier.Readonly = true; + // this.drpAttribute.Readonly = true; + // this.drpSamplingResult.Readonly = true; + // this.txtInspectionDate.Readonly = true; + // this.txtRemarkCode.Readonly = true; + // this.txtEquipmentNo.Readonly = true; + // this.txtUsedPlace.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.btnSave.Hidden = false; - } - }//没有当前审核人，已完成状态 或者 待提交状态 - else - { - if(inspectionEquipment.Status == BLL.Const.Comprehensive_Compile && inspectionEquipment.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(inspectionEquipment.Status == BLL.Const.Comprehensive_Compile && inspectionEquipment.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} //var res = InspectionEquipmentApproveService.GetState(inspectionEquipment.InspectionEquipmentId); //if (inspectionEquipment.CompileMan != CurrUser.UserId) //不是创建用户禁止编辑 @@ -178,7 +178,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; } } } @@ -199,7 +199,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; @@ -210,23 +210,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 @@ -268,10 +268,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim(); newInspectionEquipment.EquipmentOrMatail = drpEquipmentOrMatail.SelectedValue; - 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) { @@ -322,176 +322,176 @@ 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; + // } - var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null))); - if (q != 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 = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); - newInspectionEquipment.Unit = this.txtUnit.Text.Trim(); - newInspectionEquipment.SamplingCount = this.txtSamplingCount.Text.Trim(); - newInspectionEquipment.UsedPlace = this.txtUsedPlace.Text.Trim(); + // var q = Funs.DB.Comprehensive_InspectionEquipment.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.InspectionEquipmentId != this.InspectionEquipmentId || (this.InspectionEquipmentId == null && x.InspectionEquipmentId != null))); + // if (q != 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 = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // newInspectionEquipment.Counts = this.txtCounts.Text.Trim(); + // newInspectionEquipment.Unit = this.txtUnit.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)); - BLL.InspectionEquipmentService.AddInspectionEquipment(newInspectionEquipment); - } - else - { - 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 + // { + // 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 附件上传 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs index 3ca02d7a..1ed92154 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.designer.cs @@ -210,51 +210,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -282,15 +237,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx index 2d23213c..ce362a07 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx @@ -97,13 +97,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx index 03eb4f74..c5cee44c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx @@ -92,7 +92,7 @@ - + <%-- @@ -117,7 +117,7 @@ - + --%> @@ -128,8 +128,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index a30b51b8..95e31fa7 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -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 /// /// 加载专业工程师 /// - 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 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs index b118bc06..657a6632 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs @@ -201,51 +201,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.NumberBox txtRemarkCode; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -273,15 +228,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx index 5117c16f..b19be888 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPerson.aspx @@ -93,13 +93,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label2; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx index 26ea9876..baa8e1b1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx @@ -93,7 +93,7 @@ - + <%-- @@ -118,7 +118,7 @@ - + --%> @@ -129,8 +129,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index 45a6ea71..a3e15e81 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -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 /// /// 加载专业工程师 /// - 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 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs index 2a6a02b2..deff9664 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs @@ -210,51 +210,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.TextBox txtRemark; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -282,15 +237,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx index bc2bd4f6..5bd16ac2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagement.aspx @@ -90,13 +90,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label3; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx index 37bfe503..154872d5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx @@ -94,7 +94,7 @@ - + <%-- @@ -119,7 +119,7 @@ - + --%> @@ -130,8 +130,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 8e70cfe5..9a25881e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -39,9 +39,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.InitUnitDownList(this.drpUnitIds, this.CurrUser.LoginProjectId, false); BLL.UnitService.InitAllUnitDownList(this.drpSendUnit, this.CurrUser.LoginProjectId, 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.NCRManagementId = Request.Params["NCRManagementId"]; Model.Comprehensive_NCRManagement nCRManagement = BLL.NCRManagementService.GetNCRManagementById(this.NCRManagementId); @@ -90,35 +90,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive //this.txtImplementationFrontState.Text = nCRManagement.ImplementationFrontState; this.ddlImplementationFrontState.SelectedValue = nCRManagement.ImplementationFrontState; - var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && nCRManagement.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 = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && nCRManagement.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 (nCRManagement.Status == BLL.Const.Comprehensive_Compile && nCRManagement.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 (nCRManagement.Status == BLL.Const.Comprehensive_Compile && nCRManagement.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } @@ -128,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtClosedDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtCompleteDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -150,7 +150,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpSendUnit.Readonly = true; this.drpUnitIds.Readonly = true; this.drpUnitWorkIds.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.ddlProblem.Readonly = true; //this.btnAttach.Enabled = false; this.txtRemarkCode.Readonly = true; @@ -158,26 +158,26 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - /// - /// 加载专业工程师 - /// - 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 @@ -209,10 +209,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Model.Comprehensive_NCRManagement nCRManagement = new Model.Comprehensive_NCRManagement(); nCRManagement.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - nCRManagement.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // nCRManagement.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (this.drpSendUnit.SelectedValue != BLL.Const._Null) { nCRManagement.SendUnit = this.drpSendUnit.SelectedValue; @@ -315,221 +315,221 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (this.drpSendUnit.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择发出单位！", MessageBoxIcon.Warning); - return; - } - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_NCRManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.NCRManagementId != this.NCRManagementId || (this.NCRManagementId == null && x.NCRManagementId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_NCRManagement nCRManagement = new Model.Comprehensive_NCRManagement(); - nCRManagement.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - nCRManagement.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (this.drpSendUnit.SelectedValue != BLL.Const._Null) - { - nCRManagement.SendUnit = this.drpSendUnit.SelectedValue; - } - if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) - { - nCRManagement.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - } - nCRManagement.NCRCode = this.txtNCRCode.Text.Trim(); - nCRManagement.Contents = this.txtContents.Text.Trim(); - #region 新增2024-03-29 - if (!string.IsNullOrEmpty(this.ddlProblem.SelectedValue)) - { - nCRManagement.Problem = this.ddlProblem.SelectedValue; - } - nCRManagement.Measure = this.txtMeasure.Text.Trim(); - #endregion + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (this.drpSendUnit.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择发出单位！", MessageBoxIcon.Warning); + // return; + // } + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_NCRManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.NCRManagementId != this.NCRManagementId || (this.NCRManagementId == null && x.NCRManagementId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_NCRManagement nCRManagement = new Model.Comprehensive_NCRManagement(); + // nCRManagement.ProjectId = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // nCRManagement.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (this.drpSendUnit.SelectedValue != BLL.Const._Null) + // { + // nCRManagement.SendUnit = this.drpSendUnit.SelectedValue; + // } + // if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + // { + // nCRManagement.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // } + // nCRManagement.NCRCode = this.txtNCRCode.Text.Trim(); + // nCRManagement.Contents = this.txtContents.Text.Trim(); + // #region 新增2024-03-29 + // if (!string.IsNullOrEmpty(this.ddlProblem.SelectedValue)) + // { + // nCRManagement.Problem = this.ddlProblem.SelectedValue; + // } + // nCRManagement.Measure = this.txtMeasure.Text.Trim(); + // #endregion - if (!string.IsNullOrEmpty(this.txtIssuedDate.Text)) - { - nCRManagement.IssuedDate = Convert.ToDateTime(this.txtIssuedDate.Text); - } + // if (!string.IsNullOrEmpty(this.txtIssuedDate.Text)) + // { + // nCRManagement.IssuedDate = Convert.ToDateTime(this.txtIssuedDate.Text); + // } - if (!string.IsNullOrEmpty(this.txtClosedDate.Text)) - { - nCRManagement.ClosedDate = Convert.ToDateTime(this.txtClosedDate.Text); - } - if (!string.IsNullOrEmpty(this.txtCompleteDate.Text)) - { - nCRManagement.CompleteDate = Convert.ToDateTime(this.txtCompleteDate.Text); - } - nCRManagement.ResponsibleMan = this.txtResponsibleMan.Text.Trim(); - nCRManagement.ImplementationFrontState = this.ddlImplementationFrontState.SelectedValue.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(",")); - } - nCRManagement.UnitWorkId = ids; + // if (!string.IsNullOrEmpty(this.txtClosedDate.Text)) + // { + // nCRManagement.ClosedDate = Convert.ToDateTime(this.txtClosedDate.Text); + // } + // if (!string.IsNullOrEmpty(this.txtCompleteDate.Text)) + // { + // nCRManagement.CompleteDate = Convert.ToDateTime(this.txtCompleteDate.Text); + // } + // nCRManagement.ResponsibleMan = this.txtResponsibleMan.Text.Trim(); + // nCRManagement.ImplementationFrontState = this.ddlImplementationFrontState.SelectedValue.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(",")); + // } + // nCRManagement.UnitWorkId = ids; - string unitIds = string.Empty; - var unitList = this.drpUnitIds.SelectedValueArray; - foreach (var item in unitList) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); - } - nCRManagement.ReceiveUnit = unitIds; - nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.NCRManagementId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - nCRManagement.NCRManagementId = this.hdAttachUrl.Text; - } - else - { - nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); - this.hdAttachUrl.Text = nCRManagement.NCRManagementId; - } - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - // return; - //} - nCRManagement.CompileMan = this.CurrUser.UserId; - nCRManagement.Status = BLL.Const.Comprehensive_Audit; - BLL.NCRManagementService.AddNCRManagement(nCRManagement); - } - else - { - nCRManagement.NCRManagementId = this.NCRManagementId; - //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); - //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) - //{ - // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); - // return; - //} - //BLL.NCRManagementService.UpdateNCRManagement(nCRManagement); - var oldNCRManagement = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); - if (oldNCRManagement == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - nCRManagement.CompileMan = this.CurrUser.UserId; - nCRManagement.Status = BLL.Const.Comprehensive_Audit; - BLL.NCRManagementService.AddNCRManagement(nCRManagement); - } - else - { - nCRManagement.CompileMan = oldNCRManagement.CompileMan; - if (oldNCRManagement.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - nCRManagement.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldNCRManagement.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - nCRManagement.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - nCRManagement.Status = BLL.Const.Comprehensive_Complete; - } - else - { - nCRManagement.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // string unitIds = string.Empty; + // var unitList = this.drpUnitIds.SelectedValueArray; + // foreach (var item in unitList) + // { + // unitIds += item + ","; + // } + // if (!string.IsNullOrEmpty(unitIds)) + // { + // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + // } + // nCRManagement.ReceiveUnit = unitIds; + // nCRManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.NCRManagementId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // nCRManagement.NCRManagementId = this.hdAttachUrl.Text; + // } + // else + // { + // nCRManagement.NCRManagementId = SQLHelper.GetNewID(typeof(Model.Comprehensive_NCRManagement)); + // this.hdAttachUrl.Text = nCRManagement.NCRManagementId; + // } + // //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == nCRManagement.NCRManagementId); + // //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + // //{ + // // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // // return; + // //} + // nCRManagement.CompileMan = this.CurrUser.UserId; + // nCRManagement.Status = BLL.Const.Comprehensive_Audit; + // BLL.NCRManagementService.AddNCRManagement(nCRManagement); + // } + // else + // { + // nCRManagement.NCRManagementId = this.NCRManagementId; + // //var sour = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == this.NCRManagementId); + // //if (sour == null || string.IsNullOrEmpty(sour.AttachUrl)) + // //{ + // // Alert.ShowInTop("请上传附件！", MessageBoxIcon.Warning); + // // return; + // //} + // //BLL.NCRManagementService.UpdateNCRManagement(nCRManagement); + // var oldNCRManagement = Funs.DB.Comprehensive_NCRManagement.Where(u => u.NCRManagementId == this.NCRManagementId).FirstOrDefault(); + // if (oldNCRManagement == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // nCRManagement.CompileMan = this.CurrUser.UserId; + // nCRManagement.Status = BLL.Const.Comprehensive_Audit; + // BLL.NCRManagementService.AddNCRManagement(nCRManagement); + // } + // else + // { + // nCRManagement.CompileMan = oldNCRManagement.CompileMan; + // if (oldNCRManagement.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // nCRManagement.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldNCRManagement.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // nCRManagement.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // nCRManagement.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // nCRManagement.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.NCRManagementService.UpdateNCRManagement(nCRManagement); + // BLL.NCRManagementService.UpdateNCRManagement(nCRManagement); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_NCRManagementApprove(); - approve.NCRManagementId = nCRManagement.NCRManagementId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - NCRManagementApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = NCRManagementApproveService.GetCurrentApprove(nCRManagement.NCRManagementId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_NCRManagementApprove(); + // approve.NCRManagementId = nCRManagement.NCRManagementId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // NCRManagementApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_NCRManagementApprove newApprove = new Model.Comprehensive_NCRManagementApprove(); - newApprove.NCRManagementId = nCRManagement.NCRManagementId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - NCRManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_NCRManagementApprove newApprove = new Model.Comprehensive_NCRManagementApprove(); + // newApprove.NCRManagementId = nCRManagement.NCRManagementId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // NCRManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - NCRManagementApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_NCRManagementApprove newApprove = new Model.Comprehensive_NCRManagementApprove(); - newApprove.NCRManagementId = nCRManagement.NCRManagementId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - NCRManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - NCRManagementApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // NCRManagementApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_NCRManagementApprove newApprove = new Model.Comprehensive_NCRManagementApprove(); + // newApprove.NCRManagementId = nCRManagement.NCRManagementId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // NCRManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // NCRManagementApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_NCRManagementApprove reApprove = new Model.Comprehensive_NCRManagementApprove(); - reApprove.NCRManagementId = currApprove.NCRManagementId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; - NCRManagementApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_NCRManagementApprove reApprove = new Model.Comprehensive_NCRManagementApprove(); - reApprove.NCRManagementId = currApprove.NCRManagementId; - reApprove.ApproveMan = nCRManagement.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - NCRManagementApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_NCRManagementApprove reApprove = new Model.Comprehensive_NCRManagementApprove(); + // reApprove.NCRManagementId = currApprove.NCRManagementId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // // reApprove.ApproveIdea = txtidea.Text; + // NCRManagementApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_NCRManagementApprove reApprove = new Model.Comprehensive_NCRManagementApprove(); + // reApprove.NCRManagementId = currApprove.NCRManagementId; + // reApprove.ApproveMan = nCRManagement.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // NCRManagementApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion #region 附件上传 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs index 90068363..ceac159c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.designer.cs @@ -192,51 +192,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -264,15 +219,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx index 40e52253..98af5de4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipe.aspx @@ -66,13 +66,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx index 77f76bed..bc2b5777 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx @@ -60,16 +60,17 @@ - - + <%-- + --%> + LabelAlign="Right" LabelWidth="150px"> + - + <%-- @@ -85,7 +86,7 @@ - + --%> @@ -96,8 +97,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index 6d75c0fe..79f25fb4 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -36,12 +36,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive { GetButtonPower(); BLL.UnitService.InitUnitDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.PressurePipeId = Request.Params["PressurePipeId"]; Model.Comprehensive_PressurePipe pressurePipe = BLL.PressurePipeService.GetPressurePipeById(this.PressurePipeId); if (pressurePipe != null) @@ -64,35 +64,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", pressurePipe.ReportTime); } this.txtRemarkCode.Text = pressurePipe.RemarkCode.HasValue ? pressurePipe.RemarkCode.ToString() : ""; - var currApprove = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && pressurePipe.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 = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && pressurePipe.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 (pressurePipe.Status == BLL.Const.Comprehensive_Compile && pressurePipe.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 (pressurePipe.Status == BLL.Const.Comprehensive_Compile && pressurePipe.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } @@ -100,7 +100,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -121,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtReportTime.Readonly = true; this.txtRemarkCode.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; //this.btnAttach.Enabled = false; @@ -131,23 +131,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 @@ -173,10 +173,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive Model.Comprehensive_PressurePipe pressurePipe = new Model.Comprehensive_PressurePipe(); pressurePipe.Projctid = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - pressurePipe.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // pressurePipe.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (!string.IsNullOrEmpty(this.txtEstimateNumber.Text)) { pressurePipe.EstimateNumber = Convert.ToInt32(this.txtEstimateNumber.Text); @@ -243,183 +243,183 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpUnit.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_PressurePipe.FirstOrDefault(x => x.Projctid == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.PressurePipeId != this.PressurePipeId || (this.PressurePipeId == null && x.PressurePipeId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_PressurePipe pressurePipe = new Model.Comprehensive_PressurePipe(); - pressurePipe.Projctid = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - pressurePipe.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (!string.IsNullOrEmpty(this.txtEstimateNumber.Text)) - { - pressurePipe.EstimateNumber = Convert.ToInt32(this.txtEstimateNumber.Text); - } - if (this.drpUnit.SelectedValue != BLL.Const._Null) - { - pressurePipe.UnitId = this.drpUnit.SelectedValue; - } - if (!string.IsNullOrEmpty(this.txtActualNumber.Text)) - { - pressurePipe.ActualNumber = Convert.ToInt32(this.txtActualNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtPackageNumber.Text)) - { - pressurePipe.PackageNumber = Convert.ToInt32(this.txtPackageNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtCompletePackageNumber.Text)) - { - pressurePipe.CompletePackageNumber = Convert.ToInt32(this.txtCompletePackageNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtPressurePipeNumber.Text)) - { - pressurePipe.PressurePipeNumber = Convert.ToInt32(this.txtPressurePipeNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtIssuedReportNumber.Text)) - { - pressurePipe.IssuedReportNumber = Convert.ToInt32(this.txtIssuedReportNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtReportTime.Text)) - { - pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); - } - pressurePipe.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.PressurePipeId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - pressurePipe.PressurePipeId = this.hdAttachUrl.Text; - } - else - { - pressurePipe.PressurePipeId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe)); - this.hdAttachUrl.Text = pressurePipe.PressurePipeId; - } - pressurePipe.CompileMan = this.CurrUser.UserId; - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - BLL.PressurePipeService.AddPressurePipe(pressurePipe); - } - else - { - pressurePipe.PressurePipeId = this.PressurePipeId; - // BLL.PressurePipeService.UpdatePressurePipe(pressurePipe); - var oldPressurePipe = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault(); - if (oldPressurePipe == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - pressurePipe.CompileMan = this.CurrUser.UserId; - //pressurePipe.CompileDate = DateTime.Now; - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - BLL.PressurePipeService.AddPressurePipe(pressurePipe); - } - else - { - pressurePipe.CompileMan = oldPressurePipe.CompileMan; - //pressurePipe.CompileDate = oldPressurePipe.CompileDate; - if (oldPressurePipe.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldPressurePipe.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - pressurePipe.Status = BLL.Const.Comprehensive_Complete; - } - else - { - pressurePipe.Status = BLL.Const.Comprehensive_ReCompile; - } - } + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpUnit.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_PressurePipe.FirstOrDefault(x => x.Projctid == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.PressurePipeId != this.PressurePipeId || (this.PressurePipeId == null && x.PressurePipeId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_PressurePipe pressurePipe = new Model.Comprehensive_PressurePipe(); + // pressurePipe.Projctid = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // pressurePipe.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (!string.IsNullOrEmpty(this.txtEstimateNumber.Text)) + // { + // pressurePipe.EstimateNumber = Convert.ToInt32(this.txtEstimateNumber.Text); + // } + // if (this.drpUnit.SelectedValue != BLL.Const._Null) + // { + // pressurePipe.UnitId = this.drpUnit.SelectedValue; + // } + // if (!string.IsNullOrEmpty(this.txtActualNumber.Text)) + // { + // pressurePipe.ActualNumber = Convert.ToInt32(this.txtActualNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtPackageNumber.Text)) + // { + // pressurePipe.PackageNumber = Convert.ToInt32(this.txtPackageNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtCompletePackageNumber.Text)) + // { + // pressurePipe.CompletePackageNumber = Convert.ToInt32(this.txtCompletePackageNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtPressurePipeNumber.Text)) + // { + // pressurePipe.PressurePipeNumber = Convert.ToInt32(this.txtPressurePipeNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtIssuedReportNumber.Text)) + // { + // pressurePipe.IssuedReportNumber = Convert.ToInt32(this.txtIssuedReportNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + // { + // pressurePipe.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + // } + // pressurePipe.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.PressurePipeId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // pressurePipe.PressurePipeId = this.hdAttachUrl.Text; + // } + // else + // { + // pressurePipe.PressurePipeId = SQLHelper.GetNewID(typeof(Model.Comprehensive_PressurePipe)); + // this.hdAttachUrl.Text = pressurePipe.PressurePipeId; + // } + // pressurePipe.CompileMan = this.CurrUser.UserId; + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // BLL.PressurePipeService.AddPressurePipe(pressurePipe); + // } + // else + // { + // pressurePipe.PressurePipeId = this.PressurePipeId; + // // BLL.PressurePipeService.UpdatePressurePipe(pressurePipe); + // var oldPressurePipe = Funs.DB.Comprehensive_PressurePipe.Where(u => u.PressurePipeId == this.PressurePipeId).FirstOrDefault(); + // if (oldPressurePipe == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // pressurePipe.CompileMan = this.CurrUser.UserId; + // //pressurePipe.CompileDate = DateTime.Now; + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // BLL.PressurePipeService.AddPressurePipe(pressurePipe); + // } + // else + // { + // pressurePipe.CompileMan = oldPressurePipe.CompileMan; + // //pressurePipe.CompileDate = oldPressurePipe.CompileDate; + // if (oldPressurePipe.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldPressurePipe.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // pressurePipe.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.PressurePipeService.UpdatePressurePipe(pressurePipe); + // BLL.PressurePipeService.UpdatePressurePipe(pressurePipe); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_PressurePipeApprove(); - approve.PressurePipeId = pressurePipe.PressurePipeId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - PressurePipeApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = PressurePipeApproveService.GetCurrentApprove(pressurePipe.PressurePipeId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_PressurePipeApprove(); + // approve.PressurePipeId = pressurePipe.PressurePipeId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // PressurePipeApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_PressurePipeApprove newApprove = new Model.Comprehensive_PressurePipeApprove(); - newApprove.PressurePipeId = pressurePipe.PressurePipeId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - PressurePipeApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_PressurePipeApprove newApprove = new Model.Comprehensive_PressurePipeApprove(); + // newApprove.PressurePipeId = pressurePipe.PressurePipeId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // PressurePipeApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - PressurePipeApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_PressurePipeApprove newApprove = new Model.Comprehensive_PressurePipeApprove(); - newApprove.PressurePipeId = pressurePipe.PressurePipeId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - PressurePipeApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - PressurePipeApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // PressurePipeApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_PressurePipeApprove newApprove = new Model.Comprehensive_PressurePipeApprove(); + // newApprove.PressurePipeId = pressurePipe.PressurePipeId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // PressurePipeApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // PressurePipeApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_PressurePipeApprove reApprove = new Model.Comprehensive_PressurePipeApprove(); - reApprove.PressurePipeId = currApprove.PressurePipeId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; - PressurePipeApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_PressurePipeApprove reApprove = new Model.Comprehensive_PressurePipeApprove(); - reApprove.PressurePipeId = currApprove.PressurePipeId; - reApprove.ApproveMan = pressurePipe.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - PressurePipeApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_PressurePipeApprove reApprove = new Model.Comprehensive_PressurePipeApprove(); + // reApprove.PressurePipeId = currApprove.PressurePipeId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // // reApprove.ApproveIdea = txtidea.Text; + // PressurePipeApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_PressurePipeApprove reApprove = new Model.Comprehensive_PressurePipeApprove(); + // reApprove.PressurePipeId = currApprove.PressurePipeId; + // reApprove.ApproveMan = pressurePipe.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // PressurePipeApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs index 4d4422cf..6c58ac27 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.designer.cs @@ -138,15 +138,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - /// /// txtReportTime 控件。 /// @@ -157,40 +148,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive { protected global::FineUIPro.DatePicker txtReportTime; /// - /// agree 控件。 + /// Label2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; + protected global::FineUIPro.Label Label2; /// /// Toolbar1 控件。 @@ -219,15 +183,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx index 8ad01d7e..172f45d0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccident.aspx @@ -66,13 +66,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label2; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx index b8b6fcfd..1f24e33c 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx @@ -64,7 +64,7 @@ - + <%-- @@ -88,7 +88,7 @@ - + --%> @@ -104,8 +104,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index 350d6554..8002811e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -37,11 +37,11 @@ namespace FineUIPro.Web.CQMS.Comprehensive GetButtonPower(); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, false); BLL.UnitService.InitUnitDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.QualityAccidentId = Request.Params["QualityAccidentId"]; Model.Comprehensive_QualityAccident pressurePipe = BLL.QualityAccidentService.GetQualityAccidentById(this.QualityAccidentId); @@ -61,42 +61,42 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitWorkId.SelectedValueArray = pressurePipe.UnitWorkId.Split(','); } this.txtRemarkCode.Text = pressurePipe.RemarkCode.HasValue ? pressurePipe.RemarkCode.ToString() : ""; - var currApprove = QualityAccidentApproveService.GetCurrentApprove(pressurePipe.QualityAccidentId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && pressurePipe.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 = QualityAccidentApproveService.GetCurrentApprove(pressurePipe.QualityAccidentId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && pressurePipe.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 (pressurePipe.Status == BLL.Const.Comprehensive_Compile && pressurePipe.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 (pressurePipe.Status == BLL.Const.Comprehensive_Compile && pressurePipe.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } else { this.txtTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -114,7 +114,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtTime.Readonly = true; this.drpUnit.Readonly = true; this.drpUnitWorkId.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; @@ -123,23 +123,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 #region 保存 @@ -160,10 +160,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Model.Comprehensive_QualityAccident pressurePipe = new Model.Comprehensive_QualityAccident(); pressurePipe.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - pressurePipe.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // pressurePipe.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (!string.IsNullOrEmpty(this.txtTime.Text)) { pressurePipe.Time = Convert.ToDateTime(this.txtTime.Text); @@ -228,180 +228,180 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpUnit.SelectedValue != BLL.Const._Null) - { - var q = Funs.DB.Comprehensive_QualityAccident.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.QualityAccidentId != this.QualityAccidentId || (this.QualityAccidentId == null && x.QualityAccidentId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_QualityAccident pressurePipe = new Model.Comprehensive_QualityAccident(); - pressurePipe.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - pressurePipe.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (!string.IsNullOrEmpty(this.txtTime.Text)) - { - pressurePipe.Time = Convert.ToDateTime(this.txtTime.Text); - } - else - { - pressurePipe.Time = DateTime.Now; - } - pressurePipe.Place = this.txtPlace.Text; - pressurePipe.DirectEconomicLoss = this.txtDirectEconomicLoss.Text; - pressurePipe.RemedialMeasures = this.txtRemedialMeasures.Text; - pressurePipe.ResponsibilityDetermination = this.txtResponsibilityDetermination.Text; - pressurePipe.CorrectiveActions = this.txtCorrectiveActions.Text; - pressurePipe.UnitId = this.drpUnit.SelectedValue; - string ids = string.Empty; - var lists = this.drpUnitWorkId.SelectedValueArray; - foreach (var item in lists) - { - ids += item + ","; - } - if (!string.IsNullOrEmpty(ids)) - { - ids = ids.Substring(0, ids.LastIndexOf(",")); - } - pressurePipe.UnitWorkId = ids; - pressurePipe.RemarkCode =Funs.GetNewInt( this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.QualityAccidentId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - pressurePipe.QualityAccidentId = this.hdAttachUrl.Text; - } - else - { - pressurePipe.QualityAccidentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident)); - this.hdAttachUrl.Text = pressurePipe.QualityAccidentId; - } - pressurePipe.CompileMan = this.CurrUser.UserId; - pressurePipe.CompileDate = DateTime.Now; - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - BLL.QualityAccidentService.AddQualityAccident(pressurePipe); - } - else - { - pressurePipe.QualityAccidentId = this.QualityAccidentId; - // BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe); + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpUnit.SelectedValue != BLL.Const._Null) + // { + // var q = Funs.DB.Comprehensive_QualityAccident.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.QualityAccidentId != this.QualityAccidentId || (this.QualityAccidentId == null && x.QualityAccidentId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_QualityAccident pressurePipe = new Model.Comprehensive_QualityAccident(); + // pressurePipe.ProjectId = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // pressurePipe.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (!string.IsNullOrEmpty(this.txtTime.Text)) + // { + // pressurePipe.Time = Convert.ToDateTime(this.txtTime.Text); + // } + // else + // { + // pressurePipe.Time = DateTime.Now; + // } + // pressurePipe.Place = this.txtPlace.Text; + // pressurePipe.DirectEconomicLoss = this.txtDirectEconomicLoss.Text; + // pressurePipe.RemedialMeasures = this.txtRemedialMeasures.Text; + // pressurePipe.ResponsibilityDetermination = this.txtResponsibilityDetermination.Text; + // pressurePipe.CorrectiveActions = this.txtCorrectiveActions.Text; + // pressurePipe.UnitId = this.drpUnit.SelectedValue; + // string ids = string.Empty; + // var lists = this.drpUnitWorkId.SelectedValueArray; + // foreach (var item in lists) + // { + // ids += item + ","; + // } + // if (!string.IsNullOrEmpty(ids)) + // { + // ids = ids.Substring(0, ids.LastIndexOf(",")); + // } + // pressurePipe.UnitWorkId = ids; + // pressurePipe.RemarkCode =Funs.GetNewInt( this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.QualityAccidentId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // pressurePipe.QualityAccidentId = this.hdAttachUrl.Text; + // } + // else + // { + // pressurePipe.QualityAccidentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_QualityAccident)); + // this.hdAttachUrl.Text = pressurePipe.QualityAccidentId; + // } + // pressurePipe.CompileMan = this.CurrUser.UserId; + // pressurePipe.CompileDate = DateTime.Now; + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // BLL.QualityAccidentService.AddQualityAccident(pressurePipe); + // } + // else + // { + // pressurePipe.QualityAccidentId = this.QualityAccidentId; + // // BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe); - var oldQualityAccident = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault(); - if (oldQualityAccident == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - pressurePipe.CompileMan = this.CurrUser.UserId; - pressurePipe.CompileDate = DateTime.Now; - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - BLL.QualityAccidentService.AddQualityAccident(pressurePipe); - } - else - { - pressurePipe.CompileMan = oldQualityAccident.CompileMan; - pressurePipe.CompileDate = oldQualityAccident.CompileDate; - if (oldQualityAccident.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldQualityAccident.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - pressurePipe.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - pressurePipe.Status = BLL.Const.Comprehensive_Complete; - } - else - { - pressurePipe.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // var oldQualityAccident = Funs.DB.Comprehensive_QualityAccident.Where(u => u.QualityAccidentId == this.QualityAccidentId).FirstOrDefault(); + // if (oldQualityAccident == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // pressurePipe.CompileMan = this.CurrUser.UserId; + // pressurePipe.CompileDate = DateTime.Now; + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // BLL.QualityAccidentService.AddQualityAccident(pressurePipe); + // } + // else + // { + // pressurePipe.CompileMan = oldQualityAccident.CompileMan; + // pressurePipe.CompileDate = oldQualityAccident.CompileDate; + // if (oldQualityAccident.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldQualityAccident.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // pressurePipe.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // pressurePipe.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe); + // BLL.QualityAccidentService.UpdateQualityAccident(pressurePipe); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = QualityAccidentApproveService.GetCurrentApprove(pressurePipe.QualityAccidentId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_QualityAccidentApprove(); - approve.QualityAccidentId = pressurePipe.QualityAccidentId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - QualityAccidentApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = QualityAccidentApproveService.GetCurrentApprove(pressurePipe.QualityAccidentId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_QualityAccidentApprove(); + // approve.QualityAccidentId = pressurePipe.QualityAccidentId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // QualityAccidentApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_QualityAccidentApprove newApprove = new Model.Comprehensive_QualityAccidentApprove(); - newApprove.QualityAccidentId = pressurePipe.QualityAccidentId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - QualityAccidentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_QualityAccidentApprove newApprove = new Model.Comprehensive_QualityAccidentApprove(); + // newApprove.QualityAccidentId = pressurePipe.QualityAccidentId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // QualityAccidentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - QualityAccidentApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_QualityAccidentApprove newApprove = new Model.Comprehensive_QualityAccidentApprove(); - newApprove.QualityAccidentId = pressurePipe.QualityAccidentId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - QualityAccidentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - QualityAccidentApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // QualityAccidentApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_QualityAccidentApprove newApprove = new Model.Comprehensive_QualityAccidentApprove(); + // newApprove.QualityAccidentId = pressurePipe.QualityAccidentId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // QualityAccidentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // QualityAccidentApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_QualityAccidentApprove reApprove = new Model.Comprehensive_QualityAccidentApprove(); - reApprove.QualityAccidentId = currApprove.QualityAccidentId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - reApprove.ApproveIdea = txtidea.Text; - QualityAccidentApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_QualityAccidentApprove reApprove = new Model.Comprehensive_QualityAccidentApprove(); - reApprove.QualityAccidentId = currApprove.QualityAccidentId; - reApprove.ApproveMan = pressurePipe.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - QualityAccidentApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_QualityAccidentApprove reApprove = new Model.Comprehensive_QualityAccidentApprove(); + // reApprove.QualityAccidentId = currApprove.QualityAccidentId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // reApprove.ApproveIdea = txtidea.Text; + // QualityAccidentApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_QualityAccidentApprove reApprove = new Model.Comprehensive_QualityAccidentApprove(); + // reApprove.QualityAccidentId = currApprove.QualityAccidentId; + // reApprove.ApproveMan = pressurePipe.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // QualityAccidentApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } - else - { - Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); - } - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + // } + // else + // { + // Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); + // } + //} #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs index be16d369..69f07c9e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.designer.cs @@ -147,51 +147,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.NumberBox txtRemarkCode; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -228,15 +183,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx index b95a242c..fb7e0299 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawings.aspx @@ -71,13 +71,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label Label3; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx index 4b112c3e..fa2b071f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx @@ -53,7 +53,7 @@ - + <%-- @@ -77,7 +77,7 @@ - + --%> @@ -88,8 +88,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs index 318e4b2e..bda5def1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.cs @@ -38,12 +38,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkIds, this.CurrUser.LoginProjectId, false); BLL.UnitService.GetUnit(this.drpUnitIds, this.CurrUser.LoginProjectId, false); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.Id = Request.Params["Id"]; var model = BLL.ReviewDrawingsService.Detail(this.Id); if (model != null) @@ -69,39 +69,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemarks.Text = model.Remarks; this.txtRemarkCode.Text = model.RemarkCode.HasValue ? model.RemarkCode.ToString() : ""; - var currApprove = DesignDrawingsApproveService.GetCurrentApprove(model.Id); - if (currApprove != null) - { //重新编制 编制人 可以 显示 提交 保存按钮 + //var currApprove = DesignDrawingsApproveService.GetCurrentApprove(model.Id); + //if (currApprove != null) + //{ //重新编制 编制人 可以 显示 提交 保存按钮 - this.drpAudit.SelectedValue = currApprove.ApproveMan; - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && model.CreateMan == 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 (model.Status == BLL.Const.Comprehensive_Compile && model.CreateMan == CurrUser.UserId) - { - this.btnSubmit.Hidden = false; - this.btnSave.Hidden = false; - } - } + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && model.CreateMan == 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 (model.Status == BLL.Const.Comprehensive_Compile && model.CreateMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } else { this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -121,7 +121,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnitIds.Readonly = true; this.txtRemarks.Readonly = true; this.txtReviewDate.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; @@ -130,23 +130,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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(); + //} @@ -286,181 +286,181 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.Id != this.Id || (this.Id == null && x.Id != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - var designDrawings = new Model.Comprehensive_ReviewDrawings(); - designDrawings.ProjectId = this.CurrUser.LoginProjectId; - designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - designDrawings.DraCode = this.txtDraCode.Text.Trim(); - designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); - designDrawings.Remarks = this.txtRemarks.Text.Trim(); - designDrawings.CreateMan = this.CurrUser.UserId; - designDrawings.CreateDate = DateTime.Now; - //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - //{ - // designDrawings.AuditMan = drpAudit.SelectedValue; - //} //审核人 - 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(",")); - } - designDrawings.UnitWorkId = ids; + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_ReviewDrawings.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.Id != this.Id || (this.Id == null && x.Id != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // var designDrawings = new Model.Comprehensive_ReviewDrawings(); + // designDrawings.ProjectId = this.CurrUser.LoginProjectId; + // designDrawings.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // designDrawings.DraCode = this.txtDraCode.Text.Trim(); + // designDrawings.ReviewDate = Funs.GetNewDateTime(this.txtReviewDate.Text); + // designDrawings.Remarks = this.txtRemarks.Text.Trim(); + // designDrawings.CreateMan = this.CurrUser.UserId; + // designDrawings.CreateDate = DateTime.Now; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // designDrawings.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // 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(",")); + // } + // designDrawings.UnitWorkId = ids; - string unitIds = string.Empty; - var unitLists = this.drpUnitIds.SelectedValueArray; - foreach (var item in unitLists) - { - unitIds += item + ","; - } - if (!string.IsNullOrEmpty(unitIds)) - { - unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); - } - designDrawings.ReceiveUnits = unitIds; - designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (!string.IsNullOrEmpty(this.Id)) - { - designDrawings.Id = this.Id; - //BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); - var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); - if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - designDrawings.CreateMan = this.CurrUser.UserId; - designDrawings.Status = BLL.Const.Comprehensive_Audit; - BLL.ReviewDrawingsService.Insert(designDrawings); - } - else - { - - if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - designDrawings.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - designDrawings.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - designDrawings.Status = BLL.Const.Comprehensive_Complete; - } - else - { - designDrawings.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // string unitIds = string.Empty; + // var unitLists = this.drpUnitIds.SelectedValueArray; + // foreach (var item in unitLists) + // { + // unitIds += item + ","; + // } + // if (!string.IsNullOrEmpty(unitIds)) + // { + // unitIds = unitIds.Substring(0, unitIds.LastIndexOf(",")); + // } + // designDrawings.ReceiveUnits = unitIds; + // designDrawings.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (!string.IsNullOrEmpty(this.Id)) + // { + // designDrawings.Id = this.Id; + // BLL.DesignDrawingsService.UpdateDesignDrawings(designDrawings); + // var oldDesignDrawings = Funs.DB.Comprehensive_ReviewDrawings.Where(u => u.Id == this.Id).FirstOrDefault(); + // if (oldDesignDrawings == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // designDrawings.CreateMan = this.CurrUser.UserId; + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // BLL.ReviewDrawingsService.Insert(designDrawings); + // } + // else + // { - BLL.ReviewDrawingsService.Update(designDrawings); + // if (oldDesignDrawings.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldDesignDrawings.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // designDrawings.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // designDrawings.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - } - } - else - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - designDrawings.Id = this.hdAttachUrl.Text; - } - else - { - designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); - this.hdAttachUrl.Text = designDrawings.Id; - } + // BLL.ReviewDrawingsService.Update(designDrawings); - designDrawings.Status = BLL.Const.Comprehensive_Audit; - BLL.ReviewDrawingsService.Insert(designDrawings); - } + // } + // } + // else + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // designDrawings.Id = this.hdAttachUrl.Text; + // } + // else + // { + // designDrawings.Id = SQLHelper.GetNewID(typeof(Model.Comprehensive_DesignDrawings)); + // this.hdAttachUrl.Text = designDrawings.Id; + // } + + // designDrawings.Status = BLL.Const.Comprehensive_Audit; + // BLL.ReviewDrawingsService.Insert(designDrawings); + // } - #region 审核记录 + // #region 审核记录 - var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.Id); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_DesignDrawingsApprove(); - approve.DesignDrawingsId = designDrawings.Id; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - DesignDrawingsApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = DesignDrawingsApproveService.GetCurrentApprove(designDrawings.Id); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_DesignDrawingsApprove(); + // approve.DesignDrawingsId = designDrawings.Id; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // DesignDrawingsApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); - newApprove.DesignDrawingsId = designDrawings.Id; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // newApprove.DesignDrawingsId = designDrawings.Id; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); - newApprove.DesignDrawingsId = designDrawings.Id; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - DesignDrawingsApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // currApprove.IsAgree = true; + // DesignDrawingsApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_DesignDrawingsApprove newApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // newApprove.DesignDrawingsId = designDrawings.Id; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // DesignDrawingsApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // DesignDrawingsApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); - reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - // reApprove.ApproveIdea = txtidea.Text; - DesignDrawingsApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); - reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; - reApprove.ApproveMan = designDrawings.CreateMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - DesignDrawingsApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // reApprove.ApproveIdea = txtidea.Text; + // DesignDrawingsApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_DesignDrawingsApprove reApprove = new Model.Comprehensive_DesignDrawingsApprove(); + // reApprove.DesignDrawingsId = currApprove.DesignDrawingsId; + // reApprove.ApproveMan = designDrawings.CreateMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // DesignDrawingsApproveService.EditApprove(reApprove); + // } + // } + // } - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - #endregion + // #endregion - } + //} /// /// 保存方法 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs index 92c09c70..1ed493d0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsEdit.aspx.designer.cs @@ -129,51 +129,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -201,15 +156,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx index 9b2042d1..c1a154dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagement.aspx @@ -82,13 +82,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx index 9bddf3de..7d46ac56 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx @@ -70,7 +70,7 @@ - + <%-- @@ -94,7 +94,7 @@ - + --%> @@ -105,8 +105,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs index fe9f9d7c..1799678e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs @@ -38,12 +38,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true); BLL.UnitWorkService.InitUnitWorkDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; this.VisaId = Request.Params["VisaId"]; Model.Comprehensive_SiteVisaManagement siteVisaManagement = BLL.SiteVisaManagementService.GetSiteVisaManagementById(this.VisaId); if (siteVisaManagement != null) @@ -78,35 +78,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtRemarkCode.Text = siteVisaManagement.RemarkCode.HasValue ? siteVisaManagement.RemarkCode.ToString() : ""; - var currApprove = SiteVisaManagementApproveService.GetCurrentApprove(siteVisaManagement.VisaId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && siteVisaManagement.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 = SiteVisaManagementApproveService.GetCurrentApprove(siteVisaManagement.VisaId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && siteVisaManagement.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 (siteVisaManagement.Status == BLL.Const.Comprehensive_Compile && siteVisaManagement.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 (siteVisaManagement.Status == BLL.Const.Comprehensive_Compile && siteVisaManagement.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } @@ -114,7 +114,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtVisaDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } } @@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.txtVisaDate.Readonly = true; this.drpUnitWorkId.Readonly = true; this.drpProcessingState.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; //this.btnAttach.Enabled = false; @@ -142,23 +142,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 #region 保存 @@ -182,10 +182,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Model.Comprehensive_SiteVisaManagement siteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); siteVisaManagement.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - siteVisaManagement.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // siteVisaManagement.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (this.drpUnitId.SelectedValue != BLL.Const._Null) { siteVisaManagement.UnitId = this.drpUnitId.SelectedValue; @@ -240,172 +240,172 @@ namespace FineUIPro.Web.CQMS.Comprehensive PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_SiteVisaManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.VisaId != this.VisaId || (this.VisaId == null && x.VisaId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_SiteVisaManagement siteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); - siteVisaManagement.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - siteVisaManagement.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (this.drpUnitId.SelectedValue != BLL.Const._Null) - { - siteVisaManagement.UnitId = this.drpUnitId.SelectedValue; - } - siteVisaManagement.VisaCode = this.txtVisaCode.Text.Trim(); - siteVisaManagement.VisaContent = this.txtVisaContent.Text.Trim(); - siteVisaManagement.ProcessingState = this.drpProcessingState.SelectedValue.Trim(); - if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) - { - siteVisaManagement.UnitWorkId = this.drpUnitWorkId.SelectedValue; - } - if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) - { - siteVisaManagement.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; - } - if (!string.IsNullOrEmpty(this.txtVisaDate.Text)) - { - siteVisaManagement.VisaDate = Convert.ToDateTime(this.txtVisaDate.Text); - } - siteVisaManagement.SignMan = this.txtSignMan.Text.Trim(); - siteVisaManagement.AuditMan = this.txtAuditMan.Text.Trim(); - siteVisaManagement.Remark = this.txtRemark.Text.Trim(); - siteVisaManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.VisaId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - siteVisaManagement.VisaId = this.hdAttachUrl.Text; - } - else - { - siteVisaManagement.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement)); - this.hdAttachUrl.Text = siteVisaManagement.VisaId; - } - siteVisaManagement.CompileMan = this.CurrUser.UserId; - siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; - BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); - } - else - { - siteVisaManagement.VisaId = this.VisaId; - // BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement); + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpCNProfessionalId.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择专业！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_SiteVisaManagement.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.VisaId != this.VisaId || (this.VisaId == null && x.VisaId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_SiteVisaManagement siteVisaManagement = new Model.Comprehensive_SiteVisaManagement(); + // siteVisaManagement.ProjectId = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // siteVisaManagement.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (this.drpUnitId.SelectedValue != BLL.Const._Null) + // { + // siteVisaManagement.UnitId = this.drpUnitId.SelectedValue; + // } + // siteVisaManagement.VisaCode = this.txtVisaCode.Text.Trim(); + // siteVisaManagement.VisaContent = this.txtVisaContent.Text.Trim(); + // siteVisaManagement.ProcessingState = this.drpProcessingState.SelectedValue.Trim(); + // if (this.drpUnitWorkId.SelectedValue != BLL.Const._Null) + // { + // siteVisaManagement.UnitWorkId = this.drpUnitWorkId.SelectedValue; + // } + // if (this.drpCNProfessionalId.SelectedValue != BLL.Const._Null) + // { + // siteVisaManagement.CNProfessionalId = this.drpCNProfessionalId.SelectedValue; + // } + // if (!string.IsNullOrEmpty(this.txtVisaDate.Text)) + // { + // siteVisaManagement.VisaDate = Convert.ToDateTime(this.txtVisaDate.Text); + // } + // siteVisaManagement.SignMan = this.txtSignMan.Text.Trim(); + // siteVisaManagement.AuditMan = this.txtAuditMan.Text.Trim(); + // siteVisaManagement.Remark = this.txtRemark.Text.Trim(); + // siteVisaManagement.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.VisaId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // siteVisaManagement.VisaId = this.hdAttachUrl.Text; + // } + // else + // { + // siteVisaManagement.VisaId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SiteVisaManagement)); + // this.hdAttachUrl.Text = siteVisaManagement.VisaId; + // } + // siteVisaManagement.CompileMan = this.CurrUser.UserId; + // siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; + // BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); + // } + // else + // { + // siteVisaManagement.VisaId = this.VisaId; + // // BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement); - var oldSiteVisaManagement = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault(); - if (oldSiteVisaManagement == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - siteVisaManagement.CompileMan = this.CurrUser.UserId; - //siteVisaManagement.CompileDate = DateTime.Now; - siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; - BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); - } - else - { - siteVisaManagement.CompileMan = oldSiteVisaManagement.CompileMan; - //siteVisaManagement.CompileDate = oldSiteVisaManagement.CompileDate; - if (oldSiteVisaManagement.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldSiteVisaManagement.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - siteVisaManagement.Status = BLL.Const.Comprehensive_Complete; - } - else - { - siteVisaManagement.Status = BLL.Const.Comprehensive_ReCompile; - } - } + // var oldSiteVisaManagement = Funs.DB.Comprehensive_SiteVisaManagement.Where(u => u.VisaId == this.VisaId).FirstOrDefault(); + // if (oldSiteVisaManagement == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // siteVisaManagement.CompileMan = this.CurrUser.UserId; + // //siteVisaManagement.CompileDate = DateTime.Now; + // siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; + // BLL.SiteVisaManagementService.AddSiteVisaManagement(siteVisaManagement); + // } + // else + // { + // siteVisaManagement.CompileMan = oldSiteVisaManagement.CompileMan; + // //siteVisaManagement.CompileDate = oldSiteVisaManagement.CompileDate; + // if (oldSiteVisaManagement.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldSiteVisaManagement.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // siteVisaManagement.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // siteVisaManagement.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // siteVisaManagement.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement); + // BLL.SiteVisaManagementService.UpdateSiteVisaManagement(siteVisaManagement); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = SiteVisaManagementApproveService.GetCurrentApprove(siteVisaManagement.VisaId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_SiteVisaManagementApprove(); - approve.VisaId = siteVisaManagement.VisaId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - SiteVisaManagementApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = SiteVisaManagementApproveService.GetCurrentApprove(siteVisaManagement.VisaId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_SiteVisaManagementApprove(); + // approve.VisaId = siteVisaManagement.VisaId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // SiteVisaManagementApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_SiteVisaManagementApprove newApprove = new Model.Comprehensive_SiteVisaManagementApprove(); - newApprove.VisaId = siteVisaManagement.VisaId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - SiteVisaManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_SiteVisaManagementApprove newApprove = new Model.Comprehensive_SiteVisaManagementApprove(); + // newApprove.VisaId = siteVisaManagement.VisaId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // SiteVisaManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - SiteVisaManagementApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_SiteVisaManagementApprove newApprove = new Model.Comprehensive_SiteVisaManagementApprove(); - newApprove.VisaId = siteVisaManagement.VisaId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - SiteVisaManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - SiteVisaManagementApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // SiteVisaManagementApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_SiteVisaManagementApprove newApprove = new Model.Comprehensive_SiteVisaManagementApprove(); + // newApprove.VisaId = siteVisaManagement.VisaId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // SiteVisaManagementApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // SiteVisaManagementApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_SiteVisaManagementApprove reApprove = new Model.Comprehensive_SiteVisaManagementApprove(); - reApprove.VisaId = currApprove.VisaId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - reApprove.ApproveIdea = txtidea.Text; - SiteVisaManagementApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_SiteVisaManagementApprove reApprove = new Model.Comprehensive_SiteVisaManagementApprove(); - reApprove.VisaId = currApprove.VisaId; - reApprove.ApproveMan = siteVisaManagement.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - SiteVisaManagementApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_SiteVisaManagementApprove reApprove = new Model.Comprehensive_SiteVisaManagementApprove(); + // reApprove.VisaId = currApprove.VisaId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // reApprove.ApproveIdea = txtidea.Text; + // SiteVisaManagementApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_SiteVisaManagementApprove reApprove = new Model.Comprehensive_SiteVisaManagementApprove(); + // reApprove.VisaId = currApprove.VisaId; + // reApprove.ApproveMan = siteVisaManagement.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // SiteVisaManagementApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs index 98e4bd73..2baab3ab 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.designer.cs @@ -165,51 +165,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.NumberBox txtRemarkCode; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - - /// - /// agree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; - /// /// Toolbar1 控件。 /// @@ -237,15 +192,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx index 409872a4..6b4946ae 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipment.aspx @@ -68,13 +68,13 @@ - + <%-- - - + --%> + <%----%> protected global::System.Web.UI.WebControls.Label lblPageIndex; - /// - /// txtStatus 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label txtStatus; - /// /// lbtnFileUrl 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx index 74db58c7..fca20e8d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx @@ -55,16 +55,17 @@ - - + + <%-- + --%> - + <%-- @@ -80,7 +81,7 @@ - + --%> @@ -91,8 +92,8 @@ - - + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index 136ff62f..94b4ba92 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -39,12 +39,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive BLL.UnitService.InitUnitDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); BLL.SpecialEquipmentService.InitSpecialEquipmentDropDownList(this.drpEquipmentId, true, true); - LoadAuditSelect(); - this.agree.Hidden = true; - this.options.Hidden = true; + //LoadAuditSelect(); + //this.agree.Hidden = true; + //this.options.Hidden = true; this.btnSave.Hidden = true; - this.btnSubmit.Hidden = true; + //this.btnSubmit.Hidden = true; Model.Comprehensive_SpecialEquipment specialEquipment = BLL.SpecialEquipmentServices.GetEquipmentById(this.SpecialEquipmentId); if (specialEquipment != null) { @@ -68,35 +68,35 @@ namespace FineUIPro.Web.CQMS.Comprehensive } this.txtRemarkCode.Text = specialEquipment.RemarkCode.HasValue ? specialEquipment.RemarkCode.ToString() : ""; - var currApprove = SpecialEquipmentApproveService.GetCurrentApprove(specialEquipment.SpecialEquipmentId); - if (currApprove != null) - { - this.drpAudit.SelectedValue = currApprove.ApproveMan; - //重新编制 编制人 可以 显示 提交 保存按钮 - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && specialEquipment.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 = SpecialEquipmentApproveService.GetCurrentApprove(specialEquipment.SpecialEquipmentId); + //if (currApprove != null) + //{ + // this.drpAudit.SelectedValue = currApprove.ApproveMan; + // //重新编制 编制人 可以 显示 提交 保存按钮 + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && specialEquipment.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 (specialEquipment.Status == BLL.Const.Comprehensive_Compile && specialEquipment.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 (specialEquipment.Status == BLL.Const.Comprehensive_Compile && specialEquipment.CompileMan == CurrUser.UserId) + // { + // this.btnSubmit.Hidden = false; + // this.btnSave.Hidden = false; + // } + //} } @@ -104,7 +104,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive { this.txtReportTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.btnSave.Hidden = false; - this.btnSubmit.Hidden = false; + //this.btnSubmit.Hidden = false; } } @@ -125,7 +125,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.drpUnit.Readonly = true; this.txtPositionNum.Readonly = true; - this.drpAudit.Readonly = true; + //this.drpAudit.Readonly = true; this.txtRemarkCode.Readonly = true; // this.btnAttach.Enabled = false; @@ -136,23 +136,23 @@ namespace FineUIPro.Web.CQMS.Comprehensive /// /// 加载专业工程师 /// - 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 @@ -177,10 +177,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive } Model.Comprehensive_SpecialEquipment specialEquipment = new Model.Comprehensive_SpecialEquipment(); specialEquipment.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - specialEquipment.AuditMan = drpAudit.SelectedValue; - } //审核人 + //if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + //{ + // specialEquipment.AuditMan = drpAudit.SelectedValue; + //} //审核人 if (!string.IsNullOrEmpty(this.txtSunNumber.Text)) { specialEquipment.SunNumber = Convert.ToInt32(this.txtSunNumber.Text); @@ -243,179 +243,179 @@ namespace FineUIPro.Web.CQMS.Comprehensive } - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (drpUnit.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); - return; - } - var q = Funs.DB.Comprehensive_SpecialEquipment.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.SpecialEquipmentId != this.SpecialEquipmentId || (this.SpecialEquipmentId == null && x.SpecialEquipmentId != null))); - if (q != null) - { - Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); - return; - } - Model.Comprehensive_SpecialEquipment specialEquipment = new Model.Comprehensive_SpecialEquipment(); - specialEquipment.ProjectId = this.CurrUser.LoginProjectId; - if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) - { - specialEquipment.AuditMan = drpAudit.SelectedValue; - } //审核人 - if (!string.IsNullOrEmpty(this.txtSunNumber.Text)) - { - specialEquipment.SunNumber = Convert.ToInt32(this.txtSunNumber.Text); - } - if (this.drpUnit.SelectedValue != BLL.Const._Null) - { - specialEquipment.UnitId = this.drpUnit.SelectedValue; - } - if (this.drpEquipmentId.SelectedValue != BLL.Const._Null) - { - specialEquipment.EquipmentId = this.drpEquipmentId.SelectedValue; - } - if (!string.IsNullOrEmpty(this.txtSubmitDataNumber.Text)) - { - specialEquipment.SubmitDataNumber = Convert.ToInt32(this.txtSubmitDataNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtMonitoringReportNumber.Text)) - { - specialEquipment.MonitoringReportNumber = Convert.ToInt32(this.txtMonitoringReportNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtInformNumber.Text)) - { - specialEquipment.InformNumber = Convert.ToInt32(this.txtInformNumber.Text); - } - if (!string.IsNullOrEmpty(this.txtReportTime.Text)) - { - specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); - } - specialEquipment.PositionNum = this.txtPositionNum.Text.Trim(); - specialEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); - if (string.IsNullOrEmpty(this.SpecialEquipmentId)) - { - if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) - { - specialEquipment.SpecialEquipmentId = this.hdAttachUrl.Text; - } - else - { - specialEquipment.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); - this.hdAttachUrl.Text = specialEquipment.SpecialEquipmentId; - } - specialEquipment.CompileMan = this.CurrUser.UserId; - specialEquipment.Status = BLL.Const.Comprehensive_Audit; - BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); - } - else - { - specialEquipment.SpecialEquipmentId = this.SpecialEquipmentId; - // BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment); - var oldSpecialEquipment = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault(); - if (oldSpecialEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态 - { - specialEquipment.CompileMan = this.CurrUser.UserId; - //specialEquipment.CompileDate = DateTime.Now; - specialEquipment.Status = BLL.Const.Comprehensive_Audit; - BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); - } - else - { - specialEquipment.CompileMan = oldSpecialEquipment.CompileMan; - //specialEquipment.CompileDate = oldSpecialEquipment.CompileDate; - if (oldSpecialEquipment.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 - { - specialEquipment.Status = BLL.Const.Comprehensive_Audit; - } - else if (oldSpecialEquipment.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 - { - specialEquipment.Status = BLL.Const.Comprehensive_Audit; - } - else //审核状态 提交 变 完成 或者 重新编制 - { - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) - { - specialEquipment.Status = BLL.Const.Comprehensive_Complete; - } - else - { - specialEquipment.Status = BLL.Const.Comprehensive_ReCompile; - } - } + //protected void btnSubmit_Click(object sender, EventArgs e) + //{ + // if (drpUnit.SelectedValue == BLL.Const._Null) + // { + // Alert.ShowInTop("请选择所属单位！", MessageBoxIcon.Warning); + // return; + // } + // var q = Funs.DB.Comprehensive_SpecialEquipment.FirstOrDefault(x => x.ProjectId == this.CurrUser.LoginProjectId && x.RemarkCode == Funs.GetNewInt(this.txtRemarkCode.Text.Trim()) && (x.SpecialEquipmentId != this.SpecialEquipmentId || (this.SpecialEquipmentId == null && x.SpecialEquipmentId != null))); + // if (q != null) + // { + // Alert.ShowInTop("标志编号已存在！", MessageBoxIcon.Warning); + // return; + // } + // Model.Comprehensive_SpecialEquipment specialEquipment = new Model.Comprehensive_SpecialEquipment(); + // specialEquipment.ProjectId = this.CurrUser.LoginProjectId; + // if (!string.IsNullOrEmpty(this.drpAudit.SelectedValue)) + // { + // specialEquipment.AuditMan = drpAudit.SelectedValue; + // } //审核人 + // if (!string.IsNullOrEmpty(this.txtSunNumber.Text)) + // { + // specialEquipment.SunNumber = Convert.ToInt32(this.txtSunNumber.Text); + // } + // if (this.drpUnit.SelectedValue != BLL.Const._Null) + // { + // specialEquipment.UnitId = this.drpUnit.SelectedValue; + // } + // if (this.drpEquipmentId.SelectedValue != BLL.Const._Null) + // { + // specialEquipment.EquipmentId = this.drpEquipmentId.SelectedValue; + // } + // if (!string.IsNullOrEmpty(this.txtSubmitDataNumber.Text)) + // { + // specialEquipment.SubmitDataNumber = Convert.ToInt32(this.txtSubmitDataNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtMonitoringReportNumber.Text)) + // { + // specialEquipment.MonitoringReportNumber = Convert.ToInt32(this.txtMonitoringReportNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtInformNumber.Text)) + // { + // specialEquipment.InformNumber = Convert.ToInt32(this.txtInformNumber.Text); + // } + // if (!string.IsNullOrEmpty(this.txtReportTime.Text)) + // { + // specialEquipment.ReportTime = Convert.ToDateTime(this.txtReportTime.Text); + // } + // specialEquipment.PositionNum = this.txtPositionNum.Text.Trim(); + // specialEquipment.RemarkCode = Funs.GetNewInt(this.txtRemarkCode.Text.Trim()); + // if (string.IsNullOrEmpty(this.SpecialEquipmentId)) + // { + // if (!string.IsNullOrEmpty(this.hdAttachUrl.Text)) + // { + // specialEquipment.SpecialEquipmentId = this.hdAttachUrl.Text; + // } + // else + // { + // specialEquipment.SpecialEquipmentId = SQLHelper.GetNewID(typeof(Model.Comprehensive_SpecialEquipment)); + // this.hdAttachUrl.Text = specialEquipment.SpecialEquipmentId; + // } + // specialEquipment.CompileMan = this.CurrUser.UserId; + // specialEquipment.Status = BLL.Const.Comprehensive_Audit; + // BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); + // } + // else + // { + // specialEquipment.SpecialEquipmentId = this.SpecialEquipmentId; + // // BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment); + // var oldSpecialEquipment = Funs.DB.Comprehensive_SpecialEquipment.Where(u => u.SpecialEquipmentId == this.SpecialEquipmentId).FirstOrDefault(); + // if (oldSpecialEquipment == null) //数据库没有记录 直接点提交 当前状态为 审核状态 + // { + // specialEquipment.CompileMan = this.CurrUser.UserId; + // //specialEquipment.CompileDate = DateTime.Now; + // specialEquipment.Status = BLL.Const.Comprehensive_Audit; + // BLL.SpecialEquipmentServices.AddEquipment(specialEquipment); + // } + // else + // { + // specialEquipment.CompileMan = oldSpecialEquipment.CompileMan; + // //specialEquipment.CompileDate = oldSpecialEquipment.CompileDate; + // if (oldSpecialEquipment.Status == BLL.Const.Comprehensive_Compile)//编制状态提交变审核 + // { + // specialEquipment.Status = BLL.Const.Comprehensive_Audit; + // } + // else if (oldSpecialEquipment.Status == BLL.Const.Comprehensive_ReCompile)//重新编制状态提交变审核 + // { + // specialEquipment.Status = BLL.Const.Comprehensive_Audit; + // } + // else //审核状态 提交 变 完成 或者 重新编制 + // { + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) + // { + // specialEquipment.Status = BLL.Const.Comprehensive_Complete; + // } + // else + // { + // specialEquipment.Status = BLL.Const.Comprehensive_ReCompile; + // } + // } - BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment); + // BLL.SpecialEquipmentServices.UpdateEquipment(specialEquipment); - } + // } - } - #region 审核记录 + // } + // #region 审核记录 - var currApprove = SpecialEquipmentApproveService.GetCurrentApprove(specialEquipment.SpecialEquipmentId); - if (currApprove == null) //为获取到为 当前编制状态 直接提交 - { - var approve = new Model.Comprehensive_SpecialEquipmentApprove(); - approve.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; - approve.ApproveMan = this.CurrUser.UserId; - approve.ApproveType = Const.Comprehensive_Compile; - approve.ApproveDate = DateTime.Now; - SpecialEquipmentApproveService.EditApprove(approve); //新增编制记录 + // var currApprove = SpecialEquipmentApproveService.GetCurrentApprove(specialEquipment.SpecialEquipmentId); + // if (currApprove == null) //为获取到为 当前编制状态 直接提交 + // { + // var approve = new Model.Comprehensive_SpecialEquipmentApprove(); + // approve.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; + // approve.ApproveMan = this.CurrUser.UserId; + // approve.ApproveType = Const.Comprehensive_Compile; + // approve.ApproveDate = DateTime.Now; + // SpecialEquipmentApproveService.EditApprove(approve); //新增编制记录 - Model.Comprehensive_SpecialEquipmentApprove newApprove = new Model.Comprehensive_SpecialEquipmentApprove(); - newApprove.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - SpecialEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // Model.Comprehensive_SpecialEquipmentApprove newApprove = new Model.Comprehensive_SpecialEquipmentApprove(); + // newApprove.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // SpecialEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else if (currApprove.ApproveMan == CurrUser.UserId) - { - if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) - { - currApprove.ApproveDate = DateTime.Now; - //currApprove.IsAgree = true; - SpecialEquipmentApproveService.EditApprove(currApprove); //新增专业工程师审核记录 - Model.Comprehensive_SpecialEquipmentApprove newApprove = new Model.Comprehensive_SpecialEquipmentApprove(); - newApprove.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; - newApprove.ApproveMan = this.drpAudit.SelectedValue; - newApprove.ApproveType = Const.InspectionManagement_Audit; - SpecialEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 - } - else - { - currApprove.ApproveDate = DateTime.Now; //更新审核时间 - currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); - currApprove.ApproveIdea = this.txtidea.Text; - SpecialEquipmentApproveService.EditApprove(currApprove); + // } + // else if (currApprove.ApproveMan == CurrUser.UserId) + // { + // if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile) + // { + // currApprove.ApproveDate = DateTime.Now; + // //currApprove.IsAgree = true; + // SpecialEquipmentApproveService.EditApprove(currApprove); //新增专业工程师审核记录 + // Model.Comprehensive_SpecialEquipmentApprove newApprove = new Model.Comprehensive_SpecialEquipmentApprove(); + // newApprove.SpecialEquipmentId = specialEquipment.SpecialEquipmentId; + // newApprove.ApproveMan = this.drpAudit.SelectedValue; + // newApprove.ApproveType = Const.InspectionManagement_Audit; + // SpecialEquipmentApproveService.EditApprove(newApprove); //新增专业工程师审核记录 + // } + // else + // { + // currApprove.ApproveDate = DateTime.Now; //更新审核时间 + // currApprove.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue); + // currApprove.ApproveIdea = this.txtidea.Text; + // SpecialEquipmentApproveService.EditApprove(currApprove); - if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 - { - Model.Comprehensive_SpecialEquipmentApprove reApprove = new Model.Comprehensive_SpecialEquipmentApprove(); - reApprove.SpecialEquipmentId = currApprove.SpecialEquipmentId; - reApprove.ApproveDate = DateTime.Now.AddSeconds(10); - reApprove.ApproveMan = CurrUser.UserId; - reApprove.ApproveType = Const.Comprehensive_Complete; - reApprove.ApproveIdea = txtidea.Text; - SpecialEquipmentApproveService.EditApprove(reApprove); - } - else - { - Model.Comprehensive_SpecialEquipmentApprove reApprove = new Model.Comprehensive_SpecialEquipmentApprove(); - reApprove.SpecialEquipmentId = currApprove.SpecialEquipmentId; - reApprove.ApproveMan = specialEquipment.CompileMan; - reApprove.ApproveType = Const.Comprehensive_ReCompile; - SpecialEquipmentApproveService.EditApprove(reApprove); - } - } - } + // if (Convert.ToBoolean(rblIsAgree.SelectedValue)) //同意时 审批完成 + // { + // Model.Comprehensive_SpecialEquipmentApprove reApprove = new Model.Comprehensive_SpecialEquipmentApprove(); + // reApprove.SpecialEquipmentId = currApprove.SpecialEquipmentId; + // reApprove.ApproveDate = DateTime.Now.AddSeconds(10); + // reApprove.ApproveMan = CurrUser.UserId; + // reApprove.ApproveType = Const.Comprehensive_Complete; + // reApprove.ApproveIdea = txtidea.Text; + // SpecialEquipmentApproveService.EditApprove(reApprove); + // } + // else + // { + // Model.Comprehensive_SpecialEquipmentApprove reApprove = new Model.Comprehensive_SpecialEquipmentApprove(); + // reApprove.SpecialEquipmentId = currApprove.SpecialEquipmentId; + // reApprove.ApproveMan = specialEquipment.CompileMan; + // reApprove.ApproveType = Const.Comprehensive_ReCompile; + // SpecialEquipmentApproveService.EditApprove(reApprove); + // } + // } + // } - #endregion + // #endregion - ShowNotify("保存成功！", MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); - } + // ShowNotify("保存成功！", MessageBoxIcon.Success); + // PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + //} #endregion #region 附件上传 diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs index fbaea3d8..e2b13a2b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.designer.cs @@ -138,15 +138,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnAttach; - /// - /// drpAudit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAudit; - /// /// txtReportTime 控件。 /// @@ -157,40 +148,13 @@ namespace FineUIPro.Web.CQMS.Comprehensive { protected global::FineUIPro.DatePicker txtReportTime; /// - /// agree 控件。 + /// Label2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.FormRow agree; - - /// - /// rblIsAgree 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.RadioButtonList rblIsAgree; - - /// - /// options 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow options; - - /// - /// txtidea 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtidea; + protected global::FineUIPro.Label Label2; /// /// Toolbar1 控件。 @@ -219,15 +183,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive { /// protected global::FineUIPro.Button btnSave; - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - /// /// WindowAtt 控件。 /// diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 33cf355f..898f5f3d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -573,7 +573,6 @@ - @@ -8408,13 +8407,6 @@ Organizational.aspx - - Organizational123.aspx - ASPXCodeBehind - - - Organizational123.aspx - ProjectQualityPlan.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx index 89e06a9f..d62df183 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx @@ -59,7 +59,7 @@ - + diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs index 95be2b75..f5c41381 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs @@ -581,15 +581,33 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary var SgfaCount = list15.Where(x => x.ProjectId == pid).ToList().Count; var bigCount = list15_2.Where(x => x.ProjectId == pid).ToList().Count; model.SummeryResult = (SgfaCount + bigCount).ToString(); - if (bigCount > 0 && SgfaCount == 0) + DateTime? date1 = Convert.ToDateTime("1900-01-01"); + DateTime? date2 = Convert.ToDateTime("1900-01-01"); + if (SgfaCount > 0) { - //审批日期 - model.CompileDate = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + date1 = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; } - else if (SgfaCount > 0) + if (bigCount > 0) { - model.CompileDate = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + date2 = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; } + if (SgfaCount > bigCount) + { + model.CompileDate = date1; + } + else + { + model.CompileDate = date2; + } + //if (bigCount > 0 && SgfaCount == 0) + //{ + // //审批日期 + // model.CompileDate = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + //} + //else if (SgfaCount > 0) + //{ + // model.CompileDate = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + //} allList.Add(model); //设计交底管理 @@ -633,14 +651,33 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary var SgzbCount = list18.Where(x => x.ProjectId == pid).ToList().Count; var newSgzbCount = list18_2.Where(x => x.ProjectId == pid).ToList().Count; model.SummeryResult = (SgzbCount + newSgzbCount).ToString(); - if (SgzbCount == 0 && newSgzbCount > 0) + + DateTime? weekDate1 = Convert.ToDateTime("1900-01-01"); + DateTime? weekDate2 = Convert.ToDateTime("1900-01-01"); + if(SgzbCount>0) { - model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + weekDate1= list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; } - else if (SgzbCount > 0) + if (newSgzbCount > 0) { - model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + weekDate2 = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; } + if (weekDate1 > weekDate2) + { + model.CompileDate = weekDate1; + } + else + { + model.CompileDate = weekDate2; + } + //if (SgzbCount == 0 && newSgzbCount > 0) + //{ + // model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + //} + //else if (SgzbCount > 0) + //{ + // model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + //} allList.Add(model); //质量月报 @@ -652,13 +689,31 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary var SgybCount = list19.Where(x => x.ProjectId == pid).ToList().Count; var newSgybCount = list19_2.Where(x => x.ProjectId == pid).ToList().Count; model.SummeryResult = (SgybCount+ newSgybCount).ToString(); - if (newSgybCount > 0 && SgybCount == 0) + //if (newSgybCount > 0 && SgybCount == 0) + //{ + // model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + //} + //else if (SgybCount > 0) + //{ + // model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + //} + DateTime? monthDate1 = Convert.ToDateTime("1900-01-01"); + DateTime? monthDate2= Convert.ToDateTime("1900-01-01"); + if (SgybCount > 0) { - model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + monthDate1 = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; } - else if (SgybCount > 0) + if (newSgybCount > 0) { - model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + monthDate2 = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + } + if (monthDate1 > monthDate2) + { + model.CompileDate = monthDate1; + } + else + { + model.CompileDate = monthDate2; } allList.Add(model); @@ -967,9 +1022,9 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary else if (column.ColumnID == "ThisProject" + (i + 1).ToString()) { //指定哪些列再做二次加载 if (MenuC=="安全巡检"|| MenuC == "周例会" || MenuC == "安全领导小组会议" || MenuC == "作业票" || MenuC == "工程师日志" || MenuC == "HSE管理月报" - || MenuC == "质量巡检"|| MenuC == "设备材料报验" || MenuC == "人员报验" || MenuC == "机具报验" - || MenuC == "设计变更单管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NCR" || MenuC == "质量周报" - || MenuC == "质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项") + || MenuC == "质量巡检"|| MenuC == "设备材料报验管理" || MenuC == "人员报验管理" || MenuC == "施工机具/计量器具报验管理" + || MenuC == "设计变更管理" || MenuC == "施工方案管理"|| MenuC == "设计交底管理" || MenuC == "NRC管理" || MenuC == "项目质量周报" + || MenuC == "项目质量月报" || MenuC == "一次共检合格数" || MenuC == "关键事项") { var rq = MidStrEx(html, "\"", "\""); var num = MidStrEx(html, ">", "<"); diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index 72b5f81f..c2780bf7 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -1,31 +1,36 @@  - - + + + + + + + - - - - - + + + + - - - - + + + + + - + - - - + + + @@ -48,7 +53,7 @@ - + @@ -59,9 +64,4 @@ - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Personal.xml b/SGGL/FineUIPro.Web/common/Menu_Personal.xml index a9d07855..2854ffd9 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Personal.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Personal.xml @@ -6,7 +6,4 @@ - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml index 1c0402e8..b1a26ee1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml +++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml @@ -46,12 +46,12 @@ - - - - + + + + @@ -69,11 +69,9 @@ - - @@ -121,8 +119,8 @@ - - + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml index 4d3b9e97..91d9fd84 100644 --- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml +++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml @@ -1,21 +1,3 @@  - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml index 69859890..ed44c8fe 100644 --- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml @@ -83,8 +83,4 @@ - - - - \ No newline at end of file