20260627 返修扩拍

.gitignore

@@ -41,3 +41,4 @@ bin-release/
 *.xls
 /HJGL_DS/FineUIPro.Web/File/PDF/Pipe
 /HJGL_DS/FineUIPro.Web/File/Fastreport/Temp
+/HJGL_DS/FineUIPro.Web/ReportPrint

DataBase/版本日志/HJGLDB_DS_2026-06-27_bwj.sql

@@ -0,0 +1,35 @@
+
+
+--委托明细表查询列表
+ALTER VIEW [dbo].[HJGL_View_CH_TrustItem]
+/*委托明细表查询列表*/
+AS
+SELECT TrustItem.CH_TrustItemID, --委托明细id
+		TrustItem.CH_TrustID, -- 委托id
+		JointInfo.JOT_ID, --焊口id
+		IsoInfo.BAW_ID, ---施工区域id
+		JointInfo.InstallationId, --装置id
+		Installation.InstallationName,
+		Trust.CH_TrustType,
+		Trust.CH_TrustDate,		
+		IsoInfo.ISO_IsoNo,
+		JointInfo.JOT_JointNo,		
+		TrustItem.CH_Remark,
+		CAST(JointInfo.JOT_Dia AS DECIMAL(18,2)) AS JOT_Dia,
+		JointInfo.JOT_Sch,
+		JointInfo.WLO_Code,
+		WeldMethod.WME_Name,
+		JointInfo.ProjectId,
+		JointInfo.WME_ID,
+		JointInfo.JOT_JointStatus,
+		TrustItem.FeedbackDate
+FROM dbo.HJGL_PW_JointInfo AS JointInfo 
+LEFT JOIN dbo.HJGL_CH_TrustItem AS TrustItem ON JointInfo.JOT_ID = TrustItem.JOT_ID
+LEFT JOIN dbo.HJGL_CH_Trust AS Trust ON Trust.CH_TrustID=TrustItem.CH_TrustID
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON JointInfo.ISO_ID = IsoInfo.ISO_ID
+LEFT JOIN dbo.Project_Installation AS Installation ON JointInfo.InstallationId = Installation.InstallationId
+LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=JointInfo.WME_ID
+
+GO
+
+

HJGL_DS/BLL/Common/FastReportService.cs

@@ -8,195 +8,78 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Web;
 using System.Web.Security;
