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

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -444,6 +444,16 @@ namespace UAS_MES.Make
                             BaseUtil.SetFormValue(this.Controls, dt);
                             LockMakeCode.Checked = true;
                         }
+                        dt = dh.getFieldsDataByCondition("makeserial", new string[] { "ms_status", "ms_checkno", "ms_outboxcode" }, "ms_id='" + oMSID + "' ");
+                        if (dt.Rows.Count > 0)
+                        {
+                            string ms_outboxcode = dt.Rows[0]["ms_outboxcode"].ToString();
+                            if (ms_outboxcode != "")
+                            {
+                                OperateResult.AppendText(">>SN已装箱" + ms_outboxcode + ",采集不良请先解除装箱\n", Color.Red);
+                                return;
+                            }
+                        }
                     }
                     else
                     {