1210-gaofei

DataBase/版本日志/SGGLDB_V2021-12-10-001.sql

@@ -0,0 +1,2 @@
+alter table [dbo].[HSSESystem_SafetyInstitution] add SafetyInstitutionCode nvarchar(50) null
+GO

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;

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
+

SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx

@@ -14,15 +14,19 @@
     <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
         ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
         <Items>
-            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全制度" EnableCollapse="true"
+            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="安全制度" EnableCollapse="true" ForceFit="true"
                 runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="SafetyInstitutionId"
                 AllowCellEditing="true" ClicksToEdit="2" DataIDField="SafetyInstitutionId" AllowSorting="true"
-                SortField="EffectiveDate" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
+                SortField="SafetyInstitutionCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
                 IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
                 EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                 <Toolbars>
                     <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
+                            <f:TextBox runat="server" Label="制度编号" ID="txtSafetyInstitutionCode" EmptyText="输入查询条件"
+                                AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
+                                LabelAlign="right">
+                            </f:TextBox>
                             <f:TextBox runat="server" Label="制度名称" ID="txtSafetyInstitutionName" EmptyText="输入查询条件"
                                 AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px"
                                 LabelAlign="right">
@@ -53,7 +57,11 @@
                             <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
                         </ItemTemplate>
                     </f:TemplateField>
-                    <f:RenderField Width="140px" ColumnID="SafetyInstitutionName" DataField="SafetyInstitutionName" ExpandUnusedSpace="True"
+                    <f:RenderField Width="150px" ColumnID="SafetyInstitutionCode" DataField="SafetyInstitutionCode" 
+                        SortField="SafetyInstitutionName" FieldType="String" HeaderText="制度编号" HeaderTextAlign="Center"
+                        TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="180px" ColumnID="SafetyInstitutionName" DataField="SafetyInstitutionName" 
                         SortField="SafetyInstitutionName" FieldType="String" HeaderText="制度名称" HeaderTextAlign="Center"
                         TextAlign="Left">
                     </f:RenderField>

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<SqlParameter> listStr = new List<SqlParameter>();
+            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";

SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitution.aspx.designer.cs

@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.HSSESystem {
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
         
+        /// <summary>
+        /// txtSafetyInstitutionCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSafetyInstitutionCode;
+        
         /// <summary>
         /// txtSafetyInstitutionName 控件。
         /// </summary>

SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx

@@ -17,7 +17,7 @@
         <Rows>
             <f:FormRow>
                 <Items>                    
-                    <f:TextBox ID="txtTitle" runat="server" Label="制度名称" Required="true" ShowRedStar="true"
+                    <f:TextBox ID="txtCode" runat="server" Label="制度编号" Required="true" ShowRedStar="true"
                         LabelAlign="Right" MaxLength="50" FocusOnPageLoad="true">
                     </f:TextBox>
                     <f:DatePicker ID="txtEffectiveDate" runat="server" Label="发布日期" LabelAlign="Right"
@@ -25,6 +25,13 @@
                     </f:DatePicker>
                 </Items>
             </f:FormRow>
+            <f:FormRow>
+                <Items>                    
+                    <f:TextBox ID="txtTitle" runat="server" Label="制度名称" Required="true" ShowRedStar="true"
+                        LabelAlign="Right" MaxLength="50" FocusOnPageLoad="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
             <f:FormRow>
                 <Items>                   
                     <f:TextBox ID="txtScope" runat="server" Label="适用范围" LabelAlign="Right" MaxLength="500">

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(),

SGGL/FineUIPro.Web/ZHGL/HSSESystem/SafetyInstitutionEdit.aspx.designer.cs

@@ -40,13 +40,13 @@ namespace FineUIPro.Web.ZHGL.HSSESystem {
         protected global::FineUIPro.Form SimpleForm1;
         
         /// <summary>
-        /// txtTitle 控件。
+        /// txtCode 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtTitle;
+        protected global::FineUIPro.TextBox txtCode;
         
         /// <summary>
         /// txtEffectiveDate 控件。
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.HSSESystem {
         /// </remarks>
         protected global::FineUIPro.DatePicker txtEffectiveDate;
         
+        /// <summary>
+        /// txtTitle 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtTitle;
+        
         /// <summary>
         /// txtScope 控件。
         /// </summary>

SGGL/Model/Model.cs

@@ -6972,14 +6972,6 @@ namespace Model
 			}
 		}
 		
-		public System.Data.Linq.Table<Temp_tableSpaceInfo> Temp_tableSpaceInfo
-		{
-			get
-			{
-				return this.GetTable<Temp_tableSpaceInfo>();
-			}
-		}
-		
 		public System.Data.Linq.Table<Test_TestPlan> 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