-using System.Timers;
-using System;
-using FastReport.Export.Pdf;
-using System.IO;
 
 namespace BLL.Common
 {
     public static class FastReportService
     {
-        private static Timer tempReportCleanupTimer;
         // 缓存过期时间：30分钟
         private static readonly int CacheExpirationMinutes = 5;
 
         /// <summary>
-        /// 重置数据
+        /// 重置数据 - 清理缓存和Session
         /// </summary>
         public static void ResetData()
         {
-            HttpContext.Current.Session["ReportDataTables"] = null;
+            if (HttpContext.Current?.Session == null)
-            HttpContext.Current.Session["ReportParameterValues"] = null;
-        }
-        public static void AddFastreportTable(DataTable dataTable)
-        {
-            List<DataTable> dataTables = (List<DataTable>)HttpContext.Current.Session["ReportDataTables"];
-            if (dataTables == null)
             {
-                dataTables = new List<DataTable>();
+                return;
-            }
-            dataTables.Add(dataTable);
-
-            HttpContext.Current.Session["ReportDataTables"] = dataTables;
-        }
-        public static void AddFastreportParameter(Dictionary<string, string> Dicparames)
-        {
-            HttpContext.Current.Session["ReportParameterValues"] = Dicparames;
-
-        }
-
-        /// <summary>
-        /// 启动临时报表清理定时器，定期删除超过 1 小时的 PDF。
-        /// </summary>
-        public static void StartTempReportCleanupMonitor()
-        {
-            if (tempReportCleanupTimer != null)
-            {
-                tempReportCleanupTimer.Stop();
-                tempReportCleanupTimer.Dispose();
-                tempReportCleanupTimer = null;
             }
 
-            CleanExpiredTempReports();
+            // 清理Session中的缓存键引用
-            tempReportCleanupTimer = new Timer
+            var cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List<string>;
+            if (cacheKeys != null)
             {
-                AutoReset = true,
+                foreach (var key in cacheKeys)
-                Interval = 1000 * 60 * 30
-            };
-            tempReportCleanupTimer.Elapsed += TempReportCleanupTimer_Elapsed;
-            tempReportCleanupTimer.Start();
-        }
-
-        private static void TempReportCleanupTimer_Elapsed(object sender, ElapsedEventArgs e)
-        {
-            CleanExpiredTempReports();
-        }
-
-        /// <summary>
-        /// 删除 File/Fastreport/Temp 下创建时间超过 1 小时的 PDF 临时文件。
-        /// </summary>
-        public static void CleanExpiredTempReports()
-        {
-            try
-            {
-                string tempDirectory = Path.Combine(Funs.RootPath, @"File\Fastreport\Temp\");
-                if (!Directory.Exists(tempDirectory))
                 {
-                    return;
+                    try
-                }
-
-                DateTime expiredTime = DateTime.Now.AddHours(-1);
-                foreach (string file in Directory.GetFiles(tempDirectory, "*.pdf", SearchOption.TopDirectoryOnly))
-                {
-                    FileInfo fileInfo = new FileInfo(file);
-                    if (fileInfo.CreationTime < expiredTime)
                     {
-                        fileInfo.Attributes = FileAttributes.Normal;
+                        CacheHelper.Remove(key);
-                        fileInfo.Delete();
+                    }
+                    catch
+                    {
+                        // 忽略缓存删除异常
                     }
                 }
             }
-            catch (Exception ex)
+            HttpContext.Current.Session["ReportDataCacheKeys"] = null;
-            {
+            HttpContext.Current.Session["ReportParameterCacheKey"] = null;
-                ErrLogInfo.WriteLog(ex, "FastReport临时报表清理", "FastReportService.CleanExpiredTempReports");
-            }
         }
 
         /// <summary>
-        /// 导出报表 PDF 到临时目录，并返回可访问的相对 URL。
+        /// 添加报表数据表到缓存
         /// </summary>
-        /// <param name="reportPath">报表模板路径，支持绝对路径或相对 Funs.RootPath 的路径。</param>
+        public static void AddFastreportTable(DataTable dataTable)
-        public static string ExportReport(string reportPath)
         {
-            List<DataTable> dataTables = (List<DataTable>)HttpContext.Current.Session["ReportDataTables"];
+
-            Dictionary<string, string> parameterValues = (Dictionary<string, string>)HttpContext.Current.Session["ReportParameterValues"];
+            // 生成唯一缓存键
-            return ExportReport(reportPath, dataTables, parameterValues);
+            string cacheKey = $"ReportData_{Guid.NewGuid()}_{DateTime.Now.Ticks}";
+
+            // 将数据表存储到缓存中，设置5分钟过期
+            CacheHelper.Add(cacheKey, dataTable, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes));
+
+            List<string> cacheKeys = HttpContext.Current.Session["ReportDataCacheKeys"] as List<string>;
+            if (cacheKeys==null)
+            {
+                cacheKeys = new List<string>();
+            }
+            cacheKeys.Add(cacheKey);
+            HttpContext.Current.Session["ReportDataCacheKeys"] = cacheKeys; 
         }
 
         /// <summary>
-        /// 导出报表 PDF 到临时目录，并返回可访问的相对 URL。
+        /// 添加报表参数到缓存
         /// </summary>
-        /// <param name="reportPath">报表模板路径，支持绝对路径或相对 Funs.RootPath 的路径。</param>
+        public static void AddFastreportParameter(Dictionary<string, string> Dicparames)
-        /// <param name="dataTables">报表数据源集合。</param>
+        {  
-        /// <param name="parameterValues">报表参数集合。</param>
+            // 生成唯一缓存键
-        public static string ExportReport(string reportPath, List<DataTable> dataTables, Dictionary<string, string> parameterValues)
+            string cacheKey = $"ReportParam_{Guid.NewGuid()}_{DateTime.Now.Ticks}";
-        {
-            string fullReportPath = GetReportFullPath(reportPath);
-            if (string.IsNullOrEmpty(fullReportPath) || !File.Exists(fullReportPath))
-            {
-                throw new FileNotFoundException("打印模板不存在！", reportPath);
-            }
 
-            string relativeDirectory = @"File\Fastreport\Temp\";
+            // 将参数存储到缓存中，设置5分钟过期
-            string tempDirectory = Path.Combine(Funs.RootPath, relativeDirectory);
+            CacheHelper.Add(cacheKey, Dicparames, DateTimeOffset.Now.AddMinutes(CacheExpirationMinutes));
-            if (!Directory.Exists(tempDirectory))
-            {
-                Directory.CreateDirectory(tempDirectory);
-            }
 
-            string fileName = "report_" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + "_" + Guid.NewGuid().ToString("N") + ".pdf";
+            // Session只存储缓存键的引用（轻量级）
-            string filePath = Path.Combine(tempDirectory, fileName);
+            HttpContext.Current.Session["ReportParameterCacheKey"] = cacheKey;
-            using (Report report = BuildPreparedReport(fullReportPath, dataTables, parameterValues))
-            using (PDFExport pdfExport = new PDFExport())
-            {
-                // Web 打印先导出 PDF，前端用 iframe 装载后调用浏览器打印。
-                pdfExport.PrintScaling = false;
-                pdfExport.ShowPrintDialog = true;
-                report.Export(pdfExport, filePath);
-            }
-
-            return "~/" + relativeDirectory.Replace("\\", "/") + fileName;
-        }
-
-        private static Report BuildPreparedReport(string reportPath, List<DataTable> dataTables, Dictionary<string, string> parameterValues)
-        {
-            FastReport.Utils.Config.WebMode = true;
-            Report report = new Report();
-            report.Load(reportPath);
-            if (report.Dictionary.Connections.Count > 0)
-            {
-                var reportConnection = report.Dictionary.Connections[0];
-                if (reportConnection.ConnectionString != Funs.ConnString)
-                {
-                    // 打印时只替换本次报表连接，避免把运行环境连接串写回模板文件。
-                    reportConnection.ConnectionString = Funs.ConnString;
-                }
-            }
-
-            if (dataTables != null && dataTables.Count > 0)
-            {
-                for (int i = 0; i < dataTables.Count; i++)
-                {
-                    report.RegisterData(dataTables[i], dataTables[i].TableName);
-                }
-            }
-
-            if (parameterValues != null && parameterValues.Count > 0)
-            {
-                foreach (KeyValuePair<string, string> kvp in parameterValues)
-                {
-                    report.SetParameterValue(kvp.Key, kvp.Value);
-                }
-            }
-
-            report.Prepare();
-            return report;
-        }
-
-        private static string GetReportFullPath(string reportPath)
-        {
-            if (string.IsNullOrEmpty(reportPath))
-            {
-                return reportPath;
-            }
-
-            if (Path.IsPathRooted(reportPath))
-            {
-                return reportPath;
-            }
-
-            return Path.Combine(Funs.RootPath, reportPath.TrimStart('\\', '/'));
         }
 
         /// <summary>
@@ -222,21 +105,26 @@ namespace BLL.Common
                     {
                         report.RegisterData(dataTables[j], dataTables[j].TableName);//绑定数据源
                     }
+
                 }
                 if (ParameterValues.Count > 0)
                 {
                     foreach (KeyValuePair<string, string> kvp in ParameterValues)
                     {
-                        report.SetParameterValue(kvp.Key, kvp.Value);//绑定参数                        
+                        report.SetParameterValue(kvp.Key, kvp.Value);//绑定参数
+
                     }
+
                 }
                 if (i == 0)
                 {
                     report.Prepare();
+
                 }
                 else
                 {
                     report.Prepare(true);
+
                 }
             }
             if (printType == "1")

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj

@@ -362,7 +362,6 @@
     <Content Include="common\BaseInfo\TestEngineering.aspx" />
     <Content Include="common\BaseInfo\Unit.aspx" />
     <Content Include="common\BaseInfo\UnitEdit.aspx" />
-    <Content Include="common\ReportPrint\Fastreport.aspx" />
     <Content Include="common\FileManage\EditOffice.aspx" />
     <Content Include="common\FileManage\FileManageList.aspx" />
     <Content Include="common\FileManage\FileManageList1.aspx" />
@@ -401,88 +400,7 @@
     <Content Include="common\ProjectSet\SelectWelder.aspx" />
     <Content Include="common\ProjectSet\WorkArea.aspx" />
     <Content Include="common\ProjectSet\WorkAreaEdit.aspx" />
-    <Content Include="common\ReportPrint\CalculateChinaEx.aspx" />
-    <Content Include="common\ReportPrint\css\chinaexcel.css" />
-    <Content Include="common\ReportPrint\ExPrintSet.aspx" />
-    <Content Include="common\ReportPrint\ExReportPrint.aspx" />
-    <Content Include="common\ReportPrint\images\about.gif" />
-    <Content Include="common\ReportPrint\images\alignbottom.gif" />
-    <Content Include="common\ReportPrint\images\aligncenter.gif" />
-    <Content Include="common\ReportPrint\images\alignleft.gif" />
-    <Content Include="common\ReportPrint\images\alignmiddle.gif" />
-    <Content Include="common\ReportPrint\images\alignright.gif" />
-    <Content Include="common\ReportPrint\images\aligntop.gif" />
-    <Content Include="common\ReportPrint\images\backcolor.gif" />
-    <Content Include="common\ReportPrint\images\bold.gif" />
-    <Content Include="common\ReportPrint\images\border.gif" />
-    <Content Include="common\ReportPrint\images\calculateall.gif" />
-    <Content Include="common\ReportPrint\images\cellstyle.gif" />
-    <Content Include="common\ReportPrint\images\chartw.gif" />
-    <Content Include="common\ReportPrint\images\collabel.gif" />
-    <Content Include="common\ReportPrint\images\copy.gif" />
-    <Content Include="common\ReportPrint\images\currency.gif" />
-    <Content Include="common\ReportPrint\images\cut.gif" />
-    <Content Include="common\ReportPrint\images\databasewizard.gif" />
-    <Content Include="common\ReportPrint\images\deletecell.gif" />
-    <Content Include="common\ReportPrint\images\deletecol.gif" />
-    <Content Include="common\ReportPrint\images\deleterow.gif" />
-    <Content Include="common\ReportPrint\images\desgin.gif" />
-    <Content Include="common\ReportPrint\images\erase.gif" />
-    <Content Include="common\ReportPrint\images\export.gif" />
-    <Content Include="common\ReportPrint\images\finance.gif" />
-    <Content Include="common\ReportPrint\images\financeheader.gif" />
-    <Content Include="common\ReportPrint\images\find.gif" />
-    <Content Include="common\ReportPrint\images\forecolor.gif" />
-    <Content Include="common\ReportPrint\images\formprotect.gif" />
-    <Content Include="common\ReportPrint\images\formula.gif" />
-    <Content Include="common\ReportPrint\images\formulaS.gif" />
-    <Content Include="common\ReportPrint\images\gridline.gif" />
-    <Content Include="common\ReportPrint\images\header.gif" />
-    <Content Include="common\ReportPrint\images\hyperlink.gif" />
-    <Content Include="common\ReportPrint\images\insertcell.gif" />
-    <Content Include="common\ReportPrint\images\insertcellpic.gif" />
-    <Content Include="common\ReportPrint\images\insertcol.gif" />
-    <Content Include="common\ReportPrint\images\insertpic.gif" />
-    <Content Include="common\ReportPrint\images\insertrow.gif" />
-    <Content Include="common\ReportPrint\images\italic.gif" />
-    <Content Include="common\ReportPrint\images\mergecell.gif" />
-    <Content Include="common\ReportPrint\images\new.gif" />
-    <Content Include="common\ReportPrint\images\open.gif" />
-    <Content Include="common\ReportPrint\images\openweb.gif" />
-    <Content Include="common\ReportPrint\images\openwebxml.gif" />
-    <Content Include="common\ReportPrint\images\paste.gif" />
-    <Content Include="common\ReportPrint\images\percent.gif" />
-    <Content Include="common\ReportPrint\images\print.gif" />
-    <Content Include="common\ReportPrint\images\printpapaerset.gif" />
-    <Content Include="common\ReportPrint\images\printpaperset.gif" />
-    <Content Include="common\ReportPrint\images\printpreview.gif" />
-    <Content Include="common\ReportPrint\images\printsetup.gif" />
-    <Content Include="common\ReportPrint\images\readonly.gif" />
-    <Content Include="common\ReportPrint\images\redo.gif" />
-    <Content Include="common\ReportPrint\images\return.gif" />
-    <Content Include="common\ReportPrint\images\rowlabel.gif" />
-    <Content Include="common\ReportPrint\images\save.gif" />
-    <Content Include="common\ReportPrint\images\savexml.gif" />
-    <Content Include="common\ReportPrint\images\shape3D.gif" />
-    <Content Include="common\ReportPrint\images\sheetsize.gif" />
-    <Content Include="common\ReportPrint\images\slashset.gif" />
-    <Content Include="common\ReportPrint\images\sum.gif" />
-    <Content Include="common\ReportPrint\images\sumh.gif" />
-    <Content Include="common\ReportPrint\images\sumv.gif" />
-    <Content Include="common\ReportPrint\images\test.gif" />
-    <Content Include="common\ReportPrint\images\thousand.gif" />
-    <Content Include="common\ReportPrint\images\underline.gif" />
-    <Content Include="common\ReportPrint\images\undo.gif" />
-    <Content Include="common\ReportPrint\images\unmergecell.gif" />
-    <Content Include="common\ReportPrint\images\wordwrap.gif" />
-    <Content Include="common\ReportPrint\images\xmlfileopen.gif" />
-    <Content Include="common\ReportPrint\js\Common.js" />
-    <Content Include="common\ReportPrint\js\functions.vbs" />
-    <Content Include="common\ReportPrint\js\Object.js" />
     <Content Include="common\mainGdaz.aspx" />
-    <Content Include="common\ReportPrint\PrintDesigner.aspx" />
-    <Content Include="common\ReportPrint\ReadExReportFile.aspx" />
-    <Content Include="common\ReportPrint\SaveTabFile.aspx" />
     <Content Include="common\Resource\EditLawRegulation.aspx" />
     <Content Include="common\Resource\LawRegulationList.aspx" />
     <Content Include="common\ShowPerson.aspx" />
@@ -1562,6 +1480,89 @@
     <Content Include="OfficeControl\OfficeControl.ocx" />
     <Content Include="OfficeControl\signtoolcontrol.js" />
     <Content Include="OfficeControl\手工卸载安装NTKO OFFICE文档控件.txt" />
+    <Content Include="ReportPrint\CalculateChinaEx.aspx" />
+    <Content Include="ReportPrint\css\chinaexcel.css" />
+    <Content Include="ReportPrint\ExPrintSet.aspx" />
+    <Content Include="ReportPrint\ExReportPrint.aspx" />
+    <Content Include="ReportPrint\Fastreport.aspx" />
+    <Content Include="ReportPrint\images\about.gif" />
+    <Content Include="ReportPrint\images\alignbottom.gif" />
+    <Content Include="ReportPrint\images\aligncenter.gif" />
+    <Content Include="ReportPrint\images\alignleft.gif" />
+    <Content Include="ReportPrint\images\alignmiddle.gif" />
+    <Content Include="ReportPrint\images\alignright.gif" />
+    <Content Include="ReportPrint\images\aligntop.gif" />
+    <Content Include="ReportPrint\images\backcolor.gif" />
+    <Content Include="ReportPrint\images\bold.gif" />
+    <Content Include="ReportPrint\images\border.gif" />
+    <Content Include="ReportPrint\images\calculateall.gif" />
+    <Content Include="ReportPrint\images\cellstyle.gif" />
+    <Content Include="ReportPrint\images\chartw.gif" />
+    <Content Include="ReportPrint\images\collabel.gif" />
+    <Content Include="ReportPrint\images\copy.gif" />
+    <Content Include="ReportPrint\images\currency.gif" />
+    <Content Include="ReportPrint\images\cut.gif" />
+    <Content Include="ReportPrint\images\databasewizard.gif" />
+    <Content Include="ReportPrint\images\deletecell.gif" />
+    <Content Include="ReportPrint\images\deletecol.gif" />
+    <Content Include="ReportPrint\images\deleterow.gif" />
+    <Content Include="ReportPrint\images\desgin.gif" />
+    <Content Include="ReportPrint\images\erase.gif" />
+    <Content Include="ReportPrint\images\export.gif" />
+    <Content Include="ReportPrint\images\finance.gif" />
+    <Content Include="ReportPrint\images\financeheader.gif" />
+    <Content Include="ReportPrint\images\find.gif" />
+    <Content Include="ReportPrint\images\forecolor.gif" />
+    <Content Include="ReportPrint\images\formprotect.gif" />
+    <Content Include="ReportPrint\images\formula.gif" />
+    <Content Include="ReportPrint\images\formulaS.gif" />
+    <Content Include="ReportPrint\images\gridline.gif" />
+    <Content Include="ReportPrint\images\header.gif" />
+    <Content Include="ReportPrint\images\hyperlink.gif" />
+    <Content Include="ReportPrint\images\insertcell.gif" />
+    <Content Include="ReportPrint\images\insertcellpic.gif" />
+    <Content Include="ReportPrint\images\insertcol.gif" />
+    <Content Include="ReportPrint\images\insertpic.gif" />
+    <Content Include="ReportPrint\images\insertrow.gif" />
+    <Content Include="ReportPrint\images\italic.gif" />
+    <Content Include="ReportPrint\images\mergecell.gif" />
+    <Content Include="ReportPrint\images\new.gif" />
+    <Content Include="ReportPrint\images\open.gif" />
+    <Content Include="ReportPrint\images\openweb.gif" />
+    <Content Include="ReportPrint\images\openwebxml.gif" />
+    <Content Include="ReportPrint\images\paste.gif" />
+    <Content Include="ReportPrint\images\percent.gif" />
+    <Content Include="ReportPrint\images\print.gif" />
+    <Content Include="ReportPrint\images\printpapaerset.gif" />
+    <Content Include="ReportPrint\images\printpaperset.gif" />
+    <Content Include="ReportPrint\images\printpreview.gif" />
+    <Content Include="ReportPrint\images\printsetup.gif" />
+    <Content Include="ReportPrint\images\readonly.gif" />
+    <Content Include="ReportPrint\images\redo.gif" />
+    <Content Include="ReportPrint\images\return.gif" />
+    <Content Include="ReportPrint\images\rowlabel.gif" />
+    <Content Include="ReportPrint\images\save.gif" />
+    <Content Include="ReportPrint\images\savexml.gif" />
+    <Content Include="ReportPrint\images\shape3D.gif" />
+    <Content Include="ReportPrint\images\sheetsize.gif" />
+    <Content Include="ReportPrint\images\slashset.gif" />
+    <Content Include="ReportPrint\images\sum.gif" />
+    <Content Include="ReportPrint\images\sumh.gif" />
+    <Content Include="ReportPrint\images\sumv.gif" />
+    <Content Include="ReportPrint\images\test.gif" />
+    <Content Include="ReportPrint\images\thousand.gif" />
+    <Content Include="ReportPrint\images\underline.gif" />
+    <Content Include="ReportPrint\images\undo.gif" />
+    <Content Include="ReportPrint\images\unmergecell.gif" />
+    <Content Include="ReportPrint\images\wordwrap.gif" />
+    <Content Include="ReportPrint\images\xmlfileopen.gif" />
+    <Content Include="ReportPrint\js\Common.js" />
+    <Content Include="ReportPrint\js\functions.vbs" />
+    <Content Include="ReportPrint\js\Object.js" />
+    <Content Include="ReportPrint\PrintDesigner.aspx" />
+    <Content Include="ReportPrint\ReadExReportFile.aspx" />
+    <Content Include="ReportPrint\SaveTabFile.aspx" />
+    <Content Include="ReportPrint\upload\636745907126050098_scs.png" />
     <Content Include="res\DataInTable.js" />
     <Content Include="SYBData\ApplicationForm.aspx" />
     <Content Include="SYBData\BlindFlangeInstallationAndRemoval.aspx" />
@@ -1738,32 +1739,6 @@
     <None Include="bin\FineUIPro.Web.dll.config" />
     <Content Include="bin\SgManager.AI.dll.config" />
     <None Include="ceuser\ceuser.dat" />
-    <None Include="common\ReportPrint\ReportTabFile\射线检测结果确认表.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_合格焊工登记表.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_射线检测报告（一）.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_射线检测记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_拍片一次合格率统计表.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_无损检测委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_无损检测结果通知单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_渗透检测记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_热处理委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_焊条发放回收记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_焊缝检测委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_硬度检测日委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_硬度检验报告.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_磁粉检测记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道对接焊接接头报检检查记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道点口日报表.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊口日报表.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊接工作记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告1（一）.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告2（一）.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告（二）.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理日委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_超声波检测记录.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_返修焊缝检测委托单.tab" />
-    <None Include="common\ReportPrint\ReportTabFile\焊接系统_项目管理部管道单线图附页（续）.tab" />
-    <Content Include="common\ReportPrint\ReportTabFile\特种设备焊接操作人员焊绩记录表.tab" />
     <None Include="Controls\ClientJs\vssver.scc" />
     <None Include="Controls\My97DatePicker\lang\vssver.scc" />
     <None Include="Controls\My97DatePicker\skin\default\vssver.scc" />
@@ -1818,6 +1793,64 @@
     <None Include="File\人脸扫描手动注册.rar" />
     <Content Include="ModelPath.ini" />
     <Content Include="OfficeControl\~%24KO_OFFICE文档控件开发接口参考V5002.doc" />
+    <Content Include="ReportPrint\ReportTabFile\射线检测结果确认表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\持证焊工焊接合格率.tab" />
+    <Content Include="ReportPrint\ReportTabFile\持证焊工焊绩档案.tab" />
+    <Content Include="ReportPrint\ReportTabFile\无损检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\材料标签.tab" />
+    <Content Include="ReportPrint\ReportTabFile\热处理委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊剂烘烤记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_合格焊工登记表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_安装工程无损检测统计报表（ 周 报 ）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_射线检测报告（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_射线检测综合报告（二）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_射线检测记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_工程无损检测总委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_工程无损检测管理清单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_工程无损检测重拍报表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_拍片一次合格率统计表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_无损检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_无损检测结果通知单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_检测综合报告（除射线检测外）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_渗透检测报告（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_渗透检测记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_热处理委托单%28新%29.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_热处理委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_焊条发放回收记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_焊缝检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_焊缝超声检测报告（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_硬度检测日委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_硬度检验报告.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_硬度检验报告（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_硬度检验报告（二）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_硬度试验委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_磁粉检测报告（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_磁粉检测记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道吹扫清洗检验记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道对接焊接接头报检检查记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道点口日报表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊口日报表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊接工作记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告1（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告2（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理报告（二）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道焊接接头热处理日委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_管道系统耐压试验条件确认与试验记录（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_超声波检测记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_返修焊缝检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊接系统_项目管理部管道单线图附页（续）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊材库温度湿度记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\焊条烘烤记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\特种设备焊接操作人员焊绩记录表.tab" />
+    <Content Include="ReportPrint\ReportTabFile\硬度试验委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道对接焊接接头报验检查记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊口射线检测报告.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊口检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊接接头射线检测比例确认表（一）.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊接接头报验检查记录.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊接接头热处理报告.tab" />
+    <Content Include="ReportPrint\ReportTabFile\管道焊缝检测委托单.tab" />
+    <Content Include="ReportPrint\ReportTabFile\项目管理部焊缝检测委托单.tab" />
     <None Include="res\extjs\res\images\access\form\clear-trigger.psd" />
     <None Include="res\extjs\res\images\access\form\date-trigger.psd" />
     <None Include="res\extjs\res\images\access\form\search-trigger.psd" />
@@ -4591,13 +4624,6 @@
     <Compile Include="common\BaseInfo\UnitEdit.aspx.designer.cs">
       <DependentUpon>UnitEdit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="common\ReportPrint\Fastreport.aspx.cs">
-      <DependentUpon>Fastreport.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\Fastreport.aspx.designer.cs">
-      <DependentUpon>Fastreport.aspx</DependentUpon>
-    </Compile>
     <Compile Include="common\FileManage\EditOffice.aspx.cs">
       <DependentUpon>EditOffice.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4857,27 +4883,6 @@
     <Compile Include="common\ProjectSet\WorkAreaEdit.aspx.designer.cs">
       <DependentUpon>WorkAreaEdit.aspx</DependentUpon>
     </Compile>
-    <Compile Include="common\ReportPrint\CalculateChinaEx.aspx.cs">
-      <DependentUpon>CalculateChinaEx.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\CalculateChinaEx.aspx.designer.cs">
-      <DependentUpon>CalculateChinaEx.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="common\ReportPrint\ExPrintSet.aspx.cs">
-      <DependentUpon>ExPrintSet.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\ExPrintSet.aspx.designer.cs">
-      <DependentUpon>ExPrintSet.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="common\ReportPrint\ExReportPrint.aspx.cs">
-      <DependentUpon>ExReportPrint.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\ExReportPrint.aspx.designer.cs">
-      <DependentUpon>ExReportPrint.aspx</DependentUpon>
-    </Compile>
     <Compile Include="common\mainGdaz.aspx.cs">
       <DependentUpon>mainGdaz.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -4885,27 +4890,6 @@
     <Compile Include="common\mainGdaz.aspx.designer.cs">
       <DependentUpon>mainGdaz.aspx</DependentUpon>
     </Compile>
-    <Compile Include="common\ReportPrint\PrintDesigner.aspx.cs">
-      <DependentUpon>PrintDesigner.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\PrintDesigner.aspx.designer.cs">
-      <DependentUpon>PrintDesigner.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="common\ReportPrint\ReadExReportFile.aspx.cs">
-      <DependentUpon>ReadExReportFile.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\ReadExReportFile.aspx.designer.cs">
-      <DependentUpon>ReadExReportFile.aspx</DependentUpon>
-    </Compile>
-    <Compile Include="common\ReportPrint\SaveTabFile.aspx.cs">
-      <DependentUpon>SaveTabFile.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="common\ReportPrint\SaveTabFile.aspx.designer.cs">
-      <DependentUpon>SaveTabFile.aspx</DependentUpon>
-    </Compile>
     <Compile Include="common\Resource\EditLawRegulation.aspx.cs">
       <DependentUpon>EditLawRegulation.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -7566,6 +7550,55 @@
     <Compile Include="common\PageBase.cs">
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
+    <Compile Include="ReportPrint\CalculateChinaEx.aspx.cs">
+      <DependentUpon>CalculateChinaEx.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\CalculateChinaEx.aspx.designer.cs">
+      <DependentUpon>CalculateChinaEx.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\ExPrintSet.aspx.cs">
+      <DependentUpon>ExPrintSet.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\ExPrintSet.aspx.designer.cs">
+      <DependentUpon>ExPrintSet.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\ExReportPrint.aspx.cs">
+      <DependentUpon>ExReportPrint.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\ExReportPrint.aspx.designer.cs">
+      <DependentUpon>ExReportPrint.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\Fastreport.aspx.cs">
+      <DependentUpon>Fastreport.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\Fastreport.aspx.designer.cs">
+      <DependentUpon>Fastreport.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\PrintDesigner.aspx.cs">
+      <DependentUpon>PrintDesigner.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\PrintDesigner.aspx.designer.cs">
+      <DependentUpon>PrintDesigner.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\ReadExReportFile.aspx.cs">
+      <DependentUpon>ReadExReportFile.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\ReadExReportFile.aspx.designer.cs">
+      <DependentUpon>ReadExReportFile.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="ReportPrint\SaveTabFile.aspx.cs">
+      <DependentUpon>SaveTabFile.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="ReportPrint\SaveTabFile.aspx.designer.cs">
+      <DependentUpon>SaveTabFile.aspx</DependentUpon>
+    </Compile>
     <Compile Include="SYBData\ApplicationForm.aspx.cs">
       <DependentUpon>ApplicationForm.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8565,7 +8598,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Themes\Default\Images\" />
-    <Folder Include="common\ReportPrint\upload\" />
     <Folder Include="File\Image\" />
     <Folder Include="SeetaFaceDir\modelimages\" />
     <Folder Include="tmpupload\" />

HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>

HJGL_DS/FineUIPro.Web/Global.asax.cs

@@ -37,7 +37,7 @@
                 Funs.APPUrl = ConfigurationManager.AppSettings["APPUrl"];
                 Funs.SystemCode = ConfigurationManager.AppSettings["SystemCode"];
                 Funs.HJGLUrl = ConfigurationManager.AppSettings["HJGLUrl"];
-                BLL.Common.FastReportService.StartTempReportCleanupMonitor();
+                //BLL.Common.FastReportService.StartTempReportCleanupMonitor();
             }
             catch (Exception ex)
             {

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrust.aspx.cs

@@ -455,11 +455,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                 {
                                     if (ndtInfo.NDT_Code == "RT")
                                     {
-                                        newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_Level).Value;
+                                        if (!string.IsNullOrEmpty(weldControl.Joty_Level))
+                                        {
+                                            newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_Level).Value;
+                                        }
                                     }
                                     else
                                     {
-                                        newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_C_Level).Value;
+                                        if (!string.IsNullOrEmpty(weldControl.Joty_C_Level))
+                                        {
+                                            newRepair.CH_AcceptGrade = BLL.HJGL_TrustManageEditService.GetAcceptGradeList().FirstOrDefault(x => x.Text == weldControl.Joty_C_Level).Value;
+                                        }
                                     }
                                 }
                                 BLL.HJGL_RepairService.AddCH_Repair(newRepair);

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs

