diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-04-29-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-04-29-001.sql new file mode 100644 index 00000000..03a37450 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-04-29-001.sql @@ -0,0 +1,97 @@ + + + + + + + +CREATE PROCEDURE [dbo].[Sp_APP_GetHSSEToDoItems] + @projectId NVARCHAR(50) = NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN + + select a.DataId, 'ְҵȫΣԴʶ' as MenuName, 'ţ '+b.HazardListCode+' λ̣'+b.WorkAreaName+' ' as Content, b.CompileDate as DataTime,users.UserId + ,users.UserName, '../HSSE/Hazard/HazardListEdit.aspx?HazardListId='+b.HazardListId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+b.HazardListId+'' as UrlStr + from Hazard_HazardList b left join Sys_FlowOperate a on a.DataId = b.HazardListId + left join Sys_User users on users.UserId = b.CompileMan +where a.IsClosed = 0 + and b.ProjectId=@projectId + and a.OperaterId=@userId + union ALL + select a.LawRegulationIdentifyId, 'ɷʶ' as MenuName, 'ţ '+a.LawRegulationIdentifyCode+' 汾ţ'+a.VersionNumber+' ' as Content, a.UpdateDate as DataTime,users.UserId + ,users.UserName, '../HSSE/InformationProject/LawRegulationIdentifyEdit.aspx?LawRegulationIdentifyId='+a.LawRegulationIdentifyId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.LawRegulationIdentifyId+'' as UrlStr + from Law_LawRegulationIdentify a left join Sys_FlowOperate b on a.LawRegulationIdentifyId = b.DataId + left join Sys_User users on users.UserId = a.IdentifyPerson +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + union ALL + + select a.ConstructionStandardIdentifyId, '׼淶嵥' as MenuName, 'ţ '+a.ConstructionStandardIdentifyCode+' 汾ţ'+a.VersionNumber+' ' as Content, a.UpdateDate as DataTime,users.UserId + ,users.UserName, '../HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx?ConstructionStandardIdentifyId='+a.ConstructionStandardIdentifyId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.ConstructionStandardIdentifyId+'' as UrlStr + from InformationProject_ConstructionStandardIdentify a left join Sys_FlowOperate b on a.ConstructionStandardIdentifyId = b.DataId + left join Sys_User users on users.UserId = a.IdentifyPerson +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + + + union ALL + + select a.ActionPlanListId, 'HSEʵʩƻ' as MenuName, 'ţ '+a.ActionPlanListCode+' ƣ'+a.ActionPlanListName+' ' as Content, a.CompileDate as DataTime,users.UserId + ,users.UserName, '../HSSE/ActionPlan/ActionPlanListId.aspx?ActionPlanListId='+a.ActionPlanListId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.ActionPlanListId+'' as UrlStr + from ActionPlan_ActionPlanList a left join Sys_FlowOperate b on a.ActionPlanListId = b.DataId + left join Sys_User users on users.UserId = a.CompileMan +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + + union ALL + + select a.EnvironmentalRiskListId, 'ʶ' as MenuName, 'ţ '+CodeRecords.Code+' λ̣'+a.WorkAreaName+' ' as Content, a.CompileDate as DataTime,users.UserId + ,users.UserName, '../HSSE/Hazard/EnvironmentalRiskListEdit.aspx?EnvironmentalRiskListId='+a.EnvironmentalRiskListId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.EnvironmentalRiskListId+'' as UrlStr + from Hazard_EnvironmentalRiskList a left join Sys_FlowOperate b on a.EnvironmentalRiskListId = b.DataId + left join Sys_User users on users.UserId = a.CompileMan + LEFT JOIN Sys_CodeRecords AS CodeRecords ON a.EnvironmentalRiskListId=CodeRecords.DataId +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + + + union ALL + + select a.OtherHazardId, 'ΣԴʶļ' as MenuName, 'ţ '+CodeRecords.Code+' ļƣ'+a.OtherHazardName+' ' as Content, a.CompileDate as DataTime,users.UserId + ,users.UserName, '../HSSE/Hazard/OtherHazardEdit.aspx?OtherHazardId='+a.OtherHazardId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.OtherHazardId+'' as UrlStr + from Hazard_OtherHazard a left join Sys_FlowOperate b on a.OtherHazardId = b.DataId + left join Sys_User users on users.UserId = a.CompileMan + LEFT JOIN Sys_CodeRecords AS CodeRecords ON a.OtherHazardId=CodeRecords.DataId +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + union ALL + select a.TrainingId, 'ѵ¼' as MenuName, 'ţ '+a.TrainingCode+' ⣺'+a.TrainTitle+' ' as Content, a.TrainStartDate as DataTime,users.UserId + ,users.UserName, '../HSSE/EduTrain/TrainRecordEdit.aspx?TrainingId='+a.TrainingId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.TrainingId+'' as UrlStr + from EduTrain_TrainRecord a left join Sys_FlowOperate b on a.TrainingId = b.DataId + left join Sys_User users on users.UserId = a.CompileMan +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId + union ALL + select a.PersonId, 'ԱϢ' as MenuName, ' '+a.PersonName+' ֤'+a.IdentityCard+' ' as Content, a.InTime as DataTime,'' + ,'', '../HSSE/SitePerson/PersonListEdit.aspx?PersonId='+a.PersonId+'' as PCUrl + ,'/pagesQ/file_manage/detail?id='+a.PersonId+'' as UrlStr + from SitePerson_Person a left join Sys_FlowOperate b on a.PersonId = b.DataId + +where b.IsClosed = 0 and a.ProjectId=@projectId + and b.OperaterId=@userId +END + + + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-04-30-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-04-30-001.sql new file mode 100644 index 00000000..2734ea30 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-04-30-001.sql @@ -0,0 +1,39 @@ + + + + + +ALTER VIEW [dbo].[View_CH_TrustSearch] +/*ίϸѯб*/ +AS +SELECT + JointInfo.JOT_ID, --id + JointInfo.JOT_JointNo, --ڴ + JointInfo.JOT_JointStatus, + IsoInfo.ISO_ID, --id + IsoInfo.ISO_IsoNo, + IsoInfo.UnitId, + WorkArea.WorkAreaId, --id + JointInfo.ProjectId, + Point.PW_PointID, -- + Point.PW_PointNo, + Point.PW_PointType, + JointInfo.JOT_JointDesc,--ڹ + case when isoInfo.[Is_Standard] = 0 then + (detectionRate.DetectionRate+'%') else (detectionRate1.DetectionRate+'%') end AS DetectionRate +FROM dbo.PW_JointInfo AS JointInfo +LEFT JOIN dbo.PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID +LEFT JOIN dbo.ProjectData_WorkArea AS WorkArea ON WorkArea.WorkAreaId=IsoInfo.WorkAreaId +LEFT JOIN dbo.BO_Point AS Point ON Point.PW_PointID =JointInfo.PW_PointID +LEFT JOIN dbo.CH_TrustItem AS TrustItem ON TrustItem.JOT_ID =JointInfo.JOT_ID +LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = IsoInfo.DetectionRateId +LEFT JOIN Base_DetectionRate AS detectionRate1 ON detectionRate1.DetectionRateId = JointInfo.DetectionRateId +WHERE TrustItem.CH_TrustItemID IS NULL AND Point.PW_PointID IS NOT NULL +AND JointInfo.JOT_JointStatus ='101' + + + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-04-30-002.sql b/DataBase/版本日志/SGGLDB_CD_V2023-04-30-002.sql new file mode 100644 index 00000000..be21551f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-04-30-002.sql @@ -0,0 +1,77 @@ + + + +ALTER VIEW [dbo].[View_CH_RepairSearch] +/*ίϸѯб*/ +AS + +SELECT DISTINCT + JointInfo.JOT_ID, --id + JointInfo.JOT_JointNo, --ڴ + (CASE WHEN JointInfo.JOT_JointStatus ='102' THEN '͸' + ELSE CASE WHEN JointInfo.JOT_JointStatus ='104' THEN 'г' + ELSE '' END END) AS JOT_JointStatus, + IsoInfo.ISO_ID, --id + IsoInfo.ISO_IsoNo, + IsoInfo.UnitId, + WorkArea.WorkAreaId, --id + JointInfo.ProjectId, + Checks.CHT_CheckID, -- + Checks.CHT_CheckCode, + Checks.RepairTrustId, + JointInfo.JOT_JointDesc,--ڹ + case when isoInfo.[Is_Standard] = 0 then + (detectionRate.DetectionRate+'%') else (detectionRate1.DetectionRate+'%') end AS DetectionRate +FROM +dbo.CH_Check AS Checks +LEFT JOIN dbo.CH_CheckItem AS CheckItem ON Checks.CHT_CheckID =CheckItem.CHT_CheckID +LEFT JOIN dbo.PW_JointInfo AS JointInfo ON CheckItem.JOT_ID =JointInfo.JOT_ID +LEFT JOIN dbo.PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID +LEFT JOIN dbo.ProjectData_WorkArea AS WorkArea ON WorkArea.WorkAreaId=IsoInfo.WorkAreaId +LEFT JOIN dbo.CH_Trust AS trust ON trust.CH_TrustID = Checks.CH_TrustID +LEFT JOIN dbo.Base_DetectionType AS ndt ON ndt.DetectionTypeId = trust.CH_NDTMethod +LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = IsoInfo.DetectionRateId +LEFT JOIN Base_DetectionRate AS detectionRate1 ON detectionRate1.DetectionRateId = JointInfo.DetectionRateId + +WHERE Checks.CHT_AuditDate IS NOT NULL AND +ndt.DetectionTypeCode='RT' AND +CheckItem.CHT_PassFilm != CheckItem.CHT_TotalFilm + +UNION + +SELECT DISTINCT + JointInfo.JOT_ID, --id + JointInfo.JOT_JointNo, --ڴ + (CASE WHEN JointInfo.JOT_JointStatus ='102' THEN '͸' + ELSE CASE WHEN JointInfo.JOT_JointStatus ='104' THEN 'г' + ELSE '' END END) AS JOT_JointStatus, + IsoInfo.ISO_ID, --id + IsoInfo.ISO_IsoNo, + IsoInfo.UnitId, + WorkArea.WorkAreaId, --id + JointInfo.ProjectId, + Checks.CHT_CheckID, -- + Checks.CHT_CheckCode, + Checks.RepairTrustId, + JointInfo.JOT_JointDesc,--ڹ + case when isoInfo.[Is_Standard] = 0 then + (detectionRate.DetectionRate+'%') else (detectionRate1.DetectionRate+'%') end AS DetectionRate +FROM +dbo.CH_Check AS Checks +LEFT JOIN dbo.CH_CheckItem AS CheckItem ON Checks.CHT_CheckID =CheckItem.CHT_CheckID +LEFT JOIN dbo.PW_JointInfo AS JointInfo ON CheckItem.JOT_ID =JointInfo.JOT_ID +LEFT JOIN dbo.PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = JointInfo.ISO_ID +LEFT JOIN dbo.ProjectData_WorkArea AS WorkArea ON WorkArea.WorkAreaId=IsoInfo.WorkAreaId +LEFT JOIN dbo.CH_Trust AS trust ON trust.CH_TrustID = Checks.CH_TrustID +LEFT JOIN dbo.Base_DetectionType AS ndt ON ndt.DetectionTypeId = trust.CH_NDTMethod +LEFT JOIN Base_DetectionRate AS detectionRate ON detectionRate.DetectionRateId = IsoInfo.DetectionRateId +LEFT JOIN Base_DetectionRate AS detectionRate1 ON detectionRate1.DetectionRateId = JointInfo.DetectionRateId +WHERE Checks.CHT_AuditDate IS NOT NULL AND +ndt.DetectionTypeCode!='RT' AND +CheckItem.CHT_CheckResult='ϸ' + + + +GO + + diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index ac568307..bed430d3 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -306,3 +306,95 @@ IP地址:::1 出错时间:04/29/2023 18:40:55 出错时间:04/29/2023 18:40:55 + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000),@UserId nvarchar(36),@Type nvarchar(1' 需要参数 '@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) 位置 D:\project\vs\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.HJGL.DataIn.DataInTable.BindGrid() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HJGL\DataIn\DataInTable.aspx.cs:行号 108 + 在 FineUIPro.Web.HJGL.DataIn.DataInTable.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HJGL\DataIn\DataInTable.aspx.cs:行号 58 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/30/2023 09:04:01 +出错文件:http://localhost:1295/HJGL/DataIn/DataInTable.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/30/2023 09:04:01 + + +错误信息开始=====> +错误类型:HttpException +错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。 +错误堆栈: + 在 System.Web.HttpResponse.set_ContentType(String value) + 在 (HttpResponse , String ) + 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM() + 在 (xCmAQBtUiwmKoGvxhPONMYvYbMln ) + 在 xCmAQBtUiwmKoGvxhPONMYvYbMln.jcLvABeDsHQyyAbZhsfaLCMRNprM(Object , EventArgs ) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/30/2023 09:25:06 +出错文件:http://localhost:1295/HJGL/DataIn/DataInTable.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/30/2023 09:25:06 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000),@UserId nvarchar(36),@Type nvarchar(1' 需要参数 '@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) 位置 D:\project\vs\sggl_cd\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.HJGL.DataIn.DataInTable.BindGrid() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HJGL\DataIn\DataInTable.aspx.cs:行号 108 + 在 FineUIPro.Web.HJGL.DataIn.DataInTable.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HJGL\DataIn\DataInTable.aspx.cs:行号 58 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:04/30/2023 09:45:56 +出错文件:http://localhost:1295/HJGL/DataIn/DataInTable.aspx +IP地址:::1 +操作人员:JT + +出错时间:04/30/2023 09:45:56 + diff --git a/SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs index b3fc90ed..9c91890a 100644 --- a/SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs @@ -664,6 +664,7 @@ namespace FineUIPro.Web.HJGL.DataIn } else { + isoInfo.DetectionRateId = rate.DetectionRateId; jointInfo.DetectionRateId = rate.DetectionRateId; } } diff --git a/SGGL/FineUIPro.Web/HJGL/RepairManage/ShowRepairSearch.aspx b/SGGL/FineUIPro.Web/HJGL/RepairManage/ShowRepairSearch.aspx index 4d942e69..e07cb2ae 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairManage/ShowRepairSearch.aspx +++ b/SGGL/FineUIPro.Web/HJGL/RepairManage/ShowRepairSearch.aspx @@ -52,6 +52,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx index 307975d0..354d9479 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx @@ -71,6 +71,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs index 8f431b52..6dc5c990 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs @@ -177,7 +177,7 @@ namespace FineUIPro.Web.HJGL.TrustManage private void BindGrid() { string pW_PointID = this.tvControlItem.SelectedNodeID; - string strSql = @"SELECT 0 [index], jot.JOT_ID,jot.JOT_JointNo,jot.ISO_IsoNo,jot.JOT_JointDesc, + string strSql = @"SELECT 0 [index], jot.JOT_ID,jot.JOT_JointNo,jot.ISO_IsoNo,jot.JOT_JointDesc,jot.DetectionRate jot.ISO_ID,case jot.JOT_JointStatus when '101' then '点口' when '102' then '扩透' else '' end as JOT_JointStatus FROM dbo.View_CH_TrustSearch jot WHERE jot.ProjectId=@ProjectId AND jot.PW_PointID=@PW_PointID"; diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs index 70b0b1cf..0d47a227 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs @@ -452,7 +452,7 @@ namespace FineUIPro.Web.HJGL.TrustManage var trustUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == this.drpCH_TrustUnit.SelectedValue); if (iso.Is_Standard) { - this.drpCH_NDTRate.SelectedValue = iso.DetectionRateId; + this.drpCH_NDTRate.SelectedValue = join.DetectionRateId; //this.drpCH_NDTMethod.SelectedValue = iso.DetectionTypeId; if (this.drpCH_SlopeType.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f94d5f46..9b22b0fa 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -22,7 +22,7 @@ namespace Model using System; - public partial class SGGLDB : System.Data.Linq.DataContext + public partial class SGGLDB_CD : System.Data.Linq.DataContext { private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource(); @@ -2389,25 +2389,25 @@ namespace Model partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance); #endregion - public SGGLDB(string connection) : + public SGGLDB_CD(string connection) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(System.Data.IDbConnection connection) : + public SGGLDB_CD(System.Data.IDbConnection connection) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : + public SGGLDB_CD(string connection, System.Data.Linq.Mapping.MappingSource mappingSource) : base(connection, mappingSource) { OnCreated(); } - public SGGLDB(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : + public SGGLDB_CD(System.Data.IDbConnection connection, System.Data.Linq.Mapping.MappingSource mappingSource) : base(connection, mappingSource) { OnCreated(); @@ -370992,6 +370992,8 @@ namespace Model private string _JOT_JointDesc; + private string _DetectionRate; + public View_CH_RepairSearch() { } @@ -371187,6 +371189,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionRate", DbType="NVarChar(51)")] + public string DetectionRate + { + get + { + return this._DetectionRate; + } + set + { + if ((this._DetectionRate != value)) + { + this._DetectionRate = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_CH_TrustItem")] @@ -371748,6 +371766,8 @@ namespace Model private string _JOT_JointDesc; + private string _DetectionRate; + public View_CH_TrustSearch() { } @@ -371943,6 +371963,22 @@ namespace Model } } } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionRate", DbType="NVarChar(51)")] + public string DetectionRate + { + get + { + return this._DetectionRate; + } + set + { + if ((this._DetectionRate != value)) + { + this._DetectionRate = value; + } + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Check_CheckColligationDetail")]