diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
index 4841395..05c6729 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
@@ -868,6 +868,13 @@ namespace FineUIPro.Web.HJGL.DataIn
                         if (getJoint == null)
                         {
                             newJointInfo.JOT_JointNo = col2;
+                            if (col8 == "固定")
+                            {
+                                if (!newJointInfo.JOT_JointNo.Contains("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 b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
index c286007..84e1496 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
@@ -52,7 +52,7 @@
                         EnableEdit="true" LabelWidth="100px">
                     </f:DropDownList>
                     <f:DropDownList ID="ddlJointAttribute" Label="焊口属性" runat="server" ShowRedStar="true"
-                        Required="true" EnableEdit="true" LabelWidth="100px">
+                        Required="true" EnableEdit="true" LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="ddlJointAttribute_SelectedIndexChanged">
                     </f:DropDownList>
                     <f:DropDownList ID="ddlWME_ID" Label="焊接方法" runat="server" ShowRedStar="true" Required="true"
                         EnableEdit="true" LabelWidth="100px">
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index b8f74e0..5c5b290 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -404,6 +404,20 @@
                 if (!string.IsNullOrEmpty(jointInfo.JOT_JointAttribute))
                 {
                     this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute;
+                    if (this.ddlJointAttribute.SelectedValue == "固定")
+                    {
+                        if (!this.txtJointNo.Text.Trim().Contains("G"))
+                        {
+                            this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
+                        }
+                    }
+                    else
+                    {
+                        if (this.txtJointNo.Text.Trim().Contains("G"))
+                        {
+                            this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
+                        }
+                    }
                 }
                 if (!string.IsNullOrEmpty(jointInfo.WME_ID))
                 {
@@ -1216,5 +1230,23 @@
             }
         }
         #endregion
+
+        protected void ddlJointAttribute_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (this.ddlJointAttribute.SelectedValue == "固定")
+            {
+                if (!this.txtJointNo.Text.Trim().Contains("G"))
+                {
+                    this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
+                }
+            }
+            else
+            {
+                if (this.txtJointNo.Text.Trim().Contains("G"))
+                {
+                    this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G","");
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
index 1f68beb..644abdf 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/Stock/StockIn.aspx
@@ -20,7 +20,7 @@
         <Items>
             <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊材入库录入" EnableCollapse="true"
                 runat="server" BoxFlex="1" DataKeyNames="StockInId" AllowCellEditing="true" ClicksToEdit="2"
-                DataIDField="StockInId" AllowSorting="true" SortField="WeldName" SortDirection="ASC"
+                DataIDField="StockInId" AllowSorting="true" SortField="InStockDate" SortDirection="DESC"
                 OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
                 OnPageIndexChange="Grid1_PageIndexChange" AllowFilters="true" OnFilterChange="Grid1_FilterChange"
                 EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">