diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
index 05c6729..d58e176 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
@@ -870,7 +870,7 @@ namespace FineUIPro.Web.HJGL.DataIn
                             newJointInfo.JOT_JointNo = col2;
                             if (col8 == "固定")
                             {
-                                if (!newJointInfo.JOT_JointNo.Contains("G"))
+                                if (newJointInfo.JOT_JointNo.Last() != 'G')
                                 {
                                     newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
                                 }
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
index e7dfce5..36a0af1 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
@@ -371,6 +371,13 @@
                     {
                         try
                         {
+                            if (this.ddlJointAttribute.SelectedValue == "固定")
+                            {
+                                if (newJointInfo.JOT_JointNo.Last() != 'G')
+                                {
+                                    newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
+                                }
+                            }
                             newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
                             BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
 
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index 5c5b290..2501a93 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -406,14 +406,14 @@
                     this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute;
                     if (this.ddlJointAttribute.SelectedValue == "固定")
                     {
-                        if (!this.txtJointNo.Text.Trim().Contains("G"))
+                        if (this.txtJointNo.Text.Trim().Last() != 'G')
                         {
                             this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
                         }
                     }
                     else
                     {
-                        if (this.txtJointNo.Text.Trim().Contains("G"))
+                        if (this.txtJointNo.Text.Trim().Last() == 'G')
                         {
                             this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
                         }
@@ -1235,14 +1235,14 @@
         {
             if (this.ddlJointAttribute.SelectedValue == "固定")
             {
-                if (!this.txtJointNo.Text.Trim().Contains("G"))
+                if (this.txtJointNo.Text.Trim().Last() != 'G')
                 {
                     this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
                 }
             }
             else
             {
-                if (this.txtJointNo.Text.Trim().Contains("G"))
+                if (this.txtJointNo.Text.Trim().Last() == 'G')
                 {
                     this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G","");
                 }