From 19a14a33f0ad85d15170128fcfe1d385512cd054 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Mon, 23 Jun 2025 11:22:26 +0800 Subject: [PATCH] 1 --- .../SGGLDB_V2025-06-23-001-gaofei.sql | 2 + SGGL/BLL/HSSE/Solution/LargerHazardService.cs | 17 +- .../HSSE/Solution/LargerHazardEdit.aspx | 84 +++++-- .../HSSE/Solution/LargerHazardEdit.aspx.cs | 220 ++++++++++++++---- .../LargerHazardEdit.aspx.designer.cs | 212 +++++++++++++---- SGGL/Model/Model.cs | 24 ++ 6 files changed, 443 insertions(+), 116 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2025-06-23-001-gaofei.sql diff --git a/DataBase/版本日志/SGGLDB_V2025-06-23-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-06-23-001-gaofei.sql new file mode 100644 index 00000000..67e59ec5 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-06-23-001-gaofei.sql @@ -0,0 +1,2 @@ +alter table Solution_LargerHazard add HazardName nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs index d4e8cd15..df047acf 100644 --- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs +++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs @@ -1,4 +1,8 @@ -using System.Linq; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Collections; namespace BLL { @@ -26,6 +30,7 @@ namespace BLL Model.SGGLDB db = Funs.DB; Model.Solution_LargerHazard newLargerHazard = new Model.Solution_LargerHazard { + HazardName=largerHazard.HazardName, HazardId = largerHazard.HazardId, HazardCode = largerHazard.HazardCode, HazardType = largerHazard.HazardType, @@ -37,7 +42,10 @@ namespace BLL RecardMan = largerHazard.RecardMan, Remark = largerHazard.Remark, States = largerHazard.States, - Descriptions = largerHazard.Descriptions + TrainPersonNum = largerHazard.TrainPersonNum, + IsSuperLargerHazard = largerHazard.IsSuperLargerHazard, + Descriptions = largerHazard.Descriptions, + OperativesNum = largerHazard.OperativesNum }; db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard); @@ -56,6 +64,7 @@ namespace BLL Model.Solution_LargerHazard newLargerHazard = db.Solution_LargerHazard.FirstOrDefault(e => e.HazardId == largerHazard.HazardId); if (newLargerHazard != null) { + newLargerHazard.HazardName = largerHazard.HazardName; newLargerHazard.HazardCode = largerHazard.HazardCode; newLargerHazard.HazardType = largerHazard.HazardType; newLargerHazard.ProjectId = largerHazard.ProjectId; @@ -64,8 +73,12 @@ namespace BLL newLargerHazard.IsArgument = largerHazard.IsArgument; newLargerHazard.Remark = largerHazard.Remark; newLargerHazard.States = largerHazard.States; + newLargerHazard.TrainPersonNum = largerHazard.TrainPersonNum; + newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard; newLargerHazard.Descriptions = largerHazard.Descriptions; + newLargerHazard.RecordTime = largerHazard.RecordTime; newLargerHazard.IsUpdate = null; + newLargerHazard.OperativesNum = largerHazard.OperativesNum; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx index c5fb1a63..b80f3c44 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx @@ -1,5 +1,4 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargerHazardEdit.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Solution.LargerHazardEdit" %> -<%@ Register Src="~/Controls/FlowOperateControl.ascx" TagName="FlowOperateControl" TagPrefix="uc1" %> @@ -13,13 +12,22 @@ BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right"> + + + + + + + + + + - + @@ -30,9 +38,31 @@ - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + --%> + + + + + + + + + + + + + + + + + - - - - + @@ -79,7 +125,7 @@ diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs index dc2b9f23..8162cf81 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs @@ -1,5 +1,6 @@ using BLL; using System; +using System.Linq; using System.Web; namespace FineUIPro.Web.HSSE.Solution @@ -53,7 +54,8 @@ namespace FineUIPro.Web.HSSE.Solution BLL.ConstValue.InitConstValueDropDownList(this.drpHazardType, ConstValue.Group_LargerHazardType, true); //是否需要专家论证 BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsArgument, ConstValue.Group_0001, "False"); - + //是否超危大工程 + BLL.ConstValue.InitConstValueRadioButtonList(this.rblIsSuperLargerHazard, ConstValue.Group_0001, "False"); this.HazardId = Request.Params["HazardId"]; var largerHazard = BLL.LargerHazardService.GetLargerHazardByHazardId(this.HazardId); if (largerHazard != null) @@ -81,8 +83,26 @@ namespace FineUIPro.Web.HSSE.Solution { this.rblIsArgument.SelectedValue = "False"; } + if (largerHazard.IsSuperLargerHazard == true) + { + this.rblIsSuperLargerHazard.SelectedValue = "True"; + } + else + { + this.rblIsSuperLargerHazard.SelectedValue = "False"; + } + if (largerHazard.TrainPersonNum != null) + { + this.txtTrainPersonNum.Text = largerHazard.TrainPersonNum.ToString(); + } + if (largerHazard.OperativesNum != null) + { + this.txtOperativesNum.Text = largerHazard.OperativesNum.ToString(); + } + this.drpStates.SelectedValue = largerHazard.States; this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark); this.txtDescriptions.Text = largerHazard.Descriptions; + txtHazardName.Text = largerHazard.HazardName; } else { @@ -92,38 +112,10 @@ namespace FineUIPro.Web.HSSE.Solution this.txtRemark.Text = HttpUtility.HtmlDecode("描述"); this.txtRecordTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); } - ///初始化审核菜单 - this.ctlAuditFlow.MenuId = BLL.Const.ProjectLargerHazardListMenuId; - this.ctlAuditFlow.DataId = this.HazardId; - this.ctlAuditFlow.ProjectId = this.ProjectId; - this.ctlAuditFlow.UnitId = this.CurrUser.UnitId; } } #endregion - #region 提交按钮 - /// - /// 提交按钮 - /// - /// - /// - protected void btnSubmit_Click(object sender, EventArgs e) - { - if (this.drpHazardType.SelectedValue == BLL.Const._Null) - { - ShowNotify("请选择类型！", MessageBoxIcon.Warning); - return; - } - if (this.ctlAuditFlow.NextStep == BLL.Const.State_1 && this.ctlAuditFlow.NextPerson == BLL.Const._Null) - { - ShowNotify("请选择下一步办理人！", MessageBoxIcon.Warning); - return; - } - this.SaveData(BLL.Const.BtnSubmit); - PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } - #endregion - #region 保存按钮 /// /// 保存按钮 @@ -155,17 +147,16 @@ namespace FineUIPro.Web.HSSE.Solution Address = this.txtAddress.Text.Trim(), ExpectedTime = Funs.GetNewDateTime(this.txtExpectedTime.Text.Trim()), IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), + IsSuperLargerHazard = Convert.ToBoolean(this.rblIsSuperLargerHazard.SelectedValue), + TrainPersonNum = Funs.GetNewIntOrZero(this.txtTrainPersonNum.Text.Trim()), + OperativesNum = Funs.GetNewIntOrZero(this.txtOperativesNum.Text.Trim()), Remark = HttpUtility.HtmlEncode(this.txtRemark.Text.Trim()), Descriptions = this.txtDescriptions.Text.Trim(), RecordTime = Funs.GetNewDateTime(this.txtRecordTime.Text.Trim()), ProjectId = this.ProjectId, - ////单据状态 - States = BLL.Const.State_0 + States = this.drpStates.SelectedValue, + HazardName = txtHazardName.Text.Trim() }; - if (type == BLL.Const.BtnSubmit) - { - largerHazard.States = this.ctlAuditFlow.NextStep; - } if (!string.IsNullOrEmpty(this.HazardId)) { largerHazard.HazardId = this.HazardId; @@ -175,28 +166,170 @@ namespace FineUIPro.Web.HSSE.Solution else { largerHazard.HazardId = SQLHelper.GetNewID(typeof(Model.Solution_LargerHazard)); - largerHazard.RecardMan = this.CurrUser.PersonId; + largerHazard.RecardMan = this.CurrUser.UserId; this.HazardId = largerHazard.HazardId; BLL.LargerHazardService.AddLargerHazard(largerHazard); BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnAdd); + + #region 修改2024-6-23 11:36:39 如果是专家论证，加到专家论证清单中 + if (rblIsArgument.SelectedValue == "True") + { + var LargerHazardListId = SQLHelper.GetNewID(); + var txtHazardCode = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectExpertArgumentMenuId, this.CurrUser.LoginProjectId, this.CurrUser.UnitId); + Model.Solution_LargerHazardList newRecord = new Model.Solution_LargerHazardList + { + LargerHazardListId = LargerHazardListId, + HazardCode = txtHazardCode, + ProjectId = this.CurrUser.LoginProjectId, + RecordTime = Funs.GetNewDateTime(this.txtRecordTime.Text), + VersionNo = "V1.0", + RecardManId = this.CurrUser.UserId, + ////单据状态 + States = BLL.Const.State_1, + }; + + BLL.ExpertArgumentService.AddLargerHazardList(newRecord); + //子项 + Model.Solution_LargerHazardListItem itemModel = new Model.Solution_LargerHazardListItem(); + itemModel.LargerHazardListItemId = SQLHelper.GetNewID(); + itemModel.SortIndex = 1; + itemModel.LargerHazardListId = LargerHazardListId; + itemModel.ExpectedStartTime = txtExpectedTime.SelectedDate; + itemModel.IsArgument = true; + Funs.DB.Solution_LargerHazardListItem.InsertOnSubmit(itemModel); + Funs.DB.SubmitChanges(); + } + #endregion } - ////保存流程审核数据 - this.ctlAuditFlow.btnSaveData(this.ProjectId, BLL.Const.ProjectLargerHazardListMenuId, this.HazardId, (type == BLL.Const.BtnSubmit ? true : false), this.drpHazardType.SelectedItem.Text, "../Solution/LargerHazardView.aspx?HazardId={0}"); + //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation); + //Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject); } #region 附件上传 /// - /// 上传附件 + /// 上传审批页 /// /// /// - protected void btnAttachUrl_Click(object sender, EventArgs e) + protected void btnAttachUrl1_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(this.HazardId)) { SaveNew(); } - PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId, BLL.Const.ProjectLargerHazardListMenuId))); + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "1", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传会签页 + /// + /// + /// + protected void btnAttachUrl2_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "2", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传方案内容 + /// + /// + /// + protected void btnAttachUrl3_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazardWord&menuId={1}", this.HazardId + "3", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传专项培训 + /// + /// + /// + protected void btnAttachUrl4_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "4", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传安全技术交底 + /// + /// + /// + protected void btnAttachUrl5_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "5", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传旁站 + /// + /// + /// + protected void btnAttachUrl6_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "6", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传验收 + /// + /// + /// + protected void btnAttachUrl7_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "7", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传监测 + /// + /// + /// + protected void btnAttachUrl8_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "8", BLL.Const.ProjectLargerHazardListMenuId))); + } + + /// + /// 上传隐患 + /// + /// + /// + protected void btnAttachUrl9_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.HazardId)) + { + SaveNew(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/LargerHazard&menuId={1}", this.HazardId + "9", BLL.Const.ProjectLargerHazardListMenuId))); } #endregion @@ -211,10 +344,9 @@ namespace FineUIPro.Web.HSSE.Solution IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue), Remark = HttpUtility.HtmlEncode(this.txtRemark.Text.Trim()), ProjectId = this.ProjectId, - ////单据状态 - States = BLL.Const.State_0, + States = this.drpStates.SelectedValue, HazardId = SQLHelper.GetNewID(typeof(Model.Solution_LargerHazard)), - RecardMan = this.CurrUser.PersonId, + RecardMan = this.CurrUser.UserId, RecordTime = Funs.GetNewDateTime(this.txtRecordTime.Text.Trim()) }; this.HazardId = largerHazard.HazardId; diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs index 7bf9fe62..143d080e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HSSE.Solution { - - - public partial class LargerHazardEdit { - +namespace FineUIPro.Web.HSSE.Solution +{ + + + public partial class LargerHazardEdit + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// SimpleForm1 控件。 /// @@ -38,7 +40,16 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Form SimpleForm1; - + + /// + /// txtHazardName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHazardName; + /// /// txtLargerHazardCode 控件。 /// @@ -47,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtLargerHazardCode; - + /// /// drpHazardType 控件。 /// @@ -56,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpHazardType; - + /// /// txtExpectedTime 控件。 /// @@ -65,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtExpectedTime; - + /// /// rblIsArgument 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.RadioButtonList rblIsArgument; - + /// /// txtRecordTime 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtRecordTime; - + /// /// txtAddress 控件。 /// @@ -92,7 +103,61 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtAddress; - + + /// + /// rblIsSuperLargerHazard 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsSuperLargerHazard; + + /// + /// txtTrainPersonNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtTrainPersonNum; + + /// + /// drpStates 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpStates; + + /// + /// txtOperativesNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtOperativesNum; + + /// + /// txtOperativesNum1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtOperativesNum1; + + /// + /// txtOperativesNum2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtOperativesNum2; + /// /// txtDescriptions 控件。 /// @@ -101,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtDescriptions; - + /// /// txtRemark 控件。 /// @@ -110,25 +175,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HtmlEditor txtRemark; - - /// - /// ContentPanel1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.ContentPanel ContentPanel1; - - /// - /// ctlAuditFlow 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Web.Controls.FlowOperateControl ctlAuditFlow; - + /// /// Toolbar1 控件。 /// @@ -137,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// lbTemp 控件。 /// @@ -146,16 +193,88 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lbTemp; - + /// - /// btnAttachUrl 控件。 + /// btnAttachUrl1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Button btnAttachUrl; - + protected global::FineUIPro.Button btnAttachUrl1; + + /// + /// btnAttachUrl2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl2; + + /// + /// btnAttachUrl3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl3; + + /// + /// btnAttachUrl4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl4; + + /// + /// btnAttachUrl5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl5; + + /// + /// btnAttachUrl6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl6; + + /// + /// btnAttachUrl7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl7; + + /// + /// btnAttachUrl8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl8; + + /// + /// btnAttachUrl9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl9; + /// /// ToolbarFill1 控件。 /// @@ -164,7 +283,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -173,16 +292,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - - /// - /// btnSubmit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSubmit; - + /// /// btnClose 控件。 /// @@ -191,7 +301,7 @@ namespace FineUIPro.Web.HSSE.Solution { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnClose; - + /// /// WindowAtt 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 0eb9c146..68ebc382 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -243984,6 +243984,8 @@ namespace Model private System.Nullable _IsUpdate; + private string _HazardName; + private EntityRef _Person_Persons; private EntityRef _Base_Project; @@ -244024,6 +244026,8 @@ namespace Model partial void OnOperativesNumChanged(); partial void OnIsUpdateChanging(System.Nullable value); partial void OnIsUpdateChanged(); + partial void OnHazardNameChanging(string value); + partial void OnHazardNameChanged(); #endregion public Solution_LargerHazard() @@ -244361,6 +244365,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardName", DbType="NVarChar(50)")] + public string HazardName + { + get + { + return this._HazardName; + } + set + { + if ((this._HazardName != value)) + { + this.OnHazardNameChanging(value); + this.SendPropertyChanging(); + this._HazardName = value; + this.SendPropertyChanged("HazardName"); + this.OnHazardNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Solution_LargerHazard_Person_Persons_RecardMan", Storage="_Person_Persons", ThisKey="RecardMan", OtherKey="PersonId", IsForeignKey=true)] public Person_Persons Person_Persons {