20230220 003焊接修改

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx

@@ -75,10 +75,7 @@
                                             EmptyText="输入查询条件" Hidden="true"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtDesignPress" runat="server" Label="压力"
-                                            EmptyText="输入查询条件"
-                                            Width="180px" LabelWidth="80px" LabelAlign="Right">
-                                        </f:TextBox>
+                                        
                                         <f:TextBox ID="txtMaterialCode" runat="server" Label="材质"
                                             EmptyText="输入查询条件"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs

@@ -191,9 +191,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
             view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
             view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
             view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
-            view_HJGL_Pipeline.DesignPress=this.txtDesignPress.Text.Trim();
-           // view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
-            var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
+            // view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
+            var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline);
+            if (!string .IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
+            {
+                list = (from x in list
+                        join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
+                        where y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                        select x).Distinct().ToList();
+            }
             view_HJGL_Pipelines = list;                   
             // 2.获取当前分页数据
             Grid1.RecordCount = list.Count();
@@ -364,8 +370,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             txtPipelineCode.Text = String.Empty;
             txtSingleName.Text = String.Empty;
-            txtDesignPress.Text = String.Empty;
-            txtMaterialCode.Text = String.Empty;
+             txtMaterialCode.Text = String.Empty;
             BindGrid();
         }
 

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs

@@ -185,15 +185,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.TextBox txtSingleName;
 
-        /// <summary>
-        /// txtDesignPress 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDesignPress;
-
         /// <summary>
         /// txtMaterialCode 控件。
         /// </summary>