From 5e823e6a3df757e61e4a3bd6ed175c52a3f0bf7b Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Thu, 23 Feb 2023 16:33:47 +0800
Subject: [PATCH] =?UTF-8?q?2023-02-23=20001=20=20=E7=84=8A=E5=8F=A3?=
 =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=AE=BE=E8=AE=A1=E8=87=AA=E5=8A=A8=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs | 2 +-
 SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx        | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index 520a730f..ae19cf21 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -459,7 +459,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId);
                         if (wpqList != null)
                         {
-                            Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
+                            Model.HJGL_WeldJoint newJot = WeldJointService.GetWeldJointByWeldJointId(jot.WeldJointId);
                             Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
 
                             newJot.WPQId = wps.WPQId;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
index 9a32d9e5..a4902f01 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx
@@ -116,10 +116,7 @@
                                     DataField="Size" SortField="Size" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
                                     Width="70px">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="外径" ColumnID="Dia" Hidden="true"
-                                    DataField="Dia" SortField="Dia" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
-                                    Width="70px">
-                                </f:RenderField>
+                
                                 <f:RenderField HeaderText="壁厚" ColumnID="Thickness" Hidden="true"
                                     DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="70px">