diff --git a/DataBase/版本日志/SGGLDB_WH_2025-06-22.sql b/DataBase/版本日志/SGGLDB_WH_2025-06-22.sql new file mode 100644 index 00000000..ee603cec --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2025-06-22.sql @@ -0,0 +1,5 @@ + +alter table dbo.Solution_LargerHazard add HazardName nvarchar(200) +go + + diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs index fd9a14d2..9a5b5118 100644 --- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs +++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs @@ -32,6 +32,7 @@ namespace BLL { HazardId = largerHazard.HazardId, HazardCode = largerHazard.HazardCode, + HazardName = largerHazard.HazardName, HazardType = largerHazard.HazardType, ProjectId = largerHazard.ProjectId, Address = largerHazard.Address, @@ -43,7 +44,8 @@ namespace BLL States = largerHazard.States, TrainPersonNum = largerHazard.TrainPersonNum, IsSuperLargerHazard = largerHazard.IsSuperLargerHazard, - Descriptions = largerHazard.Descriptions + Descriptions = largerHazard.Descriptions, + OperativesNum = largerHazard.OperativesNum }; db.Solution_LargerHazard.InsertOnSubmit(newLargerHazard); @@ -73,6 +75,7 @@ namespace BLL if (newLargerHazard != null) { newLargerHazard.HazardCode = largerHazard.HazardCode; + newLargerHazard.HazardName = largerHazard.HazardName; newLargerHazard.HazardType = largerHazard.HazardType; newLargerHazard.ProjectId = largerHazard.ProjectId; newLargerHazard.Address = largerHazard.Address; @@ -84,6 +87,8 @@ namespace BLL newLargerHazard.TrainPersonNum = largerHazard.TrainPersonNum; newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard; newLargerHazard.Descriptions = largerHazard.Descriptions; + newLargerHazard.IsUpdate = null; + newLargerHazard.OperativesNum = largerHazard.OperativesNum; db.SubmitChanges(); //判断是否有数据 有数据则更新 没有数据则添加 var majorPlanApproval = BLL.MajorPlanApprovalService.GetMajorPlanApprovalById(largerHazard.HazardId); @@ -118,11 +123,11 @@ namespace BLL db.SubmitChanges(); } } - + #region 同时编辑一条到质量管理中的危大（超危大）工程专项施工管理 private static void AddMajorPlanApproval(Model.Solution_LargerHazard largerHazard) { - + Model.SGGLDB db = Funs.DB; Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval(); newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId; @@ -140,8 +145,8 @@ namespace BLL db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval); db.SubmitChanges(); } - - + + private static void UpdateMajorPlanApproval(Model.Solution_LargerHazard largerHazard) { Model.SGGLDB db = Funs.DB; @@ -162,8 +167,8 @@ namespace BLL db.SubmitChanges(); } } - - + + #endregion } } diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index da1a411c..84f231d3 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -2083,7 +2083,7 @@ namespace BLL CollCropCode = thisUnit.CollCropCode, DataDate = x.RecordTime, AttachFile = AttachFileService.getFileUrl(x.HazardId.ToString()), - //HazardName = x.HazardName, + HazardName = x.HazardName, TypeName = db.Sys_Const.FirstOrDefault(y => y.ConstValue == x.HazardType && y.GroupId == ConstValue.Group_LargerHazardType).ConstText, IsSuperLargerHazard = x.IsSuperLargerHazard, @@ -2282,7 +2282,7 @@ namespace BLL CollCropCode = thisUnit.CollCropCode, DataDate = x.RecordTime, AttachFile = AttachFileService.getFileUrl(x.HazardId.ToString()), - //HazardName = x.HazardName, + HazardName = x.HazardName, TypeName = db.Sys_Const.FirstOrDefault(y => y.ConstValue == x.HazardType && y.GroupId == ConstValue.Group_LargerHazardType).ConstText, IsSuperLargerHazard = x.IsSuperLargerHazard, diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx index f5422a15..de8e9f5f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx @@ -1,4 +1,5 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="LargerHazardEdit.aspx.cs" ValidateRequest="false" Inherits="FineUIPro.Web.HSSE.Solution.LargerHazardEdit" %> + @@ -7,221 +8,236 @@
- - - - - - - - - - - - - - - - - - - - <%-- --%> - <%-- --%> - - + + + + + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - + + + + + + + + + + + <%-- --%> + <%-- --%> + + + + + - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - - - - - - - -
-
-
-
- - - - - - - - - - - - <%-- - <%-- OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%> - <%-- --%> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + + + + + + + +
+
+
+
+ + + + + + + + + + + + <%-- + <%-- OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1"> --%> + <%-- --%> + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs index 3187f469..59214fdf 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs @@ -101,9 +101,14 @@ namespace FineUIPro.Web.HSSE.Solution { 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; + this.txtHazardName.Text = largerHazard.HazardName; } else { @@ -193,11 +198,13 @@ namespace FineUIPro.Web.HSSE.Solution 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 = this.drpStates.SelectedValue, + HazardName = txtHazardName.Text.Trim() }; if (!string.IsNullOrEmpty(this.HazardId)) { diff --git a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs index 0e831e85..71dc9763 100644 --- a/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs @@ -41,6 +41,15 @@ namespace FineUIPro.Web.HSSE.Solution /// protected global::FineUIPro.Form SimpleForm1; + /// + /// txtHazardName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHazardName; + /// /// txtLargerHazardCode 控件。 /// @@ -122,6 +131,33 @@ namespace FineUIPro.Web.HSSE.Solution /// protected global::FineUIPro.DropDownList drpStates; + /// + /// txtOperativesNum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtOperativesNum; + + /// + /// txtOperativesNum1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtOperativesNum1; + + /// + /// txtOperativesNum2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtOperativesNum2; + /// /// txtDescriptions 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 1094ca83..27c198f6 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -355462,6 +355462,8 @@ namespace Model private System.Nullable _IsUpdate; + private string _HazardName; + private EntityRef _Base_Project; private EntityRef _Sys_User; @@ -355502,6 +355504,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() @@ -355839,6 +355843,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HazardName", DbType="NVarChar(200)")] + 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_LargerSolution_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project {