2022-11-03 焊接修改，二次焊口设计增加新增焊口类型

SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs

@@ -16,6 +16,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (!IsPostBack)
             {
                 this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+                Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
                 this.InitTreeMenu();//加载树
 
             }
@@ -197,7 +198,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </summary>
         private void BindGrid()
         {
-            string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,
+            string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,TwoJointType,
                                      ComponentsCode1,ComponentsCode2,IsWelding,IsHotProessStr,Material1Code,Material2Code,
                                      WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
                                      WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
@@ -218,6 +219,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 strSql += " AND WeldJointCode LIKE @WeldJointCode";
                 listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
             }
+            if (DropTwoJointType.SelectedValue!=BLL.Const._Null)
+            {
+                strSql += " AND TwoJointType = @TwoJointType";
+                listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -826,5 +832,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
         #endregion
+
     }
 }