From 4255cacbe965d4d6cfb46989d786f7e54c65ade7 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Wed, 23 Nov 2022 18:22:46 +0800
Subject: [PATCH] =?UTF-8?q?2022-11-23=20=E6=9D=90=E6=96=99=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=88=A0=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vs/SGGL_SeDin/v17/.wsuo                      | Bin 24064 -> 24064 bytes
 .../HJGL/DataImport/MaterialInformation.aspx  |  12 ++++--
 .../DataImport/MaterialInformation.aspx.cs    |  35 ++++++++++++++++--
 .../MaterialInformation.aspx.designer.cs      |  18 +++++++++
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 4781fef6603c40b33f13c65d1180881c3fa52c49..4775c270179d889c3865ebb41e1e26a62e933298 100644
GIT binary patch
delta 899
zcma)4%}X0W6wk~~zBk4gYy2SXT4Sg*g;X#BK@hq~l%SiKgW$ih1&@N@DVOZ)Kj5O^
zrKR1udI*?Hz(Wo_^xVIoh4i2Y(>KWsi6JcxJl?+FypQ?)_MP64(;M=&ObLZ$`YLR+
z&o35wKS%;T(tWtq-b0rj#0c^Ed^2c0JkSVaz}Bueq7s-!A4FS_aYp(_OpfFCOSG`U
z8kJ;CbrRjwF=RqadWElIoJD&(hKu_gV(-vq(Y{qm#Gz$L<JZr#=g|m$A|W6w2^M2u
zgxH!Oqh>2Yi-?Vrd2CctrXZq^6o^7Y#>?oH5(57h5q`~%h!-i*kY82~1lBuXrt@IO
z4&XMq<xQCsS`_1HOBW-jMw7b;iWx#};RhWObw@A#x2rotow*OOzQBt3p!W6mkZ2^%
z07zMS1iP!>(+9gNxEf*$62rM~;AHkr4<Il<1aV(p)V+*JCSJJn!&f|I@SIl!ia5vf
z^M|E9(icIjqIx&C({<*qQ#Z@JohIeY>^5-<HrSgMv<i9XZg!wm%##)Vrx;~U&V-hR
z8s{cyoa^XgTr+;LAv(X`3R2gg?lyzw?lC{Mu83<guNtP%-oNCZYllQ$e9;u5L9-m^
I@#^pBUt3Rb9{>OV

delta 1221
zcmb7E&r2Io5Z?E)#*OYK{>Ub=#+qmnw=|Xwh^Aubs=;j38q<bidkuK#p$AbYl#oEL
zQktEfd&tR4q0L@B1lnVv3Z?W`|Ae+gN<Em)%Ma2Og?7Tnd-Kik-psf2QaU81L-KZ=
zk|7AvamV+&lbpTrmAGJ!Zoqpf26dW|IKpw<0HT2gSzictZ3i(25>A94(TkWuu!M7j
zg!@3-XB@Nha&}k|E|9(peh~eBL^<mg6<lv1ZX(PBVT%}ay<O+a{KQptx-gqv*Q&Gk
z6%m2(!{8T$BBMLT+WEUu8GY6X<2p9jK8pGOQuqYscU0({!Pa&oa<dagL@{w1F@$)R
z)k(Ear-B_F7HkzR9*I3|qDx8{Se{E%ok=P(k(m13;J_w)peob{Hbo}CRfoa-iklj~
zq!__ar!P1TD)7|zQKU$AzC`Q#k$uCnED`oy`w-n*Jek&5cyKJ(1c;WX7i*AI`y7(h
z9`kI}P7P82kIn)~0!c|VcZ2)<RRw$&F1r)z-i*0?jgU*5sVKZ{>r)>bD+$oj3Ph-{
z9F-st3cv{+HfxGTjM-#URHj|G-Pui%IToesvqx4L@kR8EFfHJBcun-;?z-iWNQrE~
zX{1P&U~j5uzl}kjgR}9pL?&?`wj>9d5<(qUR02?mN`zM3IuY1-bt{vbvtX#ZWEJ+*
zB3Xk|wL#|1(^x+b@kOWU4E-dPIE6=J+u-vn=8J_LTi03Iu^G2&l`#UZ{a)~DNf_0_
zJl?>;j|G_)3OEPha#R349e^*?589%;4H?M82JU4@EP9*kiE_tAIKt#L?z!Nb5(8}|
zUJl8qa4+OmLhSW44QeY-fTo5(OFe*6$_<ZG9;l^M_8cu{=x;pne14{|G<`oeuj21n
ZEI+f2|3vUyPr!+yRaYIn>B#+Z`~kbX!0rG5

diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
index 9874c64c..3acacc87 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx
@@ -98,7 +98,7 @@
                                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工厂预制"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
                                                     EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
-                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid1_Sort"
+                                                    SortField="PrefabricatedComponents" SortDirection="ASC" OnSort="Grid1_Sort"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                                                     <Columns>
                                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -218,7 +218,12 @@
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window5_Close"
             IsModal="true" Width="800px" Height="560px">
         </f:Window>
-
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnDelMatGrid1"  OnClick="btnDelMatGrid1_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
+                Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
         <f:Menu ID="Menu2" runat="server">
             <f:MenuButton ID="btnDelMat" OnClick="btnDelMat_Click" EnablePostBack="true"
                 ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
@@ -228,6 +233,7 @@
  
     </form>
     <script type="text/javascript">
+        var menuID1 = '<%= Menu1.ClientID %>';
         var menuID2 = '<%= Menu2.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
 
@@ -236,7 +242,7 @@
             return false;
         }
         function onRowContextMenu1(event, rowId) {
-            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            F(menuID1).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
         function onGridDataLoad(event) {
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
index d1f23245..9b81de27 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.HJGL.WeldingManage;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -87,7 +88,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -110,7 +111,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -261,7 +262,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(pipelineId))
             {
-                strSql += " and pipe.PipelineId=@PipelineId ";
+                strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents";
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
@@ -430,6 +431,32 @@ namespace FineUIPro.Web.HJGL.DataImport
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
         }
+        protected void btnDelMatGrid1_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                foreach (string rowID in Grid1.SelectedRowIDArray)
+                {
+
+                    BLL.PipelineMatService.DeletePipeLineMat(rowID);
+
+                    ShowNotify("删除成功！", MessageBoxIcon.Success);
+
+                }
+
+                  //this.BindGrid1(this.Grid1.SelectedRowID);
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
         #endregion
 
         #endregion
@@ -860,5 +887,7 @@ namespace FineUIPro.Web.HJGL.DataImport
         {
         }
         #endregion
+
+        
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
index b5befc6c..c9e129f5 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs
@@ -284,6 +284,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Window Window5;
 
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnDelMatGrid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnDelMatGrid1;
+
         /// <summary>
         /// Menu2 控件。
         /// </summary>