Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -400,15 +400,15 @@ namespace UAS_MES.Make
                 sql.Clear();
                 sql.Append("select cm_soncode from craftmaterial where (cm_sncode='" + firstsn + "' or cm_sncode ");
                 sql.Append("in (select sn from makesnrelation where firstsn='" + firstsn + "')) and cm_status=0 and cm_soncode in (" + soncode.Substring(0, soncode.Length - 1) + ")");
-                DataTable dt1 = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
+                DataTable LoadSoncode = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                 //查询的结果不相等表示未完成上料
-                if (dt.Rows.Count != dt1.Rows.Count)
+                if (dt.Rows.Count != LoadSoncode.Rows.Count)
                 {
-                    for (int i = 0; i < dt1.Rows.Count; i++)
+                    for (int i = 0; i < LoadSoncode.Rows.Count; i++)
                     {
-                        if (soncode.Contains(dt.Rows[i][0].ToString()))
+                        if (soncode.Contains(LoadSoncode.Rows[i][0].ToString()))
                         {
-                            soncode = soncode.Replace(dt.Rows[i][0].ToString(),"");
+                            soncode = soncode.Replace(LoadSoncode.Rows[i][0].ToString(),"");
                         }
                     }
                     OperatResult.AppendText(">>" + soncode.Replace("'","") + "物料尚未备料，不允许回流\n");