@@ -128,6 +128,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 ViewState["WelderId2"] = value;
             }
         }
+        // 页面类内新增私有字段
+        private Dictionary<string, Model.HJGL_BO_BatchDetail> _dicBD;
+        private Dictionary<string, Model.HJGL_BO_Batch> _dicBatch;
+        private List<Model.HJGL_CH_TrustItem> _trustItemAll;
+        private List<Model.HJGL_View_CH_HotProessResult> _hotResultAll;
+        private List<Model.HJGL_View_CH_HardTestResult> _hardResultAll;
+        private List<Model.HJGL_CH_HardTestReportItem> _hardTestItemAll;
+        private Model.HJGL_BS_NDTType _ndtTypeGlobal;
         #endregion
 
         #region 加载页面
@@ -201,17 +209,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(Grid1, tb1);
             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();
             for (int i = 0; i < this.Grid1.Rows.Count; i++)
             {
+                Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID);
+                if (ndtType != null)
+                {
+                    this.Grid1.Rows[i].Values[8] = ndtType.NDT_Code;
+                }
                 System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[i].FindControl("hdBatchDetailId"));
                 var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value);
-                if (batchDetail != null && !string.IsNullOrEmpty(batchDetail.ToRepairId))
+                if (batchDetail != null)
                 {
-                    this.Grid1.Rows[i].Values[6] = BLL.Const._True;
+                    if (!string.IsNullOrEmpty(batchDetail.ToRepairId))
+                    {
+                        this.Grid1.Rows[i].Values[6] = BLL.Const._True;
+                    }
+                    if (!string.IsNullOrEmpty(batchDetail.JOT_ID))
+                    {
+                        var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
+                        if (batch != null)
+                        {
+                            //委托日期
+                            var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId);
+                            if (trustItem != null)
+                            {
+                                var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
+                                if (trust != null)
+                                {
+                                    if (trust.CH_TrustDate.HasValue)
+                                    {
+                                        this.Grid1.Rows[i].Values[10] = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
+                                    }
+                                }
+                                if (trustItem.FeedbackDate.HasValue)
+                                {
+                                    this.Grid1.Rows[i].Values[11] = string.Format("{0:yyyy-MM-dd}", trustItem.FeedbackDate);
+                                }
+                            }
+
+                            //热处理合格
+                            var hotPass = Funs.DB.HJGL_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
+                            if (hotPass != null)
+                            {
+                                if (hotPass.IsOK == true)
+                                {
+                                    this.Grid1.Rows[i].Values[15] = true;
+                                }
+                            }
+                            //硬度合格
+                            var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
+                            if (hardPass != null)
+                            {
+                                if (hardPass.IsOK == true)
+                                {
+                                    this.Grid1.Rows[i].Values[16] = true;
+                                }
+                            }
+                            var hotProessTrustItem = Funs.DB.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.TrustDate != null);
+                            if (hotProessTrustItem != null)
+                            {
+                                this.Grid1.Rows[i].Values[17] = true;
+                            }
+                            //硬度委托
+                            var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x;
+                            if (hotHard.Count() > 0)
+                            {
+                                this.Grid1.Rows[i].Values[18] = true;
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -225,110 +295,77 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="e"></param>
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
-            //System.Web.UI.WebControls.CheckBoxList cblNDT = (System.Web.UI.WebControls.CheckBoxList)(this.Grid1.Rows[e.RowIndex].FindControl("cblNDT"));
+            //System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[e.RowIndex].FindControl("hdBatchDetailId"));
-            System.Web.UI.WebControls.HiddenField hdBatchDetailId = (System.Web.UI.WebControls.HiddenField)(this.Grid1.Rows[e.RowIndex].FindControl("hdBatchDetailId"));
+            //System.Web.UI.WebControls.Label lblTrustDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblTrustDate"));//委托日期
-            System.Web.UI.WebControls.Label lblTrustDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblTrustDate"));//委托日期
+            //System.Web.UI.WebControls.Label lblCheckDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblCheckDate"));//检测时间
-            System.Web.UI.WebControls.Label lblCheckDate = (System.Web.UI.WebControls.Label)(this.Grid1.Rows[e.RowIndex].FindControl("lblCheckDate"));//检测时间
+            //System.Web.UI.WebControls.CheckBox cbHotPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotPass"));//热处理合格
-            System.Web.UI.WebControls.CheckBox cbHotPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotPass"));//热处理合格
+            //System.Web.UI.WebControls.CheckBox cbHardPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHardPass"));//硬度合格
-            System.Web.UI.WebControls.CheckBox cbHardPass = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHardPass"));//硬度合格
+            //System.Web.UI.WebControls.CheckBox cbHotTrust = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotTrust"));//热处理委托
-            System.Web.UI.WebControls.CheckBox cbHotTrust = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotTrust"));//热处理委托
+            //System.Web.UI.WebControls.CheckBox cbHotHard = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotHard"));//硬度委托
-            System.Web.UI.WebControls.CheckBox cbHotHard = (System.Web.UI.WebControls.CheckBox)(this.Grid1.Rows[e.RowIndex].FindControl("cbHotHard"));//硬度委托
 
-            //cblNDT.DataTextField = "NDT_Code";
+            //var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value);
-            //cblNDT.DataValueField = "NDT_ID";
-            //cblNDT.DataSource = BLL.HJGL_TestingService.GetNDTTypeNameList();
-            //cblNDT.DataBind();
 
-            var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailById(hdBatchDetailId.Value);
+            //if (batchDetail != null)
-
+            //{
-            if (batchDetail != null)
+            //    var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
-            {
+            //    //Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID);
-                var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
+            //    //if (ndtType != null)
-                //if (!string.IsNullOrEmpty(batchDetail.NDT))
+            //    //{
-                //{
+            //    //    this.Grid1.Rows[e.RowIndex].Values[8] = ndtType.NDT_Code;
-                //    List<string> ndtIds = batchDetail.NDT.Split(',').ToList();
+            //    //}
-                //    foreach (var ndtId in ndtIds)
+            //    if (!string.IsNullOrEmpty(batchDetail.JOT_ID))
-                //    {
+            //    {
-                //        for (int i = 0; i < cblNDT.Items.Count; i++)
+            //        //委托日期
-                //        {
+            //        var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId);
-                //            if (cblNDT.Items[i].Value == ndtId)
+            //        if (trustItem != null)
-                //            {
+            //        {
-                //                cblNDT.Items[i].Selected = true;
+            //            var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
-                //            }
+            //            if (trust != null)
-                //        }
+            //            {
-                //    }
+            //                if (trust.CH_TrustDate != null)
-                //}
+            //                {
-                Model.HJGL_BS_NDTType ndtType = BLL.HJGL_TestingService.GetTestingByTestingId(NDT_ID);
+            //                    lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
-                if (ndtType != null)
+            //                }
-                {
+            //            }
-                    this.Grid1.Rows[e.RowIndex].Values[8] = ndtType.NDT_Code;
+            //        }
-                }
+            //        var trustItem1 = Funs.DB.HJGL_CH_TrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
-                if (!string.IsNullOrEmpty(batchDetail.JOT_ID))
+            //        if (trustItem1 != null && trustItem1.FeedbackDate != null)
-                {
+            //        {
-                    //委托日期
+            //            lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", trustItem1.FeedbackDate);
-                    var trustItem = BLL.HJGL_TrustManageEditService.GetView_CH_TrustItemByJotID(batchDetail.JOT_ID, batch.ProjectId);
+            //        }
-                    if (trustItem != null)
+            //        //热处理合格
-                    {
+            //        var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
-                        var trust = BLL.HJGL_TrustManageEditService.GetCH_TrustByID(trustItem.CH_TrustID);
+            //        if (hotPass != null)
-                        if (trust != null)
+            //        {
-                        {
+            //            if (hotPass.IsOK == true)
-                            if (trust.CH_TrustDate != null)
+            //            {
-                            {
+            //                cbHotPass.Checked = true;
-                                lblTrustDate.Text = string.Format("{0:yyyy-MM-dd}", trust.CH_TrustDate);
+            //            }
-                            }
+            //        }
-                        }
+            //        //硬度合格
-                    }
+            //        var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
-                    //检验时间（有问题）
+            //        if (hardPass != null)
-                    //var checkItem = BLL.HJGL_CheckItemManageService.GetCheckItemByJotId(batchDetail.JOT_ID);
+            //        {
-                    //if (checkItem != null)
+            //            if (hardPass.IsOK == true)
-                    //{
+            //            {
-                    //    var check = Funs.DB.HJGL_CH_Check.FirstOrDefault(x => x.CHT_CheckID == checkItem.CHT_CheckID && x.ProjectId == batch.ProjectId);
+            //                cbHardPass.Checked = true;
-                    //    if (check != null)
+            //            }
-                    //    {
+            //        }
-                    //        if (check.CHT_CheckDate != null)
+            //        //是否热处理
-                    //        {
+            //        var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null);
-                    //            lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", check.CHT_CheckDate);
+            //        if (hotProessTrustItem != null)
-                    //        }
+            //        {
-                    //    }
+            //            cbHotTrust.Checked = true;
-                    //}
+            //        }
-                    var trustItem1 = Funs.DB.HJGL_CH_TrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID);
+            //        //硬度委托
-                    if (trustItem1 != null && trustItem1.FeedbackDate != null)
+            //        var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x;
-                    {
+            //        //var hotHard = Funs.DB.HJGL_View_HotHardItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
-                        lblCheckDate.Text = string.Format("{0:yyyy-MM-dd}", trustItem1.FeedbackDate);
+            //        if (hotHard.Count() > 0)
-                    }
+            //        {
-                    //热处理合格
+            //            cbHotHard.Checked = true;
-                    var hotPass = Funs.DB.HJGL_View_CH_HotProessResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
+            //        }
-                    if (hotPass != null)
+            //    }
-                    {
+            //}
-                        if (hotPass.IsOK == true)
-                        {
-                            cbHotPass.Checked = true;
-                        }
-                    }
-                    //硬度合格
-                    var hardPass = Funs.DB.HJGL_View_CH_HardTestResult.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
-                    if (hardPass != null)
-                    {
-                        if (hardPass.IsOK == true)
-                        {
-                            cbHardPass.Checked = true;
-                        }
-                    }
-                    //是否热处理
-                    var hotProessTrustItem = Funs.DB.HJGL_View_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId && x.TrustDate != null);
-                    if (hotProessTrustItem != null)
-                    {
-                        cbHotTrust.Checked = true;
-                    }
-                    //硬度委托
-                    var hotHard = from x in Funs.DB.HJGL_CH_HardTestReportItem where x.JOT_ID == batchDetail.JOT_ID select x;
-                    //var hotHard = Funs.DB.HJGL_View_HotHardItem.FirstOrDefault(x => x.JOT_ID == batchDetail.JOT_ID && x.ProjectId == batch.ProjectId);
-                    if (hotHard.Count() > 0)
-                    {
-                        cbHotHard.Checked = true;
-                    }
-                }
-            }
         }
         #endregion
 

