diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index 181fa974..a91c4f1e 100644
Binary files a/.vs/SGGL_SeDin_New/v17/.wsuo and b/.vs/SGGL_SeDin_New/v17/.wsuo differ
diff --git a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
index 272a4e17..f03b0c43 100644
--- a/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
+++ b/SGGL/FineUIPro.Web/File/Fastreport/焊口打印.frx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/09/2024 16:33:27" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="10/12/2024 15:13:53" ReportInfo.CreatorVersion="2017.1.16.0">
   <ScriptText>using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -99,7 +99,7 @@ namespace FastReport
 }
 </ScriptText>
   <Dictionary>
-    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGKbA2Bx03EOue9PYrCFwa+"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRF3hHwWOeKvKBRVSwNsZpqq"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="pipelineCode" DataType="System.String" PropName="PipelineComponentId"/>
       <Column Name="Mat" DataType="System.String" PropName="PipelineComponentCode"/>
@@ -156,7 +156,7 @@ namespace FastReport
             <BarcodeObject Name="Barcode1" Left="3.78" Width="141.75" Height="141.75" AutoSize="false" Text="https://sggl.sedin.com.cn/StaticPage/HJGL/index.html?id=[Table1.WeldJointId]&amp;weldjoint=1" ShowText="false" AllowExpressions="true" Barcode="QR Code" Barcode.ErrorCorrection="L" Barcode.Encoding="UTF8" Barcode.QuietZone="true"/>
           </TableCell>
           <TableCell Name="Cell36" VertAlign="Center" Font="宋体, 11pt">
-            <TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 72pt, style=Bold"/>
+            <TextObject Name="Text1" Left="9.45" Top="18.9" Width="217.35" Height="103.95" Text="[Table1.SortIndex]#" Font="黑体, 48pt, style=Bold"/>
           </TableCell>
         </TableRow>
       </TableObject>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 63da02e0..3b06ecb5 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -1311,7 +1311,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     WeldJointId = x.WeldJointId,
                     Spec = x.Specification,
                     SortIndex = x.WeldJointCode.Replace(x.PipelineCode + "/", ""),
-                }).ToList();
+                }).OrderBy(x=> x.pipelineCode).ThenBy(x=> x.SortIndex).ToList();
                 var tb = LINQToDataTable(result);
                 if (tb != null && tb.Rows.Count > 0)
                 {