From 639ecc112d15f91d740d2d66ee8f198cd6029a85 Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Mon, 2 Dec 2024 11:33:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E5=8C=B9=E9=85=8D=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=81=E6=B0=B4=E6=AE=B5=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin_New/v17/.wsuo                  | Bin 66048 -> 60928 bytes
 .../HJGL/WeldingManage/WeldMatMatch.aspx      |  10 ++++++++++
 .../HJGL/WeldingManage/WeldMatMatch.aspx.cs   |  12 ++++++++++++
 .../WeldMatMatch.aspx.designer.cs             |  18 ++++++++++++++++++
 4 files changed, 40 insertions(+)

diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo
index c2e634a60230d7f9cdf46998fe2ca9ea3fa622fc..0fdfbad7838c03294b1fe58bb28793c7852e6de5 100644
GIT binary patch
delta 2236
zcmdUvUrbw79LIYuh23?x<xk5$oq@8#I!av&jKKtVNjtX8rneR83TzD6KqsPZwh2y?
zUS;tKAGp70;*$w6#>AJ!>(icUNPL(}*xO88j6V6O4>S=I!SAp1V%;8e#%TPdpL@>v
z-QPJq_xt;uqu;RW_bYD3BypI$Qj2Rk_U)ky(Qky;X0zq%=(==WoTh@569LLrjLJT^
zcVLuk^f`}WP!-1mCX=wY3^t(G1onf2zyVy~00@F@Oszr7ORy=Wz7s9g*ge8SZ`s|$
zZ5SQ`{BM4+8@&5Gf^qc&zS`0_gf<M4G+dd>J&WEbcn*w#6gUUcU>r<<NpK!q08`*1
zm<BUo7F+_C!5o+e&x04h74RZh055?>@G^J>yb7+`Y<0G4=)49pAPcrvlL14Dm6T4j
z|7E3f<w{#($XM}L3|Lb(OYia=?7rFAaU<61Tk$-uf`1?2+;9#!H|6g+#)H%>+iU+c
zDfO7k@s>4~#{Y+;C<m#=A(PM1WM>ITb*M4cf#E{5`c}(DY4y47Dvh6fz~7B=51>1a
zLBr9spS3y5F{{aY#((msu1(QK1y@dZDO;Tr)n=i3LnvGyt$_E(N1HYu*PJ%aAfH~#
zD@G{m(G;oV+H*&#;2D)G$|5OKzhd|z6mboix=$BILsY56dluK4Mwx~Ur{JT^m0a|$
zHv4I*F{aqz2w2YIb{Z23M{q8FpYPKD_$^du){39PA#D69X6CUKVRT|I4dF_z^Ax?_
zd6pu+AtO+9icZP~;!eRieWGmrO1^0vv{m~C4s5nA&I?e+jY@G}7VVU6(G<RSa6I<5
zBz#n8c}D#a3bETa5bmGp2^|jyFU@ox5BB!;%>-xX2L^)OGqc^tj)mrW`{!_}2>bwB
z>yiq|DSu9{VL91SKYaJp_a9EgX!S^lRIg4~)6F!VKD^c@851h$Q_HkIF(juq_^w5z
z$&*V)o1Z?JY^r%Tx!7~_o>_luy6fk`xewl^yOW{6HK#7Bu<~5pmaIihG>W=omLBeh
z^{C_v+(TRKw`pApo0}am@$ZOZbVZ!St@35Kx8(?ByLLpFvccQ|zESyRg3-?S@T2P(
zIwN;rvbDIG38Bn7)^|U&PZ4|N->Zwy`ZJP{Dcip+?B>>qucU_#oVhu4XP-DlUz|Lt
z^rS`;To0!rqX|<{KNo9f>=cTqYq2U)<57yn-!!xoZO0o7%|p6YPh(nu@|sM3$w}{N
z0V6R&Uuq{vPdMl{+IO^SqD0V0F3_il*2hxxezH^4(s1ih`e`ijkL1Mg=B?7CaN2MB
z(_dGZ>UmX=&Sg5De<X>`yB9-tn!0k0Zmg)3Uy#jPAB~8$`KL)*^qIbo@1I`#Mfwd$
CI`#|z

delta 2407
zcmc(gZA@EL7{_~V3+uW|fl>>@QVJ`hLtup#Y!=w=296HOU~WWk7<nm#n7EACB7?Zr
zg)bVMaQ_<j!6=~7g^-MJiHYAD;UiHJjUQw$#9_p3nTdgfC2sRMz>Ss3vTvN^*K^Ku
z&w0-C{Lf1x*R_!W-K1Y&I%El%#`({qz7c7G*)&vA&?oe<8mtOomXDD3v|b?VV=5R<
zbR-m0C;lWKsL>>V=`x3#^-amtd7dy3&k=iw7l=nRE0t=I;2w-rn>XA1TWm3H+PN*0
z+IAub-MW;x{nX0ED7EsbmBeksEjqKCIv%2gC?#GbaNUqrdzczW2#GjK93v`-O5!Er
zI8jCTh!aFLQA7BNT7qX+N7NHN8><cEyiJ{6;sVh}^b_w8Jlu;^hlxjc$m%vVojmo-
znwG?B%Kh=OoBTbbT9rwaH=gWV;^d9M^yOUNT?E%#PjG$tBy}Qp#>=+)W~}Q=vr>qS
zu^Yc!ZOe|R?RXZoWrJPE6NcSj)$wd086<xeS=96$F>Td$V2iC_vwx84qAlMrXDHLF
zCr37zck`37?r8Ybk20;glgk@d*gmWp!z>%2#ISrsr>rH;F_B-zB!X`tzp!!qYKVA{
z(a)R+IqO6&in`N$0L#UyEsPbL6+;I+BA=&T(e?Q`G~SE{$<+yrAGKUU_04<;nd(F>
znfAq+tFUT1t&fW_A(%2KTPjg$bs=c^0W(4oT!Ie0seX|^3jFY@Ua^u|FY*XueIjU#
zY{?gEd;L$Os|3>rnQW?fYOwa0)z~({+A7zjD2yHYuYj=%#R{0|K_#)4>03{4wjrPP
zf-!PJ#ojAvG)6=lT=cU1*Z3#BvD~L4(Aw7SDh>n+O5NU$0#AuIP~hz-YAt9jE-ET<
z1v&zqrJXc+>wNi@C?a-gEL)Jx6_~M>D-m;q$$2vgjLXVzxGJx*lILeT5}j<N(1fBm
zuIVLQuvVkOSc{|#H!8Fx=*_4}&^YN+Moh3`9(DM?3NLaYZEGSmEQFd4JC0D{W9CNa
zU|8f2sf*x+Yf<de^DC;3Rf5HIIR4kDs#dzKY95hId4qxy^bWGAve_qZnzB+pw@Zm0
zk#t`~PY7fF_^FduwdiUn#Lo?H?1bPEMQV&{(cQRLX===6@@o<zO>|CPy@qQJGrykn
zc={Y(NI4RsXPvm3lO|_7mF3sdbfn%`=V4@zJ5knUf^|7vITM&*_-QE(^S|g7`<IJV
zdwMm6ns&`w<fay_3twaUax;uK4&kF)KHR_Qg6_R$NaNYK|3Ny2dJGu384pkY5dNMq
z<K7JuJCCgPvr6Bs5rMT~bf^}GmeSe#+=#_43%<W?!<nUXn7raZ{cRC}g=R!Q&cn#B
zHsKsYWWugY{Pr@#UrSeL+-GbWqjMkP^6z=Hu!O}S{n$MLW0!3BX89Ptdso8zxCxV=
z@N7JoZfTagDWtFV!*IvKBAcrk(e{UReen5DJy^W!!0fjd<u~<czMDj`OK7>%g8{dM
MA-CtLj3iqB0YMuu2mk;8

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
index 121361b0..53344db4 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx
@@ -57,6 +57,16 @@
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
                             </Items>
                         </f:Toolbar>
+                        <f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left" >
+                            <Items >
+           
+                                <f:DropDownList ID="drpFlowingSection" Label="流水段" AutoPostBack="true"
+                                                runat="server"    LabelWidth="80px" 
+                                                Width="180px" LabelAlign="Left">
+                                </f:DropDownList>
+                            </Items>
+      
+                        </f:Toolbar>
                         <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
index 41a73d37..70102ee0 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
@@ -63,6 +63,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
                 HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
                 dicSeclectPipeLine=new Dictionary<string, string>();
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                    where x.ProjectId == this.CurrUser.LoginProjectId 
+                    select x.FlowingSection).Distinct().ToList();
+                this.drpFlowingSection.DataTextField = "Value";
+                this.drpFlowingSection.DataValueField = "Value";
+                this.drpFlowingSection.DataSource = pipeline;
+                this.drpFlowingSection.DataBind();
+                Funs.FineUIPleaseSelect(drpFlowingSection);
                 this.InitTreeMenu();//加载树
             }
         }
@@ -192,6 +200,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) 
                             orderby x.PipelineCode
                             select x).ToList();
+            if (!string.IsNullOrEmpty(drpFlowingSection.SelectedValue) && drpFlowingSection.SelectedValue != Const._Null)
+            {
+                pipeline = pipeline.Where(x => x.FlowingSection == drpFlowingSection.SelectedValue).ToList();
+            }
             //pipeline= pipeline.Where(x => NowComPipelineCode.Contains(x.PipelineCode)).ToList();
             if (!node.Text.Contains("|"))
             {
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
index da778253..525a976f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.designer.cs
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
 
+        /// <summary>
+        /// Toolbar5 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar5;
+
+        /// <summary>
+        /// drpFlowingSection 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpFlowingSection;
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>