diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
index 07f6a4c..400fef4 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
@@ -499,10 +499,10 @@ namespace FineUIPro.Web.HJGL.DataIn
                     {
                         result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n";
                     }
-                    else
-                    {
-                        result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n";
-                    }
+                    //else
+                    //{
+                    //    result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n";
+                    //}
                     if (!string.IsNullOrEmpty(col14) && weldSilk == null)
                     {
                         result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n";
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index 68d2c76..4851ece 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -147,12 +147,13 @@
                                     <asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
                                 </ItemTemplate>
                             </f:TemplateField>
-                            <f:RenderField HeaderText="焊条牌号" ColumnID="WeldMatCode" DataField="WeldMatCode" SortField="WeldMatCode"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">                       
-                            </f:RenderField>
                             <f:RenderField HeaderText="焊丝牌号" ColumnID="WeldSilkCode" DataField="WeldSilkCode" SortField="WeldSilkCode"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">                       
                             </f:RenderField>
+                            <f:RenderField HeaderText="焊条牌号" ColumnID="WeldMatCode" DataField="WeldMatCode" SortField="WeldMatCode"
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">                       
+                            </f:RenderField>
+                            
                         </Columns>
                         <Listeners>
                             <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index f958720..0552477 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -172,13 +172,6 @@
                                     <asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
                                 </ItemTemplate>
                             </f:TemplateField>
-                            <f:RenderField HeaderText="焊条牌号" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
-                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">  
-                                  <Editor>
-                                   <f:DropDownList ID="ddlWeldMat" EnableEdit="true"  runat="server">                                           
-                                     </f:DropDownList>                    
-                                  </Editor>
-                            </f:RenderField> 
                             <f:RenderField HeaderText="焊丝牌号" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
                                  FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">  
                                   <Editor>
@@ -186,6 +179,14 @@
                                      </f:DropDownList>                   
                                   </Editor>
                             </f:RenderField> 
+                            <f:RenderField HeaderText="焊条牌号" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
+                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">  
+                                  <Editor>
+                                   <f:DropDownList ID="ddlWeldMat" EnableEdit="true"  runat="server">                                           
+                                     </f:DropDownList>                    
+                                  </Editor>
+                            </f:RenderField> 
+                            
                              <f:RenderField  HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID" 
                                 FieldType="String" Hidden="true"></f:RenderField>                                                                             
                         </Columns>
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index a47e997..e045e04 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -344,12 +344,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 string status = mergedRow.Value<string>("status");
                 JObject values = mergedRow.Value<JObject>("values");
-                var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
-                if (weldMat == null)
-                {
-                    ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
-                    return;
-                }
+                //var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
+                //if (weldMat == null)
+                //{
+                //    ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
+                //    return;
+                //}
                 var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
                 if (weldSilk == null)
                 {
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
index 528966c..d5a8fbd 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
@@ -300,15 +300,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label8;
         
-        /// <summary>
-        /// ddlWeldMat 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlWeldMat;
-        
         /// <summary>
         /// ddlWeldSilk 控件。
         /// </summary>
@@ -318,6 +309,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlWeldSilk;
         
+        /// <summary>
+        /// ddlWeldMat 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlWeldMat;
+        
         /// <summary>
         /// Window1 控件。
         /// </summary>