From b1bf2f846eeef7593ca2f4039457d68ee17a5122 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Sat, 12 Oct 2024 15:17:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8D=95=E7=84=8A=E5=8F=A3?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 65024 -> 65536 bytes
 .../File/Fastreport/焊口打印.frx              |   6 +++---
 .../HJGL/WeldingManage/WeldTask.aspx.cs       |   2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index 181fa974d4dfc294a7fc74af8c9841d92dfe27a9..a91c4f1e097f4ce986860cdb92bf83a2f51bdc9c 100644
GIT binary patch
delta 1270
zcmd6mOK%cU6vyWdLkoDJ<<UwlPz;ZnT4Y9EgO*waAG9iCG_G72AFMPcI%?IVvUJgf
zaKAvq#;xhBUD=%ryYH89feR8-{9l+!Fw)4<oBZb9bLQN0&i&7w#xGl=A$@)#I@dP8
z{CFNZAQ9uGc$+xlf*|xTSaT}wPQ#eEi3i3MBho_io}(Cs;RSBs0*8nWV&=Pim_6W_
zX>;Fcta%J&P08={!&(3dZZ+>q?~^bV!6`5c_!d4==K8of%a|2#7Gyvc<Uk%2fC`G>
z95@eFKnbjZ3t$ag1eZV=RKR6HSQ4&aaTQzxRj>{=z;$o~@blNet3k&fPQHe*3EqIW
z;2qckgT8ycL)IlPobs(BbtP%`b23K4Y|gP5w4|FuhDl(_#WX2uKT@f{P(4ej8PoUQ
zD3$o9Qd}}dTroE7l8m@(N1|tN2<!InJ7{z~`y%DHCTbp!ds)Y;Q9B&d!%p3&v5IG9
z*IywtX1?fG;5+ny#`Z*+bprd8UtdeXLAn`@@<?k}->G}F5$()sq~8t?=cC`G9{f&N
z*{3l5M2(e`rS?2&1-|w@oygzy?EEha7~S+baSIbzC(LdKb(QT_Xpf4f&nm(?p*s%S
zAAw<w@{b-Fa@zUV7g=}y+o%LJw?OfJ>@41mQ7R9P=qId^qy|lvq_~=w>q=dIl*(n~
zTq>)m^^{srbE$e=kqg=E!@}bSMdRrbv$dktaf1&g9K*60dS+W}t71DZ?XFgXV`jO_
QK9Mb>x%`Z<o#l_e0dyjDO#lD@

delta 1248
zcmdUuO-~b16oz|;DGYU5`ia;QDYR-JluYfk5EECh&=~b91@Qx=Ez~dYbBKx2(3LAT
zc>VzC#;xi60TbENg**O)i|K-dRNp(L$uy|x){{K#x##rGeeXM`m5N+B>iN1Z^?&>E
zem@yKU~zL(nrDjSa=CsXXlEel<yiFIzz4!hOdipK$V5AaZw2_kAn<@mAbL%38u=+e
zOG=zpWq)84i!qP@Nia?YITRT{Cbo!}I?e;4v$JAs-9q6um<M^V02aX=umtXcd*D8J
z0G7c+@CdAc0w{tKSOsgK3?73g;3;?po`ZF;0bYQY;FY-6Yb0;LTVQ}q@S&wnaeu_3
zNe%X{fA`a09b}vueF+w$Gs=aC@JU=$c+&@jUrkz8V*fBGe7whLP~^Wb$ZH!Ubc-P7
zNs!+on@P{Etcr@54!eUvGc8|TQUj>?9aXXdoaUk$89}a!>4-R*rWNFj=7zVt_Be$c
zEwaLO`-rxAVwTB@a8>+D3}E|QGJO0GVg@-oA;vU@_8EPb(qu$$(yZ?~`C~sn$M@78
zJTLBirWMaCZfC(5<?1;U&N_;24GW15L)Th240BcdD>@Yq*J)4E+;)Qw$9b|;Dr)7z
zjGoFAr?V+NUCyQox>ih;bNa<xW?C<1(rf0%1hKZTj>~o>OtpnUiiql@R6BoF?(*EJ
zgI+~AE5f$i7}>7rSD4cA-i++FRJ|luXQY~cmU-C(&S~vw?+Wk}?z5cPxSSvAQph5G
F`3=;-WQYI&

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)
                 {