【万利达MES】返工数据采集不允许采集已装箱SN

UAS-MES/FunctionCode/Make/Make_GetReMakeSN.cs

@@ -170,11 +170,13 @@ namespace UAS_MES.Make
                                 }
                                 if (ms_outboxcode != "")
                                 {
-                                    string logout_confirm = MessageBox.Show(this, "序列号"+ sn_code.Text + "已装入卡通箱"+ ms_outboxcode + "是否确认返工","提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
-                                    if (logout_confirm != "Yes")
-                                    {
-                                        return;
-                                    }
+                                    //string logout_confirm = MessageBox.Show(this, "序列号"+ sn_code.Text + "已装入卡通箱"+ ms_outboxcode + "是否确认返工","提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question).ToString();
+                                    //if (logout_confirm != "Yes")
+                                    //{
+                                    //    return;
+                                    //}
+                                    OperateResult.AppendText("序列号" + sn_code.Text + "已装入卡通箱" + ms_outboxcode + "不允许采集", Color.Red, sn_code);
+                                    return;
                                 }
                                 if (ma_unlimitin == 0 && ma_inqty - ma_scrapqty + 1 > ma_qty)
                                 {