diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql new file mode 100644 index 0000000..3c3a8b2 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-10-10_bwj.sql @@ -0,0 +1,52 @@ + +ALTER PROCEDURE [dbo].[HJGL_sp_rpt_TrustItem] +( + @CH_TrustID NVARCHAR(50) +) +AS +/******Ŀίеϸ*******/ +SELECT ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Sort, +ROW_NUMBER() OVER(ORDER BY JointInfo.Sort1,JointInfo.Sort2,JointInfo.Sort3,JointInfo.Sort4,JointInfo.Sort5) as Number, +TrustItem.CH_TrustItemID, +TrustItem.CH_TrustID, +iso.ISO_ID, +iso.ISO_IsoNo, +iso.ISO_IsoNo AS ISO_Number,--ͼ +JointInfo.JOT_JointDesc,-- +batch.BatchCode, +(CASE WHEN batchDetail.PointType=2 + THEN JointInfo.JOT_JointNo+'K' ELSE JointInfo.JOT_JointNo END) AS JOT_JointNo,-- +(CASE WHEN JointInfo.JOT_CellWelder!=JointInfo.JOT_FloorWelder THEN Welder1.WED_Code+'/'+Welder2.WED_Code ELSE Welder1.WED_Code END) AS WED_Code,-- + + (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code + THEN Steel.STE_Code + '/' + Steel2.STE_Code + WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code + ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code, -- +(CASE WHEN (TrustItem.CH_Remark IS NULL OR TrustItem.CH_Remark='') AND jotR.JOT_JointNo IS NOT NULL + THEN isoR.ISO_IsoNo+','+jotR.JOT_JointNo+' ' ELSE batchDetail.CheckAddress END) AS CH_Remark, --ע +isoClass.ISC_IsoName, +JointInfo.JOTY_ID, +batchDetail.PointDate +FROM HJGL_CH_TrustItem AS TrustItem +LEFT JOIN dbo.HJGL_PW_JointInfo AS JointInfo ON JointInfo.JOT_ID = TrustItem.JOT_ID +LEFT JOIN dbo.HJGL_BO_BatchDetail batchDetail on batchDetail.BatchDetailId=TrustItem.BatchDetailId +LEFT JOIN dbo.HJGL_BO_Batch batch on batch.BatchId=batchDetail.BatchId +LEFT JOIN dbo.HJGL_PW_IsoInfo iso on iso.ISO_ID=JointInfo.ISO_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = JointInfo.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=JointInfo.STE_ID2 +LEFT JOIN dbo.HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder +LEFT JOIN dbo.HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder +LEFT JOIN dbo.HJGL_CH_RepairItemRecord AS repair ON batchDetail.ToRepairId=repair.RepairItemRecordId +LEFT JOIN dbo.HJGL_PW_JointInfo AS jotR ON jotR.JOT_ID = repair.JOT_ID +LEFT JOIN dbo.HJGL_PW_IsoInfo AS isoR ON isoR.ISO_ID = repair.ISO_ID +LEFT JOIN HJGL_BS_IsoClass AS isoClass ON isoClass.ISC_ID = iso.ISC_ID +WHERE TrustItem.CH_TrustID=@CH_TrustID + +union + +SELECT 99999 as Sort,null, NEWID(), NULL,null, '¿հ' AS ISO_IsoNo,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,null,null + +order by Sort +GO + + diff --git a/DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql new file mode 100644 index 0000000..fb375c5 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-10-12_bwj.sql @@ -0,0 +1,60 @@ + + +ALTER PROCEDURE [dbo].[HJGL_spCH_HotProessTrustItem] +( + @HotProessTrustId nvarchar(50), + @ProessTypes nvarchar(50)=null +) +AS +--ͨidȡίеϢ +BEGIN + select *, + ProessTypes1+ + (case when ProessTypes1<>'' and ProessTypes2<>'' then ','+ ProessTypes2 else ProessTypes2 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'') and ProessTypes3<>'' then ','+ ProessTypes3 else ProessTypes3 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'') and ProessTypes4<>'' then ','+ ProessTypes4 else ProessTypes4 end) + +(case when (ProessTypes1<>'' or ProessTypes2<>'' or ProessTypes3<>'' or ProessTypes4<>'') and ProessTypes5<>'' then ','+ ProessTypes5 else ProessTypes5 end) as ProessTypes + from + ( + select --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Sort, + --ROW_NUMBER() OVER(ORDER BY JOT_JointNo) as Number, + c.Number, + c.HotProessTrustItemId, --ȴίϸid + c.HotProessTrustId, -- ȴίid + c.JOT_ID, --id + c.TrustDate, + c.ISO_IsoNo, + c.JOT_JointNo, + c.Remark, + ProessTypes1 =case when ProessTypes like '%1%' then 'Ԥ' + else '' end, + ProessTypes2 =case when ProessTypes like '%2%' then '' + else '' end, + ProessTypes3 =case when ProessTypes like '%3%' then '' + else '' end, + ProessTypes4 =case when ProessTypes like '%4%' then 'Ӧȴ' + else '' end, + ProessTypes5 =case when ProessTypes like '%5%' then 'ȶ' + else '' end, + c.JOT_JointDesc, -- + c.ProjectId, + c.STE_Code, -- + c.WME_Code, --ӷ + c.WED_Code -- +from dbo.HJGL_View_CH_HotProessTrustItem c +where c.HotProessTrustId = @HotProessTrustId +and (c.ProessTypes=@ProessTypes or @ProessTypes is null) +) as t +--order by t.ISO_IsoNo,t.JOT_JointNo + + +union + +select 99999999 as Number,null,null,null,null,'¿հ' AS ISO_IsoNo,null,null,null,null,null,null,null,null,null,null,null,null,null + +order by Number + +END +GO + + diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs index a3139d6..2092eca 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/TestOrderPrint.aspx.cs @@ -339,10 +339,12 @@ namespace FineUIPro.Web.ContinuousPrint string isoid = rows2[0]["ISO_ID"].ToString(); string jotyId = rows2[0]["JOTY_ID"].ToString(); int jointCount = BLL.HJGL_PW_JointInfoService.GetJointCountByIsoId(isoid, jotyId); + string pointDate = string.Format("{0:yyyy-MM-dd}", rows2[0]["PointDate"]); //传参 Dictionary keyValuePairs = new Dictionary(); keyValuePairs.Add("JointCount", jointCount.ToString()); - keyValuePairs.Add("CheckCount", (rows.Count() - 1).ToString()); + keyValuePairs.Add("CheckCount", (rows2.Count() - 1).ToString()); + keyValuePairs.Add("pointDate", pointDate); BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); initTemplatePath = "File\\Fastreport\\管道焊缝检测委托单.frx"; diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs index 06ee3a7..085f261 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.ContinuousPrint 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_JointType jointType ON jointType.JOTY_ID = batch.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)); diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt index ef7802c..5f28270 100644 --- a/HJGL_DS/FineUIPro.Web/ErrLog.txt +++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt @@ -1,155 +1 @@ - -错误信息开始=====> -错误类型:SqlException -错误信息:在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: SQL Network Interfaces, error: 26 - 定位指定的服务器/实例时出错) -错误堆栈: - 在 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) 位置 E:\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\Login.aspx.cs:行号 52 - 在 FineUIPro.Button.OnClick(EventArgs e) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:06/26/2025 10:36:58 -出错文件:http://localhost:64304/Login.aspx -IP地址:::1 - -出错时间:06/26/2025 10:36:58 - - -错误信息开始=====> -错误类型:HttpException -错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。 -错误堆栈: - 在 System.Web.HttpResponse.set_ContentType(String value) - 在 (HttpResponse , String ) - 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq() - 在 (hZzEMoBFowQHNetYNlTaFyfiuHiLc ) - 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq(Object , EventArgs ) - 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:07/07/2025 10:10:27 -出错文件:http://localhost:64304/HJGL/DataIn/JointIn.aspx -IP地址:::1 -操作人员:管理员 - -出错时间:07/07/2025 10:10:27 - - -错误信息开始=====> -错误类型:FormatException -错误信息:输入字符串的格式不正确。 -错误堆栈: - 在 System.Number.StringToNumber(String str, NumberStyles options, NumberBuffer& number, NumberFormatInfo info, Boolean parseDecimal) - 在 System.Number.ParseDecimal(String value, NumberStyles options, NumberFormatInfo numfmt) - 在 System.Decimal.Parse(String s) - 在 BLL.Funs.GetNewDecimalOrZero(String value) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\BLL\Funs.cs:行号 386 -出错时间:07/08/2025 16:56:56 -出错时间:07/08/2025 16:56:56 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web._default.Page_Init(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\default.aspx.cs:行号 114 - 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) - 在 System.Web.UI.Control.OnInit(EventArgs e) - 在 System.Web.UI.Page.OnInit(EventArgs e) - 在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 135 - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:07/24/2025 16:12:09 -出错文件:http://localhost:64304/default.aspx -IP地址:::1 - -出错时间:07/24/2025 16:12:09 - - -错误信息开始=====> -错误类型:NullReferenceException -错误信息:未将对象引用设置到对象的实例。 -错误堆栈: - 在 FineUIPro.Web.PageBase.OnInit(EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\common\PageBase.cs:行号 121 - 在 System.Web.UI.Control.InitRecursive(Control namingContainer) - 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) -出错时间:07/28/2025 11:13:06 -出错文件:http://localhost:64304/WeldMat/UsingSentMat/WelderUsing.aspx -IP地址:::1 -操作人员:管理员 - -出错时间:07/28/2025 11:13:06 - - -错误信息开始=====> -错误类型:HttpCompileException -错误信息:d:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\WeldMat\Stock\StockIn.aspx(132): error CS1061: “ASP.weldmat_stock_stockin_aspx”不包含“btnMenuConfirm_Click”的定义，并且找不到可接受类型为“ASP.weldmat_stock_stockin_aspx”的第一个参数的扩展方法“btnMenuConfirm_Click”(是否缺少 using 指令或程序集引用?) -错误堆栈: - 在 System.Web.Compilation.BuildManager.CompileWebFile(VirtualPath virtualPath) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultInternal(VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVPathBuildResultWithNoAssert(HttpContext context, VirtualPath virtualPath, Boolean noBuild, Boolean allowCrossApp, Boolean allowBuildInPrecompile, Boolean throwIfNotFound, Boolean ensureIsUpToDate) - 在 System.Web.Compilation.BuildManager.GetVirtualPathObjectFactory(VirtualPath virtualPath, HttpContext context, Boolean allowCrossApp, Boolean throwIfNotFound) - 在 System.Web.Compilation.BuildManager.CreateInstanceFromVirtualPath(VirtualPath virtualPath, Type requiredBaseType, HttpContext context, Boolean allowCrossApp) - 在 System.Web.UI.PageHandlerFactory.GetHandlerHelper(HttpContext context, String requestType, VirtualPath virtualPath, String physicalPath) - 在 System.Web.UI.PageHandlerFactory.GetHandler(HttpContext context, String requestType, String virtualPath, String path) - 在 System.Web.HttpApplication.MaterializeHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() - 在 System.Web.HttpApplication.ExecuteStepImpl(IExecutionStep step) - 在 System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) -出错时间:08/04/2025 15:24:06 -出错文件:http://localhost:64304/WeldMat/Stock/StockIn.aspx -IP地址:::1 - -出错时间:08/04/2025 15:24:06 - - -错误信息开始=====> -错误类型:SqlException -错误信息:在与 SQL Server 建立连接时出现与网络相关的或特定于实例的错误。未找到或无法访问服务器。请验证实例名称是否正确并且 SQL Server 已配置为允许远程连接。 (provider: SQL Network Interfaces, error: 26 - 定位指定的服务器/实例时出错) -错误堆栈: - 在 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.ProviderBase.DbConnectionClosed.TryOpenConnection(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) - 在 System.Linq.Queryable.Count[TSource](IQueryable`1 source) - 在 BLL.Sys_UserService.UserLogOn(String account, String password, Boolean rememberMe, Page page) 位置 D:\工作\鼎盛\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) - 在 (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) -出错时间:08/07/2025 10:39:13 -出错文件:http://localhost:64304/Login.aspx -IP地址:::1 - -出错时间:08/07/2025 10:39:13 - + \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/热处理委托单.frx index c8d6592..d0e8706 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 } - + @@ -111,11 +111,11 @@ namespace FastReport - + - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/管道焊接接头报检检查记录.frx index b39a8c5..ce68404 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 31cf295..00a933b 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; @@ -41,7 +41,7 @@ namespace FastReport } - + @@ -71,6 +71,7 @@ namespace FastReport + @@ -292,10 +293,10 @@ namespace FastReport - + - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs index 504e6aa..1a9bd4f 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessTrust.aspx.cs @@ -696,6 +696,14 @@ namespace FineUIPro.Web.HJGL.HotProessManage List listStr2 = new List(); listStr2.Add(new SqlParameter("@HotProessTrustId", this.HotProessTrustId)); + if (drpProessTypes.SelectedValue != BLL.Const._Null) + { + listStr2.Add(new SqlParameter("@ProessTypes", drpProessTypes.SelectedValue)); + } + else + { + listStr2.Add(new SqlParameter("@ProessTypes", null)); + } SqlParameter[] parameter2 = listStr2.ToArray(); DataTable tb2 = BLL.SQLHelper.GetDataTableRunProc("HJGL_spCH_HotProessTrustItem", parameter2); diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index e233efb..5c46a5b 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - +