From 4704c912570b9d402fe5df1dfe9fd45f070c9e6e Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Wed, 21 Jun 2023 15:06:38 +0800
Subject: [PATCH] =?UTF-8?q?2023-06-21=20=E7=84=8A=E6=8E=A5=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=90=E6=96=99=E7=BC=96=E7=A0=81=E6=9F=A5=E8=AF=A2=E5=92=8C?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 251904 -> 252928 bytes
 .../HJGL/DataImport/MaterialInformation.aspx  |  11 +++++---
 .../DataImport/MaterialInformation.aspx.cs    |  26 ++++++++++++------
 .../MaterialInformation.aspx.designer.cs      |   9 ++++++
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index b4dc2591b91c74b833a1c72ca30120004a626d62..16e497e03bc12cf115fc2f437dbac85d75330e13 100644
GIT binary patch
delta 2959
zcmeI!SzJ_A9Ki9pcR&WbFfhyjqA=_tM1irU8Onr2Y#Hr~4vU#>TBBK6gCJx@C3A|g
zy@+TdQ76-Ev#`<@mK4)A%jyZAiU)fT`W=)U^-~{u=)+6*^ZDL$=A1L<oO|xM|9k5;
z8SAzi*H>s3ola*&2t2V7?TSk+QT#-#YV}{FG^J_n2bBb|LfvaH(O`r_^cxd|L*JPd
zNP*!*;UrRjgkqAS(;cJXFl4GxHW_3`j<wil84~$1jLr5XUZdrE8vk}Qzs^$mZ+Vzc
z^b|lUM>}46@+?OSgPffl-H+6JMzSTdh(Bc(ZJN48+vTIl4uc>Y$?NnC1!;;ad$%FN
zt56JOR~n+d3mj3+Tg)~^lPfUwlnP6QCi@zjwCvM2l@__4KSGO@z|l23?H_%bycIFt
z-PDyE#Oko3(XOoC6+<Z%r_VWAtO{S}GTDU9JV(@<=4o=F<Q(L2{F+Q$Q*^iJRx`v<
zbcH7GVU%~T4r`@hig&?~bs)ZG@yslHZdG<#W=&pIT4wId^t8OZOnX{YPHsk3dab=S
zv)Xf{#H_dye4HvfU~CzW4?Hq5NSVz0lLlZiGz20DMg$`SCWOKa3&IeN2uwjFreYeR
z5DhD05Uc2%x;QfNNI)WzFdfO5ffS_TETrLVoP%^^U?$E*CbE!?9ONPo=V2CR<9y7)
z1<1!-#i`THBU1nyE<_>bqX-wF7#E`ir6@x=DsTxF;8IlLGF*-;a3!w7)wl-N;yPT9
zg;)f;lT#I{QG;46#tm448?h8O;bz=|TX7qfVL5Kc9dKX;R^m>q!d<u<_h2>d#eI<D
z*1^5JPoE%)<2JPR>6eNFYNW`I-|1XKO+6a07L91a{aA+w@E{&SGakkxcogf=0v7}x
z!{ca$8yoNhp2Sml8qeTaJcsAyrg(u&8(u^^UP1?6#w&Ogui<rc;tgy>7dBxtw!nio
zu@!G&8@A(Z?7%yC7w_SHe1M&DQ+!C~BXnaIKE@~b6uYqppW$<SfiKa6Ui6_KUtury
zVF3H_H4fk)zQMQn4&UPk9Kw$goPNS#{ET1lD~4O_;f5n*f_dUw>?N)whiXtfE0anU
z(QP6^Os~+wsgf~OKEI<O#F1RChypXUS^Lh6jj>)$g(Ih#*UBNKWm%*z<%%MPErsI`
zah{=+0p(u@A30$;*|B4g>yvqZ(f~|`hCl?th+u@kgix4aK^Vdz7jOz9F%{Dgg=kn2
zgV_IrkCSDnLN#hoiwO@tu4LO8n^-uKdq>}ajv3{0FFW;Y8u<{&V-2&eM+4TP5&v<p
za(YLr2?$mMsFTrZ0)kZnOZ-=~BL9!UN`9WmU^Vs`lRJ*j7+?93>LWJKw|IhP|7L8P
zql%2Ol!lbDZ7F5S{w|SGxK%{iN<C`9u-c)jYFnX?D`wC5Vo!`&X$nv~0`xttJ^G`(
y_p;r;_vsh92mAFwA|&1-4#(Ntg}wS6Vq=lXy}D07*L}1{pXy%FukR8{T;iWCik#d4

delta 1846
zcmdVbOH30%7zgm3ErqshDTPI#yk9M^VoQrWL_$In2q5hNwWy#}if=_Nh>Es}iSb~f
zbQ1AsIB+77vIjVtKw`WoMlnGzo_vLq=|K*n|DkPcQ4ALjZu0BSemlGK_-4Akd5v#I
z^T46Z<2Wu6v@}p+4-7eppYJ3}TEOQimlFFp@8k-}p~L)Zg$k8^;-FehG4;r%jY<U6
z5D!1t9UMt0r-B~Van0filvQ}U!JCUxKCoy3&V^6}8bD~{_((Xe6xU@?4i!)dMyP__
zU;;B#g9WTm1ACwr>YyGPU@tVnK8}-fO(@XsDyR1V3J2j3IH3m)!x1<Nz0e28;5hVy
z3r@fQxM2`Z!YMcnXW%THgY$3!F2WF8g3E9PJgoD>D2%{W7=>$a9d5uF+=N@;1t0v*
z%HxN<TV^F;+AE-PWG>k}>%!M8E0H)mv#f}a0MXfs)M1&7l())TT2!5I-g<T-asP4N
zW>t&vLJH=I%^{mlwtb{vl0f`Ao4_VNC+Y_E=p1y>V3LA5fy|0FBCtoYVrrx>2`qQ{
z(LtYGLB}%Mgk1=-4IOES1~cqx!kT9hcA)uEI+}SmKMwmW6bk*yah(v3ea2ZLl^?e1
zLYhM;z&qLU3BR*g&h}{?UDLMH7ST*SDcy?nsM|D{Vpns?h(y+5=x-$T9`%XIG&x(^
zcr2KW;qxZy$>~;P#5|s}Tx2o1E&YSm8e{c<wbp1IwA342CX>rJ=yF>v)$ZClmwRqi
z!HZ<#-FumS;@K-%F)c29G%>Rxvr%V~jy4xP_2<XY`I5H4P$yA;!YEmfzTo_oj+bPO
z4>kMs9^Sx7Bl`VB&9N<@jp>EKA!LRFk%3E|Qahmwyjd>8on*R}-m(4sNWrRQvLgdy
zD<NiJ;sWa=4T_Gxtf_w_)X?$Akg2D1iP}V@smvaFY1y02+3r@vCc0u%q8mcph+X`f
zvMy&|mN?94`$j9FMcx`}vFfFoux*eHkyOapH$XuHt!YwH<2Q{z_xX0FR$9#!2{m_>
l-!AW(EAJw2pG-FK()}i$P`+h-is$)BTl^grKc$kr_yv;77R~?w

diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
index 8f3de89e..f9c5698c 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -72,7 +72,10 @@
                                             EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtWeldJointCode_TextChanged"
                                             Width="240px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>--%>
-                                       
+                                       <f:TextBox ID="txtMaterialCode2" runat="server" Label="材料编码"
+                                            EmptyText="输入查询条件"
+                                            Width="240px" LabelWidth="100px" LabelAlign="Right">
+                                        </f:TextBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                         </f:ToolbarFill>
                                         <%--<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
@@ -80,7 +83,7 @@
                                         </f:Button>--%>
                                         <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
                                         </f:Button>
-                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Hidden="true"
+                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"  Text="查询"
                                             EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
                                         </f:Button>
                                         <f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server"
@@ -106,7 +109,7 @@
                                             <Items>
                                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工厂预制"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
-                                                    EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
+                                                    EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"   EnableCheckBoxSelect="true"
                                                     SortField="PrefabricatedComponents" SortDirection="ASC" OnSort="Grid1_Sort"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                                                     <Columns>
@@ -158,7 +161,7 @@
                                                 <f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="现场施工"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
                                                     EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
-                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid2_Sort"
+                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid2_Sort" EnableCheckBoxSelect="true"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid2_RowDoubleClick">
                                                     <Columns>
                                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
index a16e2b08..e6e2702f 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
@@ -293,11 +293,17 @@ namespace FineUIPro.Web.HJGL.DataImport
             //}
             if (!string.IsNullOrEmpty(pipelineId))
             {
-                strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents ";
+                strSql += " and pipe.PipelineId=@PipelineId  ";
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
+            if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
+            {
+                strSql += " and lib.MaterialCode like @MaterialCode  ";
+                listStr.Add(new SqlParameter("@MaterialCode","%"+ txtMaterialCode2.Text.Trim()+"%"));
 
+            }
+            strSql += "  order by PrefabricatedComponents ";
             listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -321,11 +327,13 @@ namespace FineUIPro.Web.HJGL.DataImport
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
-            //if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-            //{
-            //    strSql += " and lib.MaterialCode like @MaterialCode ";
-            //    listStr.Add(new SqlParameter("@MaterialCode", "%"+txtMaterialCode.Text.Trim() + "%"));
-            //}
+            if (!string.IsNullOrEmpty(txtMaterialCode2.Text.Trim()))
+            {
+                strSql += " and lib.MaterialCode like @MaterialCode  ";
+                listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode2.Text.Trim() + "%"));
+
+            }
+            strSql += "  order by PrefabricatedComponents ";
             listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
@@ -461,7 +469,8 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 }
 
-              //  this.BindGrid2(this.Grid1.SelectedRowID);
+                this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
+                this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
             }
             else
             {
@@ -487,7 +496,8 @@ namespace FineUIPro.Web.HJGL.DataImport
 
                 }
 
-                  //this.BindGrid1(this.Grid1.SelectedRowID);
+                this.BindGrid1(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
+                this.BindGrid2(this.tvControlItem.SelectedNodeID, this.hdUnitWorkId.Text);
             }
             else
             {
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
index 1b351906..5dea38b2 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
 
+        /// <summary>
+        /// txtMaterialCode2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode2;
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>