From 0c28c16c1d28591a0364adfa367c560c0fd11052 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Tue, 4 Jun 2024 16:10:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?20240604=20=E5=90=84=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=E6=B1=87=E6=80=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/ErrLog.txt | 378 ---------------------------------- SGGL/FineUIPro.Web/Web.config | 7 +- 2 files changed, 1 insertion(+), 384 deletions(-) diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 34442b9e..e69de29b 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1,378 +0,0 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000),@InspectionDate datetime)SELECT disti' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:32:58 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:32:58 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:03 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:03 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:04 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:04 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:05 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:05 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:05 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:05 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:05 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:05 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:05 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:05 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:05 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:05 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, - ' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:33:06 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:33:06 - - -错误信息开始=====> -错误类型:SqlException -错误信息:参数化查询 '(@ProjectId nvarchar(4000),@CNProfessionalId nvarchar(36))SELECT' 需要参数 '@ProjectId'，但未提供该参数。 -错误堆栈: - 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) - 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) - 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) - 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() - 在 System.Data.SqlClient.SqlDataReader.get_MetaData() - 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) - 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) - 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) - 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) - 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) - 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 - 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 (Button , EventArgs ) - 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) - 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/04/2024 15:38:02 -出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx -IP地址:::1 -操作人员:JT - -出错时间:06/04/2024 15:38:02 - diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index d9df6dc6..1b0a24a2 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -76,14 +76,9 @@ - -<<<<<<< HEAD - - -======= + ->>>>>>> 363445f49a2ce82ecbad44fdfafca159f7177d77 From 35c2b0350e5dd8ac92673659737a696150876b18 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 6 Jun 2024 15:48:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?20240606=20=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql | 1 + SGGL/BLL/Common/UploadAttachmentService.cs | 4 +- .../InspectionManagement.aspx.cs | 2 +- .../InspectionManagementEdit.aspx | 7 +- .../InspectionManagementEdit.aspx.cs | 30 +- .../InspectionManagementEdit.aspx.designer.cs | 4 +- .../CQMS/QualityPlanning/Organizational.aspx | 731 ++++++++---------- .../QualityPlanning/Organizational.aspx.cs | 17 +- .../Organizational.aspx.designer.cs | 36 +- .../File/Word/CQMS/分包质量管理组织机构图.doc | Bin 39645 -> 41188 bytes .../File/Word/CQMS/总包质量管理组织机构图.doc | Bin 19912 -> 19916 bytes SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- SGGL/FineUIPro.Web/Web.config | 154 ++-- .../res/images/Organizational.png | Bin 11018 -> 11471 bytes .../res/images/SubOrganizational.png | Bin 9776 -> 11460 bytes SGGL/WebAPI/WebAPI.csproj.user | 2 +- 16 files changed, 465 insertions(+), 525 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql new file mode 100644 index 00000000..4c35ee3e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2024-6-6-bwj.sql @@ -0,0 +1 @@ +update ProcessControl_InspectionManagement set IsOnceQualified=1 \ No newline at end of file diff --git a/SGGL/BLL/Common/UploadAttachmentService.cs b/SGGL/BLL/Common/UploadAttachmentService.cs index 2068250f..a38780e1 100644 --- a/SGGL/BLL/Common/UploadAttachmentService.cs +++ b/SGGL/BLL/Common/UploadAttachmentService.cs @@ -1,5 +1,6 @@ using NPOI.SS.UserModel; using System; +using System.Configuration; using System.IO; using System.Linq; using System.Web.UI.WebControls; @@ -74,13 +75,12 @@ namespace BLL string[] subUrl = url.Split('/'); string fileName = subUrl[subUrl.Count() - 1]; string newFileName = fileName.Substring(fileName.IndexOf("_") + 1); + htmlStr += "" + newFileName + ""; } } - htmlStr += ""; } - return htmlStr; } #endregion diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 009d120f..23638a38 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BP.Class, P.AcceptanceSite, P.AcceptanceCheckMan, - (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified, + (CASE WHEN IsOnceQualified='False' THEN '否' ELSE '是' END)AS IsOnceQualified, P.InspectionCode, P.InspectionDate" + @" FROM ProcessControl_InspectionManagement AS P " diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx index 8d3aeefb..a71031f5 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx @@ -29,7 +29,10 @@ - + <%----%> + + @@ -38,7 +41,7 @@ - + diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs index 1f6c5cd9..1887daf8 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs @@ -19,6 +19,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl GetButtonPower(); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true);//施工分包商 BLL.CNProfessionalService.InitCNProfessionalDownList(this.drpCNProfessionalId, true);//专业 + UserService.InitUserProjectIdUnitTypeDropDownList(this.drpAcceptanceCheckMan, this.CurrUser.LoginProjectId, string.Empty, false); this.hdInspectionNoticeId.Text = Request.Params["inspectionId"]; if (!string.IsNullOrEmpty(this.hdInspectionNoticeId.Text)) @@ -35,7 +36,11 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.drpCNProfessionalId.SelectedValue = inspectionManagement.CNProfessionalId; } this.txtAcceptanceSite.Text = inspectionManagement.AcceptanceSite; - this.txtAcceptanceCheckMan.Text = inspectionManagement.AcceptanceCheckMan; + //this.txtAcceptanceCheckMan.Text = ConvertCheckMan(inspectionManagement.AcceptanceCheckMan); + if (!string.IsNullOrEmpty(inspectionManagement.AcceptanceCheckMan)) + { + this.drpAcceptanceCheckMan.SelectedValueArray = inspectionManagement.AcceptanceCheckMan.Split(','); + } this.txtNoticeCode.Text = inspectionManagement.NoticeCode; this.hdParentDivisionProjectId.Text = inspectionManagement.ParentDivisionProjectId; if (inspectionManagement.IsOnceQualified.HasValue) @@ -100,18 +105,29 @@ namespace FineUIPro.Web.CQMS.ProcessControl } inspectionManagement.AcceptanceSite = this.txtAcceptanceSite.Text.Trim(); - inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); + //检查人 + string CheckManIds = string.Empty; + foreach (var item in this.drpAcceptanceCheckMan.SelectedValueArray) + { + CheckManIds += item + ","; + } + if (!string.IsNullOrEmpty(CheckManIds)) + { + CheckManIds = CheckManIds.Substring(0, CheckManIds.LastIndexOf(",")); + } + inspectionManagement.AcceptanceCheckMan = CheckManIds; + //inspectionManagement.AcceptanceCheckMan = this.txtAcceptanceCheckMan.Text.Trim(); if (!string.IsNullOrEmpty(this.rblIsOnceQualified.SelectedValue)) { - if (this.rblIsOnceQualified.SelectedValue == "True") - { - inspectionManagement.IsOnceQualified = true; - } - else + if (this.rblIsOnceQualified.SelectedValue == "False") { inspectionManagement.IsOnceQualified = false; inspectionManagement.UnqualifiedReason = this.txtUnqualifiedReason.Text.Trim(); } + else + { + inspectionManagement.IsOnceQualified = true; + } } inspectionManagement.InspectionCode = this.txtInspectionCode.Text.Trim(); inspectionManagement.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs index 537aa94a..a58621c0 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.designer.cs @@ -85,13 +85,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl { protected global::FineUIPro.TextBox txtAcceptanceSite; /// - /// txtAcceptanceCheckMan 控件。 + /// drpAcceptanceCheckMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtAcceptanceCheckMan; + protected global::FineUIPro.DropDownList drpAcceptanceCheckMan; /// /// rblIsOnceQualified 控件。 diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx index a8a44843..07777800 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx @@ -8,473 +8,380 @@ 质量管理组织机构
- -
+ +
- + + - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - + + + - - - + + - - - + + - - - + + - - + - - + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - + + + + + - - + - - - + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - + + - - + - - + - - + - - + - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
-   
+
+ -    + -        + + - - +
-    +
-     + -        + -           +
+
-   + -     + -       + -       +
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - -
- - - - - - - -     +
- - - - - - -
- - - - - - - - - - - - - - -
- - - - -       - - -        - - -
- - - - - - - - - - - - - - -
- - - - - - -      - - -        - - -
- - - - - - - - - - - - - - -
- - -   - -      - -          - -           - -
- - - - - - - - - - - - - - -
+ + + + + +
+ + + + + +   + + + + + + + +
diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs index 2897df0c..ee14d5df 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs @@ -24,6 +24,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning string projectId = this.CurrUser.LoginProjectId; string unitId = this.CurrUser.UnitId; + if (this.CurrUser.UserId == BLL.Const.hfnbdId) + { + unitId = BLL.Const.UnitId_CWCEC; + } + + this.divSubOrganizational.Visible = false; + this.divOrganizational.Visible = true; + this.ContentPanel1.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); var unit = (from x in Funs.DB.Project_ProjectUnit @@ -305,7 +313,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning name4 = name4.Substring(0, name4.LastIndexOf(',')); } } - this.Label8.Text = "施工经理：" + name4; + this.Label18.Text = "施工经理：" + name4; string name5 = string.Empty; var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); @@ -320,7 +328,7 @@ namespace FineUIPro.Web.CQMS.QualityPlanning name5 = name5.Substring(0, name5.LastIndexOf(',')); } } - this.Label9.Text = "质量经理：" + name5; + this.Label19.Text = "质量经理：" + name5; string name6 = string.Empty; var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); @@ -465,6 +473,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning var pModel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId); + if(this.CurrUser.UserId==BLL.Const.hfnbdId) + { + unitId = BLL.Const.UnitId_CWCEC; + } + var unit = (from x in Funs.DB.Project_ProjectUnit join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId where x.ProjectId == projectId diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs index f1b9ba02..14c9a168 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs @@ -246,24 +246,6 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { /// protected global::System.Web.UI.WebControls.Label Label20; - /// - /// Label21 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label21; - - /// - /// Label22 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label22; - /// /// Label23 控件。 /// @@ -308,5 +290,23 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label27; + + /// + /// Label21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label21; + + /// + /// Label22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label22; } } diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/分包质量管理组织机构图.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/分包质量管理组织机构图.doc index 12c8948e18aa896aba01ff718425e73a80fcf417..99dad5a461e09875975fbd46fd033aba71aa48f1 100644 GIT binary patch delta 4160 zcmbtX3s98T6+U<02&}-ux;$1`5nSZ8%X4{&q5?rB_{1uTl88Df#;COzA7D-6qZW}H z12|56#7u0GHt4qFOr7{>r;g1uiOsaOA=Mb8X(lFyrq*h$rQi9NeIQ9DOqTiXx&Qsn zIrrS>xm^C0>iRiVPncRvm*HwtbQKXz1OC_F-#-Jg8hDhy_s;xnhvxgb_A%+EnJ3+A zG~0!Uk?(hpamVR|I;Zv89&M@?eVLeyN) zYtRzKL2iK@>o=y8`2LSP7o2L{zlO++5%sJkdK?;&=sgGW8l+0mm>uM?y{RKwp&~jC zSqP0I@DT-#Y~8y}L}6;VHLOY}(Q)ZxXdSP+wwkC|NSh``TM1|Tr3hcE9gXfbxt$TI zLihA``i$rkR6qLg1L~ze)5SkrpmRj0(Dcim*Nz=MbfAmq zxsLX>-Me+r}?|hav(rQ|Ug}2EvYnn{6n&m3%oa~s%RdG~PB?uueMK#ypkKD}M z&~|y*YO{O|hY?tv*!PJiMmK89d2%_N1^^p^^Z=Tag1HQ|FCO4A4nmcJfe=6yhJt@i z_kqM(VcM2{emQ?C6O47n(UQ6(r}|B5bQdOts#+S*#NeO6pSSLn8EDr49Ka30``cA! z5DoRIs<1g0P5h>RXx>iD)n1wK1ARz-deGrjMG>abrIB|Ye=l-z{K~jjb1ztblXo?V z!Y$(-G>6+4+Gg4tBaWw@-Z-%(ZQJHw6n1446h&2UE4EE*ESa_LTIrR@rip7t_LOha zrdG7m?+bB$S+;p~bw}r=QeL9DPb?aj-4saxC z`T{!~HOPElg<|fmtF6}0=DXBys#Z)_pruTBVoe?}U5i-r(9W~dN-e@pDRf2%3a5Ty zAqxprYilc&A`-RSy&|Q8w` zhUMkNj{HF}WDd*PymPR%V_4Qt@63NRaQseK^L8D)Y+o~j1KXi>8{ajz*Pq#vfQ(ik zS1*sQMamj7D_P&scP=>;-+T)`JmWdv*>@KEwqodtZ{$(mvB({mQ7Ow^Nwy(JfC9&# zOWEvaF5kot$C&q(F?#pqS01myzU8Xru~CKr&j$kzO1{ik8STElxJhpt1=@c^f|MWv zRb7het<_C>VUcys@uEO!*w@^omkXPXCc_YmLPept70#muIoA(SEn-!nlYOO0?xvL$ zdRycm1KkjVV#Pq~Gmt;qZZv5XwK|x3FQyWiu_IfZM^2vGDBf*6w}BcH1~ima#Fg>N z&SgoHp*IDX3RD1(0Q^v$4)8;D7BJ7<{}Z9g;{;m?Q~}e0YM=&~1?L`s6 z37uap-WQ5JNRDqGEo<>6%dE z7Z|wj_qjsd>j;&n+CmljhL1z#Bc_d41DmcWP45Rby@!XWL;iG+A=95Lzg111l~J)4 ze!qC8l;}aA-}{*2%Yq#X)rseXN=3EOwJWn_8I&3UPTeXTtA6avBz*rRp6DL(5+7e8 zEtoGkt)tFzExtVr=hze+pp#%)MiLo)45v>WT%7?^hv$yj$8aXEHxr%b#CQuG*?kn> zn(N^v6X7g^iUZQq5#M=Npvzg?1h<@mJq#z?X?UpdFs4K5eBSt;xSc}uG?;%untTl3 zM2WHJ|0z%zsC*B5#p8}Iz)HB81LiJ_=0bWHew}Ddp0Vm6V-SOfDFL%Mo9G~P>mgM> zhLgzARFBO|kbWCZPVFs;*vT;33pvtf#91#BK{4Zi^fR27+p)$kvJIrpXT#5gB23Op zVCoP;52PnJ&cu_!u(v6Yes9H^7Cg?e(+-2`$S3-_)@xJ*qf_HN9o0kQbstj*<_s2s zJ9-Qn$9+rzm?OA0Uj|bS4Y!ZU2XhzM<^?bZj5xqvrjcBrYO&&MbRR43H{xBc-nq%%qs zDP^Hj7AR%DQo6X5_d2tz-{f_ytnAt@Z*)bctUFy>Ifr_^Bth_TfWqDt}?|tv(e*c`A^PibHb7tn= zlUrS^D+gK4mTYP!wqi>~&xePHXCZ`M0zBUoceaX?&9iI?3)Z#L%Q{& z{Y#F$@G=z&RwywdVp3x-Q(yJ&(;!`IFU1Bm1t8LFMAC6)3n(faw@f%Q)qq|^Q;-4q zAs?ubM-O#h6p1209{}1&XitVR608DI7}Nuy?hmXUe{SBvzp@<0MF?Aoboe?)LU#(2 zDJlvp#VVnUVVI%-$B1ny2b?E%#4E)@TqzFXeh(g5<8L^w>Yt$&0CwqI(10uisTk{w z_CR|GcbR)CaV|nKSkcFM2xWkU2xj*M*$0xvScJn^Dx%>bl*K}52go33SHT!IU}50# zvk|(;!mBN3@?0k%bSn+ClX!j05DKBNGe^!1gTZPsWtGphh3Vd=^%75tyAa0BrMsk< zqT8k2EUf^MM+DDUZLCgoW(-R#MEEnA1MZP2=!dd&iasViOkqlX)*C$=KF(pG>*!&qA=KQo_oIe7gle`_S5-o&T(G5sHTH7w#kmeVJ7Qs;qoI~X zaRe&>>^TC80B>+ma0rQ=95lGcL2ocz6d?2i;3vRcz?rg1YkV@ zORD^EszT!!3C$=#|D7MvrEgAlBlKlwNBbevgm$1Ur~=}+kR#2}Al##vhOaARSg3qe zXdXUOfzkj|z@5`dJ*D11F_Y^@+#qAYo*+K)5ZdPfE`QDeRpy*R6R|9b0sK^Slj}T6 zdfDZx8KgqlsTQ$HQbA2XeiS^ZOl?d@jw1;RndJ7L91-O&2q?=} z?KoGb74W6g)2ve*7bzO2bSsbfT~{YL$7zlfg?iO^2L{{3mWDXb%A8ut^_+3YSR7UO zX0cHb@cV2pzw~(@Esape_rG~7-fg~PVyx|V>AgX*Z<4`PCU=>u09Se#Hqi+eX*4!^ za08Afk^_hhfgZPMT;yBRU>}fRfcQyRA8^_Nu?O7K=t0e|eET+t+=s#m49_MDf@s}D z<^$c9d;2&aY{qv7%P}9g#0PxM=xY%O zdROG~zzO<&Tng`rqCn1*R`GItG)jp#&bKIup4IzqfU+{QIV|k;g4g`tZ$8^qc;R9H z;n?OYjYWgS7k|cd_GD-AM0JLNI-UCS<5k<<-T2#yKAYwm>&356m77g>JJx>qi@kGp z{b6R!7nKoc_|;?`Pa?6W@>espnzxx;4R5oYaGh zeJwf`9ZmM*yQdvoxqaHrQ_l+eWJO84Ke#M9r|QdQ3FcqW zcz?g4fBk{H4ACp}I(68dkaKf-S{JD{*4OefRPDRt7oGOxg%y49UHZX{ISw`b*3)-& zdPn~l9aH8}5q9>~B{KU<+{d%pD=o1f)y&Keu8hQHUAw6Qzji#+y*Ggktyr|m1s zS`%H;w64MN_SCxDo5NKh^J{xfJ+)~M7)m*_P`9Vz#o3pyJ)v$C-4jMf#;{v;jVGTt zI&C-?95sO#>)8^Qcqb<7P)z5lAg)By` zXC6$vvTE(|*PlO+sFNfa?taCY9KNRII1el?!I+$KD+`ebi?+4PuS1Yf@6 z)=@IhI32GpmD2;hb6M0oc(pE+T7Vmt8>mtoJKbnT?!YBDEkc|&!m)0EbD3|`no5FVdox_o#%$23*MaA-+O+80$JBzul_2aIqBQDOcrw5Xk^3^uX z93!S?jA=6HUZ70xBPTKo_NdTN2K;%FE4Hf;a-BzXYy&djPvY$<4z{Y0QZBfw+yHis z@eUN5Xt=K9ET=G*EJm*yr}ty@W{lo#M31>f1tnl~?x0&mJirA;m1z7jG-Mf+IsG8{ zExy$JFRS#Ri!;jjxG`UhCD{^c60_)O*-QEO=^8OUoG+m~8P)B4P&Jf`rTo9F-ixdV z?~7MZ65~y5k_JP2nR$0W&ol9 zBpr+a!~%?fILxlqm5`4N3)YZt-AllHj1IPgiz(jx(faF$B zaZ#lkol~`m!d_JhNb7tcMNg~t$6AhvdICwWJ@tr`cx|PK=_WN9%03A+QG;e5p>Ugt;L(gCrRM10a&vkwlzaI~A60bH~PQG8_cR z+$N)JaNITBy8Gq^#OL`M(aT#4m4Oi|=o@!#`}7RMqF=vU(ZL1=Q8s nX$25}F~AZa0aydb-y=JK9H0P91ULay_{Vzx|FcI#L;b%2S%RyA diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/总包质量管理组织机构图.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/总包质量管理组织机构图.doc index 2b350fa88ceb170105aa7032c29c0d3369da2822..6316b06d2682a5001b86551dadbcb2cfd566b3a2 100644 GIT binary patch delta 700 zcmZ{iOK1~O6o${4N6f@FX_}IjIwMV^HcdkF0F97Pf)WWKu>luq2@)kL)JMdK3RTdR z4}>m`xG-poAP80~y@Jw3s~hoAg@Oz5fi8rC7PTrCTv*SvMBR8V-<&h^pZni)FY~a9 zlU2O6SFt3er2+kpIH*i3#);Uck$4X#fk$sD<-h)NF}GIyTyj{Ghv=Qs zDDKr25KCm(L)cF_`*C$p18AZt#fyTz*?Wx9#u-nC1AGjU<}V0(91q zx4dov=#%MWL&oxv4QB1E_$?cBfN>;`(yE5J{34;VqAF~7Q$!jAsD`-ofVl4>6l1Qi zY_-nEi|QtAUVLynWPz;?$@9eu@Rj+_{9xL6$tuRjG}!>$6zN_@c|E9qo__UY;s#v3 zbb;F(ICln)ahGK%!B*HvL-80HMkf`FUGety86EN>8B}bGq7!`_h_HVfLpL>mdf* zX3bx{_MP4so|gY;K+lW_@_qHGYJxi}QQ6z9b#Yc)cpLEQ7!|`_2P!jx2fM|@ioE1G z$~~Hx19{f+T69ymV~-Xo9_cqLqGG6H*nv^X#YV2Il_;1@tn6j;0<(?TVQ$0#%)tyl z-@Jw~-o>Tk8KcEsCAVDr)8- y7W{>_ZcdgIMf^&gmiR=c(obcy(`+_o3-W)`#YB;Qs_k?)8(tK&KLT~;27d$0WTnLb delta 621 zcmZXRO=uHQ5XWbB-^Of>yJ=G65;q}nTPuy`;~){YNT}3?lG+v#rRLIuMQTwIQF0K` zg9k+vriW_44=i}Fw53lx2x>(rK~xCzV7*vR0r3OB@FvbydeQgz?ac1X`|s?3UskbJ z#o008yEcCN#FmHhq-cm(;f_`5?8gG|8tU%uxc~NVKDpOxIjt+|np)B;0yVG8(6R{0 z`9K-5Ofe&aXQUxSUnFGEz z7Qm=V=Yzez1`B*OxYFV4vH_kTB}G)*%I!A@n@%_XLis41Rpqyc zsZv(>B}Pr9?Xw@i;*L0zU;<452Ghbs7>kKg&hDW^!E(Md-osM;MGfHj{9~Bq0q?>D zT!9OmRp1z3hv|@;q(wJHhutilb0bWce%K>{wYz(57-qKnkzU7g*g6*<)wCkNpiIY| z4fjvVF?LG!5ow z6d~mAyrPh`Ghq&S>da600PkRt{iz_0xCc<5>kKGuAK44f56=hBgCG-P{`F#`EbV%L zRJ5~f$_{y?FoC)^_=>#LyMC!s?767$CtNPRQuQYOuLcvOPo+Fhb-lFjzh~R}Zv6qk C1du!c diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user index cb873201..63722353 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true false diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 1b0a24a2..9fc55c34 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -1,4 +1,4 @@ - + -
+
- + - + - - - - - + + + + + - - - - + + + + - + - + - - - + + + - + - + - + - - + + - + - + - - - + + + - - + + - - - - + + + + - + - - + + - - + + - - - + + + - + - + - - + + - + - - - + + + - - - + + + - + - + - - + + - + - + - - - - + + + + - + - + - - + + - - + + @@ -179,20 +179,20 @@ - - + + - - + + - - + + - - + + diff --git a/SGGL/FineUIPro.Web/res/images/Organizational.png b/SGGL/FineUIPro.Web/res/images/Organizational.png index ff29a6459636faa0a0702b976a7b00dbb9fb46e1..5e1184d7ffd788a3c23c18fbc3525513c862f5d5 100644 GIT binary patch literal 11471 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 e%AQ^=Im4BT&`QF^++|N1p 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 a{C@62*%{{-YV56duNs+MF28vH$^QVG)q)NH literal 9776 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 Mr2BWoZ!cZ{FQVT7fdBvi diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user index bd497c6b..5fe155da 100644 --- a/SGGL/WebAPI/WebAPI.csproj.user +++ b/SGGL/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true From e9a982b150c407cd221234f054931227a5633cc5 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 6 Jun 2024 15:54:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?20240606=20=E4=BF=AE=E6=94=B9=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E6=9C=BA=E6=9E=84=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/Web.config | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config index 42891618..d748de30 100644 --- a/SGGL/FineUIPro.Web/Web.config +++ b/SGGL/FineUIPro.Web/Web.config @@ -12,12 +12,8 @@ -<<<<<<< HEAD -======= - ->>>>>>> dd3f0cfafec64cf8ca381f2aa00977ef6b7bb303 - + @@ -81,11 +77,7 @@ -<<<<<<< HEAD - -======= ->>>>>>> dd3f0cfafec64cf8ca381f2aa00977ef6b7bb303