2023-10-25

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

@@ -17,7 +17,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (!IsPostBack)
             {
                 BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
-
+                ///焊接属性
+                this.drpJointAttribute.DataTextField = "Text";
+                this.drpJointAttribute.DataValueField = "Value";
+                this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
+                this.drpJointAttribute.DataBind();
                 this.InitTreeMenu();
             }
         }
@@ -262,6 +266,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     strSql += " AND WPQId IS NOT NULL";
                 }
             }
+
+            if (!string.IsNullOrEmpty(drpJointAttribute.SelectedValue))
+            {
+                strSql += " AND JointAttribute =@JointAttribute";
+
+                listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
 
@@ -364,7 +375,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
             {
-                var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID && x.WPQId == null select x;
+                var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == tvControlItem.SelectedNodeID &&x.JointAttribute==drpJointAttribute.SelectedValue && x.WPQId == null select x;
                 if (jotList.Count() > 0)
                 {
                     foreach (var jot in jotList)