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

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -208,7 +208,7 @@ namespace UAS_MES.Make
                     }
                     else
                     {
-                        if (oMakeCode != "" && oMakeCode != ma_code.Text)
+                        if (oMakeCode == ""||(oMakeCode != "" && oMakeCode != ma_code.Text))
                         {
                             oMakeCode = ma_code.Text;
                         }

UAS-MES/PublicMethod/LogicHandler.cs

@@ -214,8 +214,17 @@ namespace UAS_MES.PublicMethod
                 return true;
             else
             {
-                oErrorMessage = "序列号:" + iSnCode + " 未归属工单";
-                return false;
+                dt = (DataTable)dh.ExecuteSql("select msd_makecode from MAKESNRULEDETAIL where  msd_sncode='" + iSnCode + "'", "select");
+                if (dt.Rows.Count > 0)
+                {
+                    oMakeCode = dt.Rows[0]["msd_makecode"].ToString();
+                    return true;
+                }
+                else
+                {
+                    oErrorMessage = "序列号:" + iSnCode + " 未归属工单";
+                    return false;
+                }
             }
         }
 

UAS_AutoPass/AutoAnalysisXml.cs

@@ -412,9 +412,9 @@ namespace UAS_AutoPass
             string[] ID = dh.GetSEQ("makebad_seq", badcode.Length);
             sql.Clear();
             sql.Append("insert into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,mb_indate,mb_stepcode");
-            sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_status,mb_badremark) select :ID");
+            sql.Append(",mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_status,mb_badremark,mb_stauts) select :ID");
             sql.Append(",ma_code,ms_code,ms_sncode,'" + iusercode + "',sysdate,'" + istepcode + "','" + isource + "',");
-            sql.Append(":bc_code,'" + ibadgroup + "','','0',:location from make left join makeSerial on ms_makecode=ma_code ");
+            sql.Append(":bc_code,'" + ibadgroup + "','','0',:location,'-1' from make left join makeSerial on ms_makecode=ma_code ");
             sql.Append("where ms_sncode='" + sncode + "' and ms_makecode='" + makecode + "'");
             dh.BatchInsert(sql.ToString(), new string[] {"ID", "bc_code", "location" }, ID, badcode, badlocation);
             sql.Clear();

UAS_AutoUpdate/CheckUpdateWindow.cs

@@ -50,7 +50,7 @@ namespace UAS_AutoUpdate
                 Process[] pro = Process.GetProcessesByName("UAS_MES");
                 if (pro.Length > 0)
                 {
-                    string CloseProcess = MessageBox.Show(this.ParentForm, "当前程序仍在运行，是否关闭", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                    string CloseProcess = MessageBox.Show(this.ParentForm, "检测到程序仍在运行，是否关闭", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
                     if (CloseProcess == "Yes")
                     {
                         for (int i = 0; i < pro.Length; i++)
@@ -60,6 +60,7 @@ namespace UAS_AutoUpdate
                     }
                     else
                     {
+                        Close();
                         return;
                     }
                 }