feat(hjgl): 增强焊口匹配与任务单打印

焊口台账、材料匹配和任务单打印需要统一到焊口维度处理。新增焊口查询、匹配保存和打印模板适配，便于按焊口追溯材料和任务。
2026-06-26 00:40:55 +08:00
parent bd9b5a6f4d
commit 02b524b895
14 changed files with 836 additions and 121 deletions
@@ -43,14 +43,6 @@ namespace FineUIPro.Web.Controls
            {
                throw new System.IO.FileNotFoundException("打印模板不存在！", ReportPath);
            }
-            if (dataTables != null && dataTables.Count > 0)
-            {
-                for (int i = 0; i < dataTables.Count; i++)
-                {
-                    WebReport1.RegisterData(dataTables[i], dataTables[i].TableName);
-                }
-
-            }
            WebReport1.Report.Load(ReportPath);
            if (WebReport1.Report.Dictionary.Connections.Count > 0)
            {
@@ -61,6 +53,15 @@ namespace FineUIPro.Web.Controls
                    WebReport1.Report.Save(ReportPath);
                }
            }
+            // 先加载模板，再注册运行时数据，避免 Load 过程把已注册数据源覆盖掉。
+            if (dataTables != null && dataTables.Count > 0)
+            {
+                for (int i = 0; i < dataTables.Count; i++)
+                {
+                    WebReport1.RegisterData(dataTables[i], dataTables[i].TableName);
+                }
+
+            }
            WebReport1.ReportFile = ReportPath;
            WebReport1.PdfShowPrintDialog = false;
            WebReport1.Prepare();