From 92fec76ac464f9cf25e687ae3e43102050e201c7 Mon Sep 17 00:00:00 2001 From: gaofei <231232131@163.com> Date: Fri, 10 Dec 2021 09:56:20 +0800 Subject: [PATCH] 1210-gaofei --- .../版本日志/SGGLDB_V2021-12-10-001.sql | 2 + .../ServerSafetyInstitutionService.cs | 2 + SGGL/FineUIPro.Web/ErrLog.txt | 58 +++++++ .../ZHGL/HSSESystem/SafetyInstitution.aspx | 14 +- .../ZHGL/HSSESystem/SafetyInstitution.aspx.cs | 6 + .../SafetyInstitution.aspx.designer.cs | 9 + .../HSSESystem/SafetyInstitutionEdit.aspx | 9 +- .../HSSESystem/SafetyInstitutionEdit.aspx.cs | 2 + .../SafetyInstitutionEdit.aspx.designer.cs | 13 +- SGGL/Model/Model.cs | 157 ++++-------------- 10 files changed, 137 insertions(+), 135 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2021-12-10-001.sql diff --git a/DataBase/版本日志/SGGLDB_V2021-12-10-001.sql b/DataBase/版本日志/SGGLDB_V2021-12-10-001.sql new file mode 100644 index 00000000..d41d257a --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-12-10-001.sql @@ -0,0 +1,2 @@ +alter table [dbo].[HSSESystem_SafetyInstitution] add SafetyInstitutionCode nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs index 3ffc5418..d9d36c2b 100644 --- a/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs +++ b/SGGL/BLL/HSSE/HSSESystem/ServerSafetyInstitutionService.cs @@ -29,6 +29,7 @@ namespace BLL Model.HSSESystem_SafetyInstitution newSafetyInstitution = new Model.HSSESystem_SafetyInstitution { SafetyInstitutionId = safetyInstitution.SafetyInstitutionId, + SafetyInstitutionCode=safetyInstitution.SafetyInstitutionCode, SafetyInstitutionName = safetyInstitution.SafetyInstitutionName, EffectiveDate = safetyInstitution.EffectiveDate, Scope = safetyInstitution.Scope, @@ -49,6 +50,7 @@ namespace BLL Model.HSSESystem_SafetyInstitution newSafetyInstitution = db.HSSESystem_SafetyInstitution.FirstOrDefault(e => e.SafetyInstitutionId == safetyInstitution.SafetyInstitutionId); if (newSafetyInstitution != null) { + newSafetyInstitution.SafetyInstitutionCode = safetyInstitution.SafetyInstitutionCode; newSafetyInstitution.SafetyInstitutionName = safetyInstitution.SafetyInstitutionName; newSafetyInstitution.EffectiveDate = safetyInstitution.EffectiveDate; newSafetyInstitution.Scope = safetyInstitution.Scope; diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..e4243e68 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,58 @@ + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) + 在 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 在 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 在 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 在 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 在 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 在 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 在 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 在 BLL.CNCECHSSEService.HSSEService.GetSupervise_SubUnitReportListToSUB() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1013 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:12/08/2021 11:00:20 +出错时间:12/08/2021 11:00:20 + + +错误信息开始=====> +错误类型:EndpointNotFoundException +错误信息:没有终结点在侦听可以接受消息的 http://localhost/CNCECHSSE/HSSEService.svc。这通常是由于不正确的地址或者 SOAP 操作导致的。如果存在此情况，请参见 InnerException 以了解详细信息。 +错误堆栈: + +Server stack trace: + 在 System.ServiceModel.Channels.HttpChannelUtilities.ProcessGetResponseWebException(WebException webException, HttpWebRequest request, HttpAbortReason abortReason) + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) + 在 System.ServiceModel.Channels.RequestChannel.Request(Message message, TimeSpan timeout) + 在 System.ServiceModel.Dispatcher.RequestChannelBinder.Request(Message message, TimeSpan timeout) + 在 System.ServiceModel.Channels.ServiceChannel.Call(String action, Boolean oneway, ProxyOperationRuntime operation, Object[] ins, Object[] outs, TimeSpan timeout) + 在 System.ServiceModel.Channels.ServiceChannelProxy.InvokeService(IMethodCallMessage methodCall, ProxyOperationRuntime operation) + 在 System.ServiceModel.Channels.ServiceChannelProxy.Invoke(IMessage message) + +Exception rethrown at [0]: + 在 System.Runtime.Remoting.Proxies.RealProxy.HandleReturnMessage(IMessage reqMsg, IMessage retMsg) + 在 System.Runtime.Remoting.Proxies.RealProxy.PrivateInvoke(MessageData& msgData, Int32 type) + 在 BLL.CNCECHSSEService.HSSEService.GetSupervise_SubUnitReportListToSUB() + 在 BLL.CNCECHSSEWebService.getSupervise_SubUnitReport() 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\WebService\CNCECHSSEWebService.cs:行号 1013 +----错误类型:WebException +----错误信息: +----远程服务器返回错误: (404) 未找到。 +----错误堆栈: + 在 System.Net.HttpWebRequest.GetResponse() + 在 System.ServiceModel.Channels.HttpChannelFactory`1.HttpRequestChannel.HttpChannelRequest.WaitForReply(TimeSpan timeout) +出错时间:12/10/2021 09:49:08 +出错时间:12/10/2021 09:49:09 + diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx index 80c0ac07..19253e2f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx @@ -14,15 +14,19 @@ - + + @@ -53,7 +57,11 @@ - + + diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs index a60192c1..7f903e2f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.cs @@ -40,6 +40,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem private void BindGrid() { string strSql = "SELECT SafetyInstitution.SafetyInstitutionId" + + @",SafetyInstitution.SafetyInstitutionCode" + @",SafetyInstitution.SafetyInstitutionName" + @",SafetyInstitution.EffectiveDate" + @",SafetyInstitution.Scope" @@ -48,6 +49,11 @@ namespace FineUIPro.Web.ZHGL.HSSESystem + @" FROM HSSESystem_SafetyInstitution AS SafetyInstitution " + @" WHERE 1=1 "; List listStr = new List(); + if (!string.IsNullOrEmpty(this.txtSafetyInstitutionCode.Text.Trim())) + { + strSql += " AND SafetyInstitution.SafetyInstitutionCode LIKE @SafetyInstitutionCode"; + listStr.Add(new SqlParameter("@SafetyInstitutionCode", "%" + this.txtSafetyInstitutionCode.Text.Trim() + "%")); + } if (!string.IsNullOrEmpty(this.txtSafetyInstitutionName.Text.Trim())) { strSql += " AND SafetyInstitution.SafetyInstitutionName LIKE @SafetyInstitutionName"; diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.designer.cs index 5c423830..1423df44 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.designer.cs @@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.HSSESystem { /// protected global::FineUIPro.Toolbar Toolbar2; + /// + /// txtSafetyInstitutionCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSafetyInstitutionCode; + /// /// txtSafetyInstitutionName 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx index e898637b..cb47c7d2 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx @@ -17,7 +17,7 @@ - + + + + + + diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.cs index 6ffcce30..02368607 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.cs @@ -36,6 +36,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem Model.HSSESystem_SafetyInstitution safetyInstitution = BLL.ServerSafetyInstitutionService.GetSafetyInstitutionById(this.SafetyInstitutionId); if (safetyInstitution != null) { + this.txtCode.Text = safetyInstitution.SafetyInstitutionCode; this.txtTitle.Text = safetyInstitution.SafetyInstitutionName; if (safetyInstitution.EffectiveDate != null) { @@ -81,6 +82,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem { Model.HSSESystem_SafetyInstitution newSafetyInstitution = new Model.HSSESystem_SafetyInstitution { + SafetyInstitutionCode=this.txtCode.Text.Trim(), SafetyInstitutionName = this.txtTitle.Text.Trim(), EffectiveDate = Funs.GetNewDateTime(this.txtEffectiveDate.Text.Trim()), Scope = this.txtScope.Text.Trim(), diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.designer.cs index 01a8b549..a6b56dcf 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.designer.cs @@ -40,13 +40,13 @@ namespace FineUIPro.Web.ZHGL.HSSESystem { protected global::FineUIPro.Form SimpleForm1; /// - /// txtTitle 控件。 + /// txtCode 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtTitle; + protected global::FineUIPro.TextBox txtCode; /// /// txtEffectiveDate 控件。 @@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.HSSESystem { /// protected global::FineUIPro.DatePicker txtEffectiveDate; + /// + /// txtTitle 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTitle; + /// /// txtScope 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 02d3e3d9..02cc4fb2 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -6972,14 +6972,6 @@ namespace Model } } - public System.Data.Linq.Table Temp_tableSpaceInfo - { - get - { - return this.GetTable(); - } - } - public System.Data.Linq.Table Test_TestPlan { get @@ -136961,6 +136953,8 @@ namespace Model private string _AttachUrl; + private string _SafetyInstitutionCode; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -136979,6 +136973,8 @@ namespace Model partial void OnFileContentsChanged(); partial void OnAttachUrlChanging(string value); partial void OnAttachUrlChanged(); + partial void OnSafetyInstitutionCodeChanging(string value); + partial void OnSafetyInstitutionCodeChanged(); #endregion public HSSESystem_SafetyInstitution() @@ -137126,6 +137122,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SafetyInstitutionCode", DbType="NVarChar(50)")] + public string SafetyInstitutionCode + { + get + { + return this._SafetyInstitutionCode; + } + set + { + if ((this._SafetyInstitutionCode != value)) + { + this.OnSafetyInstitutionCodeChanging(value); + this.SendPropertyChanging(); + this._SafetyInstitutionCode = value; + this.SendPropertyChanged("SafetyInstitutionCode"); + this.OnSafetyInstitutionCodeChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -252961,7 +252977,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] public string Address { get @@ -253025,7 +253041,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")] public string WorkAreaName { get @@ -290969,123 +290985,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.temp_tableSpaceInfo")] - public partial class Temp_tableSpaceInfo - { - - private string _Name; - - private string _Rows; - - private string _Reserved; - - private string _Data; - - private string _Index_size; - - private string _Unused; - - public Temp_tableSpaceInfo() - { - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="name", Storage="_Name", DbType="NVarChar(128)")] - public string Name - { - get - { - return this._Name; - } - set - { - if ((this._Name != value)) - { - this._Name = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="rows", Storage="_Rows", DbType="Char(11)")] - public string Rows - { - get - { - return this._Rows; - } - set - { - if ((this._Rows != value)) - { - this._Rows = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reserved", Storage="_Reserved", DbType="VarChar(18)")] - public string Reserved - { - get - { - return this._Reserved; - } - set - { - if ((this._Reserved != value)) - { - this._Reserved = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="data", Storage="_Data", DbType="VarChar(18)")] - public string Data - { - get - { - return this._Data; - } - set - { - if ((this._Data != value)) - { - this._Data = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="index_size", Storage="_Index_size", DbType="VarChar(18)")] - public string Index_size - { - get - { - return this._Index_size; - } - set - { - if ((this._Index_size != value)) - { - this._Index_size = value; - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="unused", Storage="_Unused", DbType="VarChar(18)")] - public string Unused - { - get - { - return this._Unused; - } - set - { - if ((this._Unused != value)) - { - this._Unused = value; - } - } - } - } - [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Test_TestPlan")] public partial class Test_TestPlan : INotifyPropertyChanging, INotifyPropertyChanged { @@ -334951,7 +334850,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Address", DbType="NVarChar(200)")] public string Address { get @@ -334967,7 +334866,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaName", DbType="NVarChar(200)")] public string WorkAreaName { get