HJGL_DS/FineUIPro.Web/Web.config

@@ -11,7 +11,7 @@
   <FineUIPro DebugMode="false" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="诺必达焊接管理系统"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx

@@ -80,64 +80,15 @@
             var result = window.showModalDialog("LC700.aspx?keyId=" + keyId + "&flag=" + flag + "&grid=" + grid, "", "status=no;dialogWidth=600px;dialogHeight=280px;menu=no;resizeable=no;scroll=yes;center=yes;edge=raise;location=no");
         }
 
-        //function ReportPrint(reportId, replaceParameter, varValue) {
+        function ReportPrint(reportId, replaceParameter, varValue) {
-        //    var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no");
+            var result = window.showModalDialog("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&projectId=0&reportId=" + reportId + "&replaceParameter=" + replaceParameter + "&varValue=" + varValue, "", "status=no;dialogWidth=610px;dialogHeight=460px;menu=no;resizeable=no;scroll=no;center=yes;edge=raise;location=no");
-        //}
+        }
 
         function backData(data) {
             //debugger
             //alert(data);
             alert("焊工已确认领料!");
         }
-
-        function printByHiddenFrame(url) {
-            var frameId = 'fastreport-print-frame-' + new Date().getTime();
-            var frame = document.createElement('iframe');
-            frame.id = frameId;
-            frame.name = frameId;
-            frame.style.position = 'fixed';
-            frame.style.left = '-10000px';
-            frame.style.top = '-10000px';
-            frame.style.width = '1px';
-            frame.style.height = '1px';
-            frame.style.border = '0';
-            frame.style.opacity = '0';
-            frame.onload = function () {
-                setTimeout(function () {
-                    try {
-                        frame.contentWindow.onafterprint = cleanupPrintFrame;
-                        frame.contentWindow.focus();
-                        frame.contentWindow.print();
-                    } catch (e) {
-                        window.print();
-                    }
-                }, 500);
-            };
-            frame.src = url;
-            document.body.appendChild(frame);
-            var cleaned = false;
-            function cleanupPrintFrame() {
-                if (cleaned) {
-                    return;
-                }
-                cleaned = true;
-                if (frame && frame.parentNode) {
-                    frame.parentNode.removeChild(frame);
-                }
-                window.removeEventListener('afterprint', cleanupPrintFrame);
-            }
-            window.addEventListener('afterprint', cleanupPrintFrame);
-            setTimeout(cleanupPrintFrame, 300000);
-        }
-        window.addEventListener('message', function (event) {
-            if (!event.data || event.data.type !== 'fastreport-print-finished') {
-                return;
-            }
-            var frame = document.getElementById(event.data.frameId);
-            if (frame && frame.parentNode) {
-                frame.parentNode.removeChild(frame);
-            }
-        });
     </script>
 </head>
 <body class="bgStyle">

HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs

@@ -238,6 +238,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
         #region 打印
         protected void btnPrinter_Click(object sender, EventArgs e)
         {
+            BLL.Common.FastReportService.ResetData();
             //string reportId = BLL.Const.CLGL_MaterialLabelReportId;
             //ClientScript.RegisterStartupScript(ClientScript.GetType(), "", "<script type='text/javascript'>ReportPrint('" + reportId + "','" + Request.Params["keyId"] + "','');</script>");
             string keyId = Request.Params["keyId"];
@@ -305,8 +306,6 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
                 keyValuePairs.Add("Number", number);
                 keyValuePairs.Add("StoreName", storeName);
                 keyValuePairs.Add("UsingDate", usingDate);
-
-                BLL.Common.FastReportService.ResetData();
                 BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs);
 
                 string initTemplatePath = "";
@@ -316,11 +315,8 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat
 
                 if (File.Exists(rootPath + initTemplatePath))
                 {
-                    //PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
+                    PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
-                    string printUrl = ResolveUrl(BLL.Common.FastReportService.ExportReport(rootPath + initTemplatePath));
+
-                    PageContext.RegisterStartupScript(String.Format("printByHiddenFrame('{0}');", printUrl));
-                    Window2.Hidden = true;
-                    Window2.IFrameUrl = "";
                 }
             }
         }

HJGL_DS/Model/Model.cs

@@ -4794,6 +4794,10 @@ namespace Model
 		
 		private string _BodyMaterial;
 		
+		private string _MapCoordinates;
+		
+		private string _ProjectAddress;
+		
 		private EntitySet<Base_Organization> _Base_Organization;
 		
 		private EntitySet<Base_PrintFileCode> _Base_PrintFileCode;
@@ -5036,6 +5040,10 @@ namespace Model
     partial void OnProductNumChanged();
     partial void OnBodyMaterialChanging(string value);
     partial void OnBodyMaterialChanged();
+    partial void OnMapCoordinatesChanging(string value);
+    partial void OnMapCoordinatesChanged();
+    partial void OnProjectAddressChanging(string value);
+    partial void OnProjectAddressChanged();
     #endregion
 		
 		public Base_Project()
@@ -5626,6 +5634,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MapCoordinates", DbType="NVarChar(50)")]
+		public string MapCoordinates
+		{
+			get
+			{
+				return this._MapCoordinates;
+			}
+			set
+			{
+				if ((this._MapCoordinates != value))
+				{
+					this.OnMapCoordinatesChanging(value);
+					this.SendPropertyChanging();
+					this._MapCoordinates = value;
+					this.SendPropertyChanged("MapCoordinates");
+					this.OnMapCoordinatesChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectAddress", DbType="NVarChar(100)")]
+		public string ProjectAddress
+		{
+			get
+			{
+				return this._ProjectAddress;
+			}
+			set
+			{
+				if ((this._ProjectAddress != value))
+				{
+					this.OnProjectAddressChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectAddress = value;
+					this.SendPropertyChanged("ProjectAddress");
+					this.OnProjectAddressChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Base_Organization_Base_Project", Storage="_Base_Organization", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
 		public EntitySet<Base_Organization> Base_Organization
 		{
@@ -62949,6 +62997,8 @@ namespace Model
 		
 		private string _JOT_JointStatus;
 		
+		private System.Nullable<System.DateTime> _FeedbackDate;
+		
 		public HJGL_View_CH_TrustItem()
 		{
 		}
@@ -63240,6 +63290,22 @@ namespace Model
 				}
 			}
 		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FeedbackDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> FeedbackDate
+		{
+			get
+			{
+				return this._FeedbackDate;
+			}
+			set
+			{
+				if ((this._FeedbackDate != value))
+				{
+					this._FeedbackDate = value;
+				}
+			}
+		}
 	}
 	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.HJGL_View_CheckResult")]
@@ -64675,7 +64741,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="VarChar(101) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WMT_MatName", DbType="NVarChar(101) NOT NULL", CanBeNull=false)]
 		public string WMT_MatName
 		{
 			get
@@ -66548,7 +66614,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="VarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMat", DbType="NVarChar(50)")]
 		public string WeldMat
 		{
 			get
@@ -66564,7 +66630,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="VarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldSilk", DbType="NVarChar(50)")]
 		public string WeldSilk
 		{
 			get

HJGL_DS/WebAPI/WebAPI.csproj.user

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>