zhanghj
/
ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

焊接修改

This commit is contained in:
李超 2023-04-30 10:08:41 +08:00
parent a7b215109c
commit c96a443c37
10 changed files with 355 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
DataBase/版本日志/SGGLDB_CD_V2023-04-29-001.sql Normal file
View File

@ -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

39
DataBase/版本日志/SGGLDB_CD_V2023-04-30-001.sql Normal file
View File

@ -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

77
DataBase/版本日志/SGGLDB_CD_V2023-04-30-002.sql Normal file
View File

@ -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

92
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -306,3 +306,95 @@ IP地址:::1
出错时间:04/29/2023 18:40:55 出错时间:04/29/2023 18:40:55
出错时间: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

1
SGGL/FineUIPro.Web/HJGL/DataIn/DataInTable.aspx.cs
View File

@ -664,6 +664,7 @@ namespace FineUIPro.Web.HJGL.DataIn
} }
else else
{ {
isoInfo.DetectionRateId = rate.DetectionRateId;
jointInfo.DetectionRateId = rate.DetectionRateId; jointInfo.DetectionRateId = rate.DetectionRateId;
} }
} }

3
SGGL/FineUIPro.Web/HJGL/RepairManage/ShowRepairSearch.aspx
View File

@ -51,6 +51,9 @@
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="点口类型" ColumnID="JOT_JointStatus" DataField="JOT_JointStatus" SortField="JOT_JointStatus" <f:RenderField HeaderText="点口类型" ColumnID="JOT_JointStatus" DataField="JOT_JointStatus" SortField="JOT_JointStatus"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="180px">
</f:RenderField>
<f:RenderField HeaderText="探索比例" ColumnID="DetectionRate" DataField="DetectionRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField> </f:RenderField>
</Columns> </Columns>
</f:Grid> </f:Grid>

3
SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx
View File

@ -71,6 +71,9 @@
<f:RenderField HeaderText="点口类型" ColumnID="JOT_JointStatus" DataField="JOT_JointStatus" <f:RenderField HeaderText="点口类型" ColumnID="JOT_JointStatus" DataField="JOT_JointStatus"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="探索比例" ColumnID="DetectionRate" DataField="DetectionRate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
</Columns> </Columns>
</f:Grid> </f:Grid>
</Items> </Items>

2
SGGL/FineUIPro.Web/HJGL/TrustManage/ShowTrustSearch.aspx.cs
View File

@ -177,7 +177,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
private void BindGrid() private void BindGrid()
{ {
string pW_PointID = this.tvControlItem.SelectedNodeID; 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 jot.ISO_ID,case jot.JOT_JointStatus when '101' then '点口' when '102' then '扩透' else '' end as JOT_JointStatus
FROM dbo.View_CH_TrustSearch jot FROM dbo.View_CH_TrustSearch jot
WHERE jot.ProjectId=@ProjectId AND jot.PW_PointID=@PW_PointID"; WHERE jot.ProjectId=@ProjectId AND jot.PW_PointID=@PW_PointID";

2
SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs
View File

@ -452,7 +452,7 @@ namespace FineUIPro.Web.HJGL.TrustManage
var trustUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == this.drpCH_TrustUnit.SelectedValue); var trustUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == this.drpCH_TrustUnit.SelectedValue);
if (iso.Is_Standard) if (iso.Is_Standard)
{ {
this.drpCH_NDTRate.SelectedValue = iso.DetectionRateId; this.drpCH_NDTRate.SelectedValue = join.DetectionRateId;
//this.drpCH_NDTMethod.SelectedValue = iso.DetectionTypeId; //this.drpCH_NDTMethod.SelectedValue = iso.DetectionTypeId;
if (this.drpCH_SlopeType.SelectedValue != BLL.Const._Null) if (this.drpCH_SlopeType.SelectedValue != BLL.Const._Null)
{ {

46
SGGL/Model/Model.cs
View File

@ -22,7 +22,7 @@ namespace Model
using System; 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(); private static System.Data.Linq.Mapping.MappingSource mappingSource = new AttributeMappingSource();
@ -2389,25 +2389,25 @@ namespace Model
partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance); partial void DeleteZHGL_WorkHandoverDetail(ZHGL_WorkHandoverDetail instance);
#endregion #endregion
public SGGLDB(string connection) : public SGGLDB_CD(string connection) :
base(connection, mappingSource) base(connection, mappingSource)
{ {
OnCreated(); OnCreated();
} }
public SGGLDB(System.Data.IDbConnection connection) : public SGGLDB_CD(System.Data.IDbConnection connection) :
base(connection, mappingSource) base(connection, mappingSource)
{ {
OnCreated(); 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) base(connection, mappingSource)
{ {
OnCreated(); 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) base(connection, mappingSource)
{ {
OnCreated(); OnCreated();
@ -370992,6 +370992,8 @@ namespace Model
private string _JOT_JointDesc; private string _JOT_JointDesc;
private string _DetectionRate;
public View_CH_RepairSearch() 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")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_CH_TrustItem")]
@ -371748,6 +371766,8 @@ namespace Model
private string _JOT_JointDesc; private string _JOT_JointDesc;
private string _DetectionRate;
public View_CH_TrustSearch() 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")] [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_Check_CheckColligationDetail")]