From c35272be844fb6908a733baa1b9c0e90a1afe6fa Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 26 Jun 2023 15:40:51 +0800
Subject: [PATCH] 2023-06-26

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 252928 -> 253440 bytes
 .../File/Fastreport/组件打印.frx              |   4 ++--
 .../HJGL/PreDesign/PrePipeline.aspx           |   4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 16e497e03bc12cf115fc2f437dbac85d75330e13..761316d14e3338b74b45e83f52f37acc207838d1 100644
GIT binary patch
delta 2543
zcmeH}U2Icj7{|~1p3|+Av#xZ-eRW;;$=DZNH}(Mx2V0<VuogF93KJNsfQp-}LlA_9
z3u59DO&^n^H(n4kjTZ_uIAXXM(U6f4CMFuj5@NjYE9!+Q$sh>+pKis11ew>q$#3s-
zp7-NCd!PUFo`%n+htH+I9hg_3C`u++K&MLlrv|!3M6MHAR3P)y0)w9~y8GdzaAA0i
z4$4Df6Wx%VW`4elMhnu5#gjCoz9}puw9J-_*#UjFx1vu0>7WdlfdkyZ;y-x@G`8o%
z$2J8t_tAVjxIrP{Nk!;O0Z-tTHf#SP6r~(?1*im7pc*Uz9#8|kpcd4DrJx=(fJV>+
zmVxD91!x8<6-6jCZRtL`5l@@IX3!0u0ndUhU@PbW&w*`VJJ<nw!A{Tzg5Y_u3+x7a
zzzg6-@DkVyUIzVO0K5YBfk6=B;D=!B2d{zy;2?Mn90G^I>);4D3c}#;w0TM%nl>8G
zsN`&=QjZ1m`Dpp<6D^UuCosl&OZd5;hiA@PvX9p;gfA6vetAF6@g3TrW&CRrvoMo)
z`#*{IC($xZHj75LEnQ+Gt)KsC<Uz-2Ygpt3AeDZ|DG0fRls5E(5ZEpVDyZzE4b~!?
zTak(hXIwmc&RnV*r;Mi4FX?u8Id7Z+9-)|Z_&;t+u?#<bQPCU?JAA^N5YEh|3lk%4
zLgzapc~s}J<uc?JDfO9E^oe-nVukjX9uX_)MyX%dFd~yiMKcX8>PU;Ljun_#W#UR!
z>1JlTo(IdFG(=&)nGR?9bXGTCFo`u3%krm*2hO964rIR(vA0sIqlQBEF7i1lDQ5Sl
zDK;!k6iWPm3}p;QTo;Rib$zw9p1%63rr?ggsyc6NW7Up^rrN5Vb#>lGkH_n+>5KmA
za)?Nd&+JToeJBUJCYRRC$>reWB;K9tkH-+pMUWga7w)~#Lr!=Xz{A(~J#Wkzpf9C|
zLU{q5o!Lo)I$y?ooZO6>Db;0+T~SvVQ*5o7Py>d4N^Li$FRLBYZOx&UqHx5m(b*E;
zseyIE`6F)JpTN(6we%Z$eg!u=SrUlaD&G-#kDA3FnfBaGkZTtN+>e{E7k>{Zoh)2j
zcY7#5qkue8vlS{*@MnP|j_(hdn)sU5XhTsuM>U?_NZX6r{$Va7S+-i|uSQPNS_+kY
zrStbE9xVsVx(_XmAGC?ZXPcXHqOodSMC{|U;^;EpuZxOdx0-Z38f+6to%Q{IJ}N4|
z6LV3|oHO>wTx4@DB3Z3*rOnjG+PEF7o=6j1D9K7SErr8OHy5?*e5bfUA}!HSy<g0%
zT<j#9v-a_|x@<<HT&{`T9xB{uY`LyQ-&!dJ$<{k3TIA_AvqocUQ=--tf2jDe;uv+L
z$TRY>3z2F%%Bj5LJ!8pknNQz8?P3K`L7+LcdxDEhq5gxp)Z6Kz7JnHPZpkw74Wt{Z
zuBlD3q3Kv)Bp^Pfnl)!AuWfx4G0BlzLY`QojocQJ+?~b7^$Tiv^aCk-gt6^{S}<B@
zk=F&kHd@~Ctr*dzJZ_gGcJ&;2kK0G>Hu<}V1WS#}<3b<xeyx6_8R3g+rIGTDddu)k
zs$S#dq}pbDa!u_NPZ{U0sO3~#_^w#ZW+R>VFCV$8YTDM;{=J`FRjY+@X+nLU3%SCy
JIoP`@@E4Jj17-jK

delta 3377
zcmeI!c~n$Y9Ki9p?~OXbV{v5P5iDdA2o*#OlZbMGbSzsH1hZAk(cHl`OEj5VK3gm`
zqcYQUveB|!D{WCKHE>DW{*u2sc#fWv(D#Pukmq#tkB<G(J?As`zI*T7_j_;d`^~G~
z5m3D?V0oz#Y_V7Z&<*b0J=Y1BHdJ(x@mj3kSg|P0Sl1{L8LF1kwV7g+Jgbeg**R{d
z$lB;cF;Gs?mk7HQ*3kSG)l2bXg6-m@&eUDe9i4^6a)EI*Pt^u}zM$E9p|&i~){}!4
zY%ZJN6-R-4;Z?=aMOLcN+Rva?Ri!;D)egFNHXmvgk?Qj<DxwgmD^Tlnq4thi%_Y)=
zj*%MY<T>kT>G0i9JIU(maJ0q0T1YdY(3NP&`d(R53*2L<6Z=CgrtYC^_OH1#Cn>{~
zzTXzsVL07ki}CJoM%K9OgXLa(rrT+E2wVGAwJp}YM2$$N{gB^ZcRsSiSA!iLrgutV
zG)JBf9b%{*5a%`5tPap@a#mQep#qKd8j;PZrGLMQBsnd7u`8xn?zg8(XH1EoQ1@7U
zQ<b*JRIl1=ZG9Jeov|f;mQM6qJDeewtI)WLxVE}EuGCOlD%yLJGrn#AhI@5(QX9@H
z&qvlLRE*E+Q<hWSH!Zs&w>&L7Co3Z@H#fU1t-N1OW_d<sS!MP(cT-f5a3xx+G`42@
zZ_*y#8TwSaE42@NVZaam2tXjZ!H(_-LNG!QiZFyD0+EP9G-42oIK&G}m8A!b1SFy-
zZorL5LN6pE1*u3wI(j1mnaILT$VMOZML*;q7yXfk0m#Qd+>8PY5>*z<Ei?wB5VxWT
zx1kuf;|>hLPz=Lxl%N!MVgyFQfl;^%cVjf}!M(T-_u~OPh%p$8vMN5xF%A`|#CSY}
z33wQf;88q=$MFOvViKOjQ<w}VreG?b#xzXF49vtV%*Gt3^H#%Lb6ig}n~&-%&B9}P
zp1J0v-di?k5wbd=TCPqgsG7^9d6<s{ScpY<28;15p2HH<U@4a2c`QdQT#$GHFJc8u
zti(%r8L!|~tio$}9jn#;SVLni-oQG%i8{Q6xA6|v<6UgPd)SCgcpsaw1#WzRt@scg
zY{PbZgpaWUpWsvM#4fczcGK8{z1WA(@HxJ~ejLD;_zGX+8yv(T)Z<%xhwpJ1M{pEB
zpaG3IhT}MallT#*a5{{SpYSt&!LRrYEwyE#wk8^ZJoU9@LtP=oHkAO>W2<tGW)pI1
z$Q+R`&xVv3IwP9bs2Cupgbw!;>OUyLtG`no2f94pYlsm_OZ_3VFDRYK^+wdij?0}X
zZ8^6&FG>ccZ@V&m$9Gtwca1wf<CLhK6ru8-5V9q-=o-?myE)YmuBZdooZ!^OsF>T!
z8E%|vccu1$FAVs>9{~tNH`vh~K?p_&LZN<{a6}*yQHVwiViAY<{}Wslx1k*4P=QMP
zmlB*Sx$ug;?soPs5$au{N<BF02~%Y*k<Y_?EWkqi%bBpsI~87sOi1>-oC>c)CQRfO
zUrL3v|1lG)mm!r2<9I>zet{Zrl`l~4=6u7twosFq#am@`(J+tJDq6HH#Wqc5Xofpz
zc#~K=&?+-WBzuzmwWDI5qs}4Ln}Io^$egrYFYqkVv>C$8Sf!<!8Fszc4BV-Qd1`E$
zQ*>N%g+na!Ec4MO3y-jBt-7o9sxq2vigF0692C8?&d@Y-dAJ@VPyZewckQ!#1_WyR
zI7@qIbq95AkzK2^>pNC7=;zG(lX{A|v{6rxvwM`9f1J<{n;VbmBUP)fnck?6F;kE0
an>?akZ?wuINfYJiqzeB1N7gmy);|H+6F@2e

diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx
index 3915cddf..dabc1087 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="04/03/2023 15:49:36" ReportInfo.CreatorVersion="2017.1.16.0">
+<Report ScriptLanguage="CSharp" ReportInfo.Created="12/29/2021 10:56:08" ReportInfo.Modified="06/26/2023 15:31:41" 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/9ZLpp1NuxWRHL95wpPPwN6TqtHpqK4gKl"/>
+    <MsSqlDataConnection Name="Connection" ConnectionString="rijcmlqvJIqZbrmqGn7L0P56UFhaUHihKXxbhpqie4wmZgM2ymDKry7UxzO5md9ybQlkfKpN2rHYbp9GtH1LDQPa7z2vVu/kEnNnTKeHt9obmaC7TQDh0IvsUBSuzhGZdfAIK7YyBqykCgeZm5rvA6K5b7zHGdA+7pUpJ/9ZLpp1NuxWRGljdG+Vyp/4vwo6KXFJdHA"/>
     <TableDataSource Name="Table1" ReferenceName="Table1" DataType="System.Int32" Enabled="true">
       <Column Name="PrefabricatedComponents" DataType="System.String" PropName="CH_TrustCode"/>
       <Column Name="PlanStartDate" DataType="System.String" PropName="CH_TrustMan"/>
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
index 39ae4b60..07f612ac 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx
@@ -131,8 +131,8 @@
                                         <asp:Label ID="lbProductionState" runat="server" Text='<%# ConvertProductionState(Eval("ProductionState"))%>'></asp:Label>
                                     </ItemTemplate>
                                 </f:TemplateField>
-                                <f:RenderField Width="200px" ColumnID="PlanStartDate" DataField="PlanStartDate" SortField="PlanStartDate"
-                                    FieldType="String" HeaderText="管线计划安装日期"
+                                <f:RenderField Width="200px" ColumnID="FlowingSection" DataField="FlowingSection" SortField="FlowingSection"
+                                    FieldType="String" HeaderText="流水段"
                                     HeaderTextAlign="Center"
                                     TextAlign="Left">
                                 </f:RenderField>