diff --git a/DataBase/版本日志/SGGLDB_V2026-05-30-lc.sql b/DataBase/版本日志/SGGLDB_V2026-05-30-lc.sql
new file mode 100644
index 00000000..eca0a19d
Binary files /dev/null and b/DataBase/版本日志/SGGLDB_V2026-05-30-lc.sql differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012031.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012031.pdf
new file mode 100644
index 00000000..c6c88966
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012031.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012032.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012032.pdf
new file mode 100644
index 00000000..8ebe7fcc
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012032.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012033.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012033.pdf
new file mode 100644
index 00000000..dbd5ffb5
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012033.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012034.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012034.pdf
new file mode 100644
index 00000000..307708c4
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012034.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012035.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012035.pdf
new file mode 100644
index 00000000..cadcfa87
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012035.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012041.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012041.pdf
new file mode 100644
index 00000000..d276d3a4
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012041.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012052.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012052.pdf
new file mode 100644
index 00000000..73dc51c2
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012052.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012053.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012053.pdf
new file mode 100644
index 00000000..75b4c637
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012053.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012054.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012054.pdf
new file mode 100644
index 00000000..09ef59aa
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012054.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012055.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012055.pdf
new file mode 100644
index 00000000..c16307d1
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012055.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012271.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012271.pdf
new file mode 100644
index 00000000..effd3816
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012271.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012272.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012272.pdf
new file mode 100644
index 00000000..39c398b8
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012272.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012273.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012273.pdf
new file mode 100644
index 00000000..2c5437e2
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012273.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012274.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012274.pdf
new file mode 100644
index 00000000..de74954f
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012274.pdf differ
diff --git a/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012275.pdf b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012275.pdf
new file mode 100644
index 00000000..8cfd7b4b
Binary files /dev/null and b/SGGL/FineUIPro.Web/File/PDF/Pipe/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-32033/LPOS-FCC0-DD-607.003-TM.ISO.001-AD-320332026053012275.pdf differ
diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
index 7fd3b18d..b09337bf 100644
--- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx
@@ -7,13 +7,18 @@
-
+<%--
-
-
+ --%>
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
index 4fb8e3a4..9df1cf73 100644
--- a/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs
@@ -101,10 +101,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
- string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType from CH_TrustItem AS a
- LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID
- left join Base_DetectionType c on b.CH_NDTMethod = c.DetectionTypeId
- where a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
+ string sqlTrust = @"select a.WeldJointId, c.DetectionTypeCode,b.TrustType from HJGL_Batch_BatchTrustItem AS a
+ LEFT JOIN HJGL_Batch_BatchTrust AS b ON a.TrustBatchId = b.TrustBatchId
+ left join Base_DetectionType c on b.DetectionTypeId = c.DetectionTypeId
+ where a.WeldJointId in ('" + string.Join("','", jotids) + "') ";
DataTable tbTrust = SQLHelper.GetDataTableRunText(sqlTrust, null);
Dictionary DetectionTypeDic = new Dictionary();
Dictionary TrustTypeDic = new Dictionary();
diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
index 5b0f5fbb..ecd49324 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml
@@ -7,19 +7,22 @@
-
+
+
+
-
+
+
+
-
-
+
@@ -39,7 +42,9 @@
+
+