diff --git a/DataBase/版本日志/HJGLDB_DS_2025-06-12_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-06-12_bwj.sql
new file mode 100644
index 0000000..59ac949
--- /dev/null
+++ b/DataBase/版本日志/HJGLDB_DS_2025-06-12_bwj.sql
@@ -0,0 +1,46 @@
+
+ALTER PROC [dbo].[HJGL_sp_rpt_RemakeReason]
+ @parm NVARCHAR(500) = NULL
+AS
+/*ۺϷ:ܴ2018.08.08*/
+declare @ProjectId nvarchar(50),@StartDate nvarchar(50),@EndDate nvarchar(50)
+set @ProjectId= (select items from Split_StrByDelimiter(@parm,',') where id=1)
+set @StartDate= (select items from Split_StrByDelimiter(@parm,',') where id=2)
+set @EndDate= (select items from Split_StrByDelimiter(@parm,',') where id=3)
+
+SELECT v.* FROM
+(SELECT NEWID() as id,
+ trust.ProjectId,rq.CheckMan
+ ,sum(CONVERT(INT,TypeNum_Error)) AS t1Num --ǦֱŴ
+ ,sum(CONVERT(INT,TypeNum_Defect)) AS t2Num --Ǧֱȱʧ
+ ,sum(CONVERT(INT,TypeNum_Position)) AS t3Num --Ǧֱλ
+ ,sum(CONVERT(INT,TypeNum_Displacement)) AS t4Num --Ǧֱλ
+ ,sum(CONVERT(INT,ImageQualityMeter_Error)) AS t5Num --ʼƴ
+ ,sum(CONVERT(INT,ImageQualityMeter_Defect)) AS t6Num --ʼȱʧ
+ ,sum(CONVERT(INT,RayField_Tilt)) AS t7Num --߳б
+ ,sum(CONVERT(INT,RayField_Whitehead)) AS t8Num --߳ͷ
+ ,sum(CONVERT(INT,RayField_FocalLengthSmall)) AS t9Num --߳С
+ ,sum(CONVERT(INT,Blackness_TooHigh)) AS t10Num --ڶȹ
+ ,sum(CONVERT(INT,Blackness_TooLow)) AS t11Num --ڶȹ
+ ,sum(CONVERT(INT,EllipticalOpening_TooMuch)) AS t12Num --Բڹ
+ ,sum(CONVERT(INT,EllipticalOpening_TooSmall)) AS t13Num --ԲڹС
+ ,sum(CONVERT(INT,NegativeOffset)) AS t14Num --Ƭƫ
+ ,sum(CONVERT(INT,Ghosting)) AS t15Num --ȱƬӰ
+ ,sum(CONVERT(INT,LocationIsNot)) AS t16Num --λò
+ ,sum(CONVERT(INT,PseudoDefects_Obstacles)) AS t17Num --αȱϰ
+ ,sum(CONVERT(INT,PseudoDefects_Mark)) AS t18Num --αȱӡ
+ ,sum(CONVERT(INT,BackScattering)) AS t19Num --ɢ
+ ,sum(CONVERT(INT,FilmSensitizingScreen)) AS t20Num --Ƭ
+ ,sum(CONVERT(INT,WashPiece)) AS t21Num --ϴƬ
+FROM HJGL_BO_RemakeReason AS rq
+LEFT JOIN HJGL_BO_QualityRating AS QualityRating ON QualityRating.QualityRatingId = rq.QualityRatingId
+ LEFT JOIN HJGL_CH_TrustItem AS TrustItem ON TrustItem.CH_TrustItemID = QualityRating.CH_TrustItemID
+ LEFT JOIN HJGL_CH_Trust AS trust ON trust.CH_TrustID = TrustItem.CH_TrustID
+WHERE (TrustItem.ShootDate>=@StartDate OR @StartDate IS NULL)
+ AND (TrustItem.ShootDate<=@EndDate OR @EndDate IS NULL)
+GROUP BY trust.ProjectId,rq.CheckMan) v
+WHERE v.ProjectId = @projectId OR @projectId IS NULL
+
+GO
+
+
diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx
index d2cb559..0c14c7d 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx
@@ -40,7 +40,7 @@
FieldType="String" HeaderText="项目号" HeaderTextAlign="Center">
+ FieldType="String" HeaderText="项目名称" HeaderTextAlign="Center" ExpandUnusedSpace="true">
@@ -82,31 +82,38 @@
-
+
-
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="240px" ExpandUnusedSpace="true">
-
+
+
+
+
+
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
+ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
index 3e4d24a..ab2efe6 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs
@@ -48,21 +48,42 @@ namespace FineUIPro.Web.ContinuousPrint
///
public void BindGrid1(string ProjectId)
{
- string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
- (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
- WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
- v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
- FROM
- (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
- FROM dbo.HJGL_BO_BatchDetail batchDetail
- LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
- LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
- LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
- WHERE BatchDetail.VICheckDate IS NOT NULL
- GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
- LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
- LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
- where v.ProjectId= @ProjectId";
+ //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group,
+ // (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝'
+ // WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+ // v.VICheckDate,v.NDTR_ID,rate.NDTR_Name
+ // FROM
+ // (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group
+ // FROM dbo.HJGL_BO_BatchDetail batchDetail
+ // LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+ // LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+ // LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+ // WHERE BatchDetail.VICheckDate IS NOT NULL
+ // GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v
+ // LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId
+ // LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID
+ // where v.ProjectId= @ProjectId";
+ string strSql = @" select distinct batch.ProjectId,
+ Project.ProjectCode,
+ Project.ProjectName,
+ weldReport.JOT_WeldDate,
+ (CASE WHEN jointType.JOTY_Group='1' THEN '对接焊缝'
+ WHEN jointType.JOTY_Group='2' THEN '角焊缝'
+ WHEN jointType.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType,
+ jointType.JOTY_Group,
+ rate.NDTR_ID,
+ rate.NDTR_Name,
+ isoInfo.ISO_ID,
+ isoInfo.ISO_IsoNo,
+ batch.BatchCode
+ from HJGL_BO_BatchDetail batchDetail
+ JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+ LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+ left join HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=joint.ISO_ID
+ LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+ left join HJGL_BO_WeldReportMain weldReport on weldReport.DReportID = joint.DReportID
+ LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID
+ LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = batch.NDTR_ID where batch.ProjectId=@ProjectId ";
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
SqlParameter[] parameter = listStr.ToArray();
@@ -184,14 +205,16 @@ namespace FineUIPro.Web.ContinuousPrint
System.Web.UI.WebControls.HiddenField hidProjectId = Grid2.Rows[gi].FindControl("hidProjectId") as System.Web.UI.WebControls.HiddenField;
System.Web.UI.WebControls.HiddenField hidNDTR_ID = Grid2.Rows[gi].FindControl("hidNDTR_ID") as System.Web.UI.WebControls.HiddenField;
System.Web.UI.WebControls.HiddenField hidJOTY_Group = Grid2.Rows[gi].FindControl("hidJOTY_Group") as System.Web.UI.WebControls.HiddenField;
- System.Web.UI.WebControls.HiddenField hidVICheckDate = Grid2.Rows[gi].FindControl("hidVICheckDate") as System.Web.UI.WebControls.HiddenField;
+ System.Web.UI.WebControls.HiddenField hidJOT_WeldDate = Grid2.Rows[gi].FindControl("hidJOT_WeldDate") as System.Web.UI.WebControls.HiddenField;
System.Web.UI.WebControls.HiddenField hidProjectName = Grid2.Rows[gi].FindControl("hidProjectName") as System.Web.UI.WebControls.HiddenField;
+ System.Web.UI.WebControls.HiddenField hidISO_ID = Grid2.Rows[gi].FindControl("hidISO_ID") as System.Web.UI.WebControls.HiddenField;
var listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", hidProjectId.Value));
listStr.Add(new SqlParameter("@NDTR_ID", hidNDTR_ID.Value));
listStr.Add(new SqlParameter("@JOTY_Group", hidJOTY_Group.Value));
- listStr.Add(new SqlParameter("@VICheckDate", hidVICheckDate.Value));
+ listStr.Add(new SqlParameter("@WeldingDate", hidJOT_WeldDate.Value));
+ listStr.Add(new SqlParameter("@ISO_ID", hidISO_ID.Value));
SqlParameter[] parameter = listStr.ToArray();
var tb = SQLHelper.GetDataTableRunProc("HJGL_sp_WeldInspectionCheckRecordNew", parameter);
diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs
index 508217e..e78e6da 100644
--- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.designer.cs
@@ -193,13 +193,13 @@ namespace FineUIPro.Web.ContinuousPrint {
protected global::System.Web.UI.WebControls.HiddenField hidJOTY_Group;
///
- /// hidVICheckDate 控件。
+ /// hidJOT_WeldDate 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::System.Web.UI.WebControls.HiddenField hidVICheckDate;
+ protected global::System.Web.UI.WebControls.HiddenField hidJOT_WeldDate;
///
/// hidProjectName 控件。
@@ -210,6 +210,15 @@ namespace FineUIPro.Web.ContinuousPrint {
///
protected global::System.Web.UI.WebControls.HiddenField hidProjectName;
+ ///
+ /// hidISO_ID 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.HiddenField hidISO_ID;
+
///
/// Window1 控件。
///
diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt
index ca1b0c7..6bccdde 100644
--- a/HJGL_DS/FineUIPro.Web/ErrLog.txt
+++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt
@@ -1,54 +1,201 @@
错误信息开始=====>
-错误类型:SqlException
-错误信息:在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: SQL Network Interfaces, error: 26 - 定位指定的服务器/实例时出错)
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
错误堆栈:
- 在 System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, DbConnectionPool pool, String accessToken, Boolean applyTransientFaultHandling, SqlAuthenticationProviderManager sqlAuthProviderManager)
- 在 System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
- 在 System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
- 在 System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
- 在 System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
- 在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
- 在 System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
- 在 System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
- 在 System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
- 在 System.Data.SqlClient.SqlConnection.TryOpenInner(TaskCompletionSource`1 retry)
- 在 System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
- 在 System.Data.SqlClient.SqlConnection.Open()
- 在 System.Data.Linq.SqlClient.SqlConnectionManager.UseConnection(IConnectionUser user)
- 在 System.Data.Linq.SqlClient.SqlProvider.get_IsSqlCe()
- 在 System.Data.Linq.SqlClient.SqlProvider.InitializeProviderMode()
- 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query)
- 在 System.Data.Linq.DataQuery`1.System.Linq.IQueryProvider.Execute[S](Expression expression)
- 在 BLL.Sys_UserService.UserLogOn(String account, String password, Boolean rememberMe, Page page) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\BLL\Common\SysManage\Sys_UserService.cs:行号 39
- 在 FineUIPro.Web.Login.btnLogin_Click(Object sender, EventArgs e)
- 在 FineUIPro.Button.OnClick(EventArgs e)
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
-出错时间:05/27/2025 16:56:28
-出错文件:http://localhost:64304/Login.aspx
+出错时间:06/16/2025 11:31:09
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
IP地址:::1
+操作人员:管理员
-出错时间:05/27/2025 16:56:28
+出错时间:06/16/2025 11:31:09
错误信息开始=====>
-错误类型:XmlException
-错误信息:名称不能以“<”字符(十六进制值 0x3C)开头。 第 14 行,位置 2。
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
错误堆栈:
- 在 System.Xml.XmlTextReaderImpl.Throw(Exception e)
- 在 System.Xml.XmlTextReaderImpl.Throw(String res, String[] args)
- 在 System.Xml.XmlTextReaderImpl.ParseQName(Boolean isQName, Int32 startOffset, Int32& colonPos)
- 在 System.Xml.XmlTextReaderImpl.ParseElement()
- 在 System.Xml.XmlTextReaderImpl.ParseElementContent()
- 在 System.Xml.XmlTextReaderImpl.Read()
- 在 System.Xml.XmlTextReader.Read()
- 在 System.Configuration.XmlUtil.CopyXmlNode(XmlUtilWriter utilWriter)
- 在 System.Configuration.XmlUtil.CopyElement(XmlUtilWriter utilWriter)
- 在 System.Configuration.XmlUtil.CopySection()
- 在 System.Configuration.BaseConfigurationRecord.ScanSectionsRecursive(XmlUtil xmlUtil, String parentConfigKey, Boolean inLocation, String locationSubPath, OverrideModeSetting overrideMode, Boolean skipInChildApps)
- 在 System.Configuration.BaseConfigurationRecord.ScanSections(XmlUtil xmlUtil)
- 在 System.Configuration.BaseConfigurationRecord.InitConfigFromFile()
-出错时间:06/09/2025 10:47:53
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:11
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
-出错时间:06/09/2025 10:47:53
+出错时间:06/16/2025 11:31:11
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
+错误堆栈:
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:13
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 11:31:13
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
+错误堆栈:
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:15
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 11:31:15
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
+错误堆栈:
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:18
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 11:31:18
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
+错误堆栈:
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:20
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 11:31:20
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:DataBinding:“System.Data.DataRowView”不包含名为“NDTR_ID”的属性。
+错误堆栈:
+ 在 System.Web.UI.DataBinder.GetPropertyValue(Object container, String propName)
+ 在 System.Web.UI.DataBinder.Eval(Object container, String[] expressionParts)
+ 在 ASP.continuousprint_weldingjointinspection_aspx.__DataBindinghidNDTR_ID(Object sender, EventArgs e) 位置 e:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\ContinuousPrint\WeldingJointInspection.aspx:行号 89
+ 在 System.Web.UI.Control.OnDataBinding(EventArgs e)
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 System.Web.UI.Control.DataBindChildren()
+ 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding)
+ 在 FineUIPro.GridRow.NeyGkTAyBZXelPYcHqKACezTrQMaA()
+ 在 FineUIPro.Grid.NeyGkTAyBZXelPYcHqKACezTrQMaA(Int32 , Object )
+ 在 FineUIPro.Grid.FmLkfIWGspEZkSaigqKtQvIROoZU(DataTable , Boolean )
+ 在 FineUIPro.Grid.DataBind(Boolean keepCurrentRows)
+ 在 FineUIPro.Grid.OnRowClick(GridRowClickEventArgs e)
+ 在 FineUIPro.Grid.RaisePostBackEvent(String eventArgument)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:06/16/2025 11:31:20
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 11:31:20
+
+
+错误信息开始=====>
+错误类型:ViewStateException
+错误信息:无效的视图状态。
+ Client IP: ::1
+ Port: 8742
+ Referer: http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+ Path: /ContinuousPrint/WeldingJointInspection.aspx
+ User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36 Edg/129.0.0.0
+ ViewState: /wEdADGnm4eusMgLI95ZcqpaSV8K+3GqxzG2J+U/g9/cRF+FhcCurPTiWy9daDa4Uu+xZs2OrJUAsVE+/SXcVFgGfTy1R1Gs9VzqQdsrcDHk38iP40dbnKKQjKuUZXtr6/Z5d0qe7XOxkUtMgefGofIRNAr2HBHGQjGpXVuLC49UfDySYsjlQKui4Hc5dQgJSnoYpDs3Z3I056Ac79PwQnyhFOYSqZTrH9cCRltmlIWllnygsyKrYrGqdqKi2qwFgRXmlBBTtjHnur+0tovaRs6n+I2rPgYKrAu00xIgQ0dDgbw+iRbmsWjnH8y/fbFALLs/oLVXDCMnc1gnI1/KnvWL9mfhrpEVymVMrEirjv+x+WqRJH0T+xR5U/yyGb9Q0SuQakQ2rjeVHZNT8lNoqBO01TSsAary/NBCOGB6teTRFWS9+/45gi1IyT/9KM3ZldJ1q0Li8AJm2tU38hOGyYRrqCUVwQXSBAdwWHC1B5IdZI1vA4xHDdZrmHe0qY8eXW6qXe1PnBqvn6SnA5+0qOT1Qkn28tVWnqw9hllXvrroeXoTQ/4DShPiaOg/F695Ody68UEIz3E0nC90SalNIdgxQWu5Dsqurg8Ec7R0WUNBH70082mm1s6XgB4CXaGofeTydOMFUKheZf19UlmK2O8CyWtid5ETiyReB7ueUsC/dyOf8RgK6kZaNeA3B/UGR+...
+错误堆栈:
+
+出错时间:06/16/2025 15:29:37
+出错文件:http://localhost:64304/ContinuousPrint/WeldingJointInspection.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:06/16/2025 15:29:37
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/工程无损检测重拍报表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/工程无损检测重拍报表.frx
new file mode 100644
index 0000000..0a8ec77
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/工程无损检测重拍报表.frx
@@ -0,0 +1,299 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table2_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table2.PrintRow(0);
+ Table2.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/拍片一次合格率统计表.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/拍片一次合格率统计表.frx
new file mode 100644
index 0000000..200381e
--- /dev/null
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/拍片一次合格率统计表.frx
@@ -0,0 +1,156 @@
+
+
+ using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Drawing;
+using System.Data;
+using FastReport;
+using FastReport.Data;
+using FastReport.Dialog;
+using FastReport.Barcode;
+using FastReport.Table;
+using FastReport.Utils;
+
+namespace FastReport
+{
+ public class ReportScript
+ {
+
+ private void Table2_ManualBuild(object sender, EventArgs e)
+ {
+ DataSourceBase rowData = Report.GetDataSource("Data");
+ // init the data source
+ rowData.Init();
+
+ // print the first table row - it is a header
+
+ // now enumerate the data source and print the table body
+ while (rowData.HasMoreRows)
+ {
+ // print the table body
+ Table2.PrintRow(0);
+ Table2.PrintColumns();
+
+ // go next data source row
+ rowData.Next();
+ }
+ }
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
index 6a0ef4e..37ebca6 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道对接焊接接头报检检查记录.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
index e1dd3f5..d2d73d3 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index 8aa7c11..bf54086 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -2,7 +2,7 @@
true
- Release|Any CPU
+ Debug|Any CPU
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx
index dad162a..bf0001f 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx
@@ -57,9 +57,9 @@
+ AutoScroll="true" runat="server" BoxFlex="1" DataKeyNames="id" AllowCellEditing="true"
+ EnableColumnLines="true" ClicksToEdit="1" DataIDField="id" AllowSorting="true"
+ SortField="id" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True">
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.cs
index ba9178a..09b98f8 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.cs
@@ -7,6 +7,7 @@ using System.Web.UI.WebControls;
using BLL;
using System.Data.SqlClient;
using System.Data;
+using System.IO;
namespace FineUIPro.Web.HJGL.CheckManage
{
@@ -124,7 +125,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_RemakeReason", parameter);
this.Grid1.RecordCount = tb.Rows.Count;
- tb = GetFilteredTable(Grid1.FilteredData, tb);
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
@@ -162,8 +163,84 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
varValue = startDate + "~" + endDate;
}
- varValue = HttpUtility.UrlEncodeUnicode(varValue);
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.HJGL_NDTRemakeReportId, parm, varValue, "打印 - ")));
+
+ string initTemplatePath = "";
+ string rootPath = Server.MapPath("~/");
+ BLL.Common.FastReportService.ResetData();
+
+ var listStr = new List();
+ listStr.Add(new SqlParameter("@parm", parm));
+ SqlParameter[] parameter = listStr.ToArray();
+ var tb = SQLHelper.GetDataTableRunProc("HJGL_sp_rpt_RemakeReason", parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("CheckMan");
+ dt.Columns.Add("t1Num");
+ dt.Columns.Add("t2Num");
+ dt.Columns.Add("t3Num");
+ dt.Columns.Add("t4Num");
+ dt.Columns.Add("t5Num");
+ dt.Columns.Add("t6Num");
+ dt.Columns.Add("t7Num");
+ dt.Columns.Add("t8Num");
+ dt.Columns.Add("t9Num");
+ dt.Columns.Add("t10Num");
+ dt.Columns.Add("t11Num");
+ dt.Columns.Add("t12Num");
+ dt.Columns.Add("t13Num");
+ dt.Columns.Add("t14Num");
+ dt.Columns.Add("t15Num");
+ dt.Columns.Add("t16Num");
+ dt.Columns.Add("t17Num");
+ dt.Columns.Add("t18Num");
+ dt.Columns.Add("t19Num");
+ dt.Columns.Add("t20Num");
+ dt.Columns.Add("t21Num");
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ foreach (var row in rows)
+ {
+ var newRows = dt.NewRow();
+ newRows["CheckMan"] = row["CheckMan"].ToString();
+ newRows["t1Num"] = row["t1Num"].ToString();
+ newRows["t2Num"] = row["t2Num"].ToString();
+ newRows["t3Num"] = row["t3Num"].ToString();
+ newRows["t4Num"] = row["t4Num"].ToString();
+ newRows["t5Num"] = row["t5Num"].ToString();
+ newRows["t6Num"] = row["t6Num"].ToString();
+ newRows["t7Num"] = row["t7Num"].ToString();
+ newRows["t8Num"] = row["t8Num"].ToString();
+ newRows["t9Num"] = row["t9Num"].ToString();
+ newRows["t10Num"] = row["t10Num"].ToString();
+ newRows["t11Num"] = row["t11Num"].ToString();
+ newRows["t12Num"] = row["t12Num"].ToString();
+ newRows["t13Num"] = row["t13Num"].ToString();
+ newRows["t14Num"] = row["t14Num"].ToString();
+ newRows["t15Num"] = row["t15Num"].ToString();
+ newRows["t16Num"] = row["t16Num"].ToString();
+ newRows["t17Num"] = row["t17Num"].ToString();
+ newRows["t18Num"] = row["t18Num"].ToString();
+ newRows["t19Num"] = row["t19Num"].ToString();
+ newRows["t20Num"] = row["t20Num"].ToString();
+ newRows["t21Num"] = row["t21Num"].ToString();
+
+ dt.Rows.Add(newRows);
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+ //传参
+ Dictionary keyValuePairs = new Dictionary();
+ keyValuePairs.Add("varValue", varValue);
+ BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+ initTemplatePath = "File\\Fastreport\\工程无损检测重拍报表.frx";
+
+ if (File.Exists(rootPath + initTemplatePath))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+ }
+ //varValue = HttpUtility.UrlEncodeUnicode(varValue);
+ //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.HJGL_NDTRemakeReportId, parm, varValue, "打印 - ")));
}
#endregion
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.designer.cs
index 4ccc301..2b3871d 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/NDTRemakeReport.aspx.designer.cs
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为,并且如果
-// 重新生成代码,这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
// 自动生成>
//------------------------------------------------------------------------------
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
index cea3159..a027c87 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/CheckManage/PassFileOneQueStatistic.aspx.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using BLL;
+using System.IO;
namespace FineUIPro.Web.HJGL.CheckManage
{
@@ -110,7 +111,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{
string startDate = string.Empty;
string endDate = string.Empty;
- string parameter = string.Empty;
+ //string parameter = string.Empty;
string varValue = string.Empty;
if (!string.IsNullOrEmpty(this.txtStartDate.Text))
@@ -131,11 +132,54 @@ namespace FineUIPro.Web.HJGL.CheckManage
endDate = "NULL";
}
- parameter = startDate + "|" + endDate;
+ //parameter = startDate + "|" + endDate;
varValue = startDate + "至" + endDate;
- varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ","));
+ //varValue = Microsoft.JScript.GlobalObject.escape(varValue.Replace("/", ","));
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", Const.HJGL_PassFileOneQueReportId, parameter, varValue)));
+ string initTemplatePath = "";
+ string rootPath = Server.MapPath("~/");
+ BLL.Common.FastReportService.ResetData();
+
+ var listStr = new List();
+ listStr.Add(new SqlParameter("@startDate", startDate));
+ listStr.Add(new SqlParameter("@endDate", endDate));
+ SqlParameter[] parameter = listStr.ToArray();
+ var tb = SQLHelper.GetDataTableRunProc("HJGL_spPassFileOneQue", parameter);
+
+ DataTable dt = new DataTable();
+ dt.TableName = "Data";
+ dt.Columns.Add("Number");
+ dt.Columns.Add("ProjectName");
+ dt.Columns.Add("TotalFileNum");
+ dt.Columns.Add("RemakeFileNum");
+ dt.Columns.Add("PassRate");
+ DataRow[] rows = tb.DefaultView.ToTable().Select();
+ foreach (var row in rows)
+ {
+ var newRows = dt.NewRow();
+ newRows["Number"] = row["Number"].ToString();
+ newRows["ProjectName"] = row["ProjectName"].ToString();
+ newRows["TotalFileNum"] = row["TotalFileNum"].ToString();
+ newRows["RemakeFileNum"] = row["RemakeFileNum"].ToString();
+ newRows["PassRate"] = row["PassRate"].ToString();
+
+ dt.Rows.Add(newRows);
+ }
+ BLL.Common.FastReportService.AddFastreportTable(dt);
+
+ //传参
+ Dictionary keyValuePairs = new Dictionary();
+ keyValuePairs.Add("varValue", varValue);
+ BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
+
+ initTemplatePath = "File\\Fastreport\\拍片一次合格率统计表.frx";
+
+ if (File.Exists(rootPath + initTemplatePath))
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+ }
+
+ //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", Const.HJGL_PassFileOneQueReportId, parameter, varValue)));
}
#endregion
}
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index bf404b8..aa58035 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user
index 28be9c4..a48b337 100644
--- a/HJGL_DS/WebAPI/WebAPI.csproj.user
+++ b/HJGL_DS/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
FolderProfile
true