diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index 6bc37c67..6f72f7b0 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -77,8 +77,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             //}
             //else
             //{
-                unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
-                unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
+            unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
+            unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
             //}
 
             if (unitWork1.Count() > 0)
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
             pipeline = (from x in Funs.DB.HJGL_Pipeline
-                        where x.ProjectId == this.CurrUser.LoginProjectId &&   x.UnitWorkId == node.NodeID
+                        where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
                        && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
                         orderby x.PipelineCode
                         select x).ToList();
@@ -220,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
             this.hdUnitWorkId.Text = string.Empty;
-        
+
             if (e.CommandName == "加载")
             {
                 string CommandName = e.Node.ParentNode.CommandName;
@@ -244,7 +244,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 }
 
             }
-         
+
         }
         protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
         {
@@ -285,19 +285,19 @@ 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)
+            if (DropTwoJointType.SelectedValue != BLL.Const._Null)
             {
                 strSql += " AND TwoJointType = @TwoJointType";
                 listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
             }
-            if (ckIsAudit.Checked==true)
+            if (ckIsAudit.Checked == true)
             {
                 strSql += " and  AuditDate is null";
             }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
             var SizeSum = tb.AsEnumerable().Select(x => x.Field<decimal>("Size")).Sum();
-            lbSize.Text=SizeSum.ToString(); 
+            lbSize.Text = SizeSum.ToString();
             // 2.获取当前分页数据
             Grid1.RecordCount = tb.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, tb);
@@ -372,7 +372,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 NoAuditBindGrid();
             }
 
-             
+
         }
         #endregion
 
@@ -475,7 +475,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.WPQId == null && x.IsTwoJoint == true select x;
                 if (jotList.Count() > 0)
                 {
                     foreach (var jot in jotList)
@@ -504,7 +504,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             newJot.PreTemperature = wps.PreTemperature;
                             newJot.IsHotProess = wps.IsHotProess;
                             newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
-                            newJot.IsTwoJoint = true;
                             BLL.WeldJointService.UpdateConWeldJoint(newJot);
                         }
                     }
@@ -911,7 +910,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     NPOI.SS.UserModel.ICell cell;
                     cell = row1.CreateCell(0);
                     cell.CellStyle = cellStyle0;
-                    cell.SetCellValue((i+1).ToString());
+                    cell.SetCellValue((i + 1).ToString());
                     cell = row1.CreateCell(1);
                     cell.CellStyle = cellStyle0;
                     cell.SetCellValue(this.Grid1.Rows[i].Values[2].ToString());
@@ -926,7 +925,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     string date1 = this.Grid1.Rows[i].Values[5].ToString();
                     if (!string.IsNullOrEmpty(date1))
                     {
-                        date1 = string.Format("{0:yyyy-MM-dd}",Funs.GetNewDateTime(date1));
+                        date1 = string.Format("{0:yyyy-MM-dd}", Funs.GetNewDateTime(date1));
                     }
                     cell.SetCellValue(date1);
                     cell = row1.CreateCell(5);