注释测试数据

MainForm/FaForm/Form_Home.cs

@@ -5756,8 +5756,8 @@ namespace MainForm
                         else
                         {
                             //测试
-                            stPLC_MesData.BarcodeSet.strCarrierBarcode = "A123456";
-                            stPLC_MesData.mesCommFrmPLC.cmd = 1;
+                            //stPLC_MesData.BarcodeSet.strCarrierBarcode = "A123456";
+                            //stPLC_MesData.mesCommFrmPLC.cmd = 1;
 
                             //去除扫码产生的特殊字符
                             stPLC_MesData.BarcodeSet.strProductBarcode =
@@ -5953,6 +5953,24 @@ namespace MainForm
                     return;
                 }
                 sn = ProductBarcode;
+                if (OpenDailogFalg)
+                {
+                    using (var dialog = new BandBarodeDialog(strCarrierBarcode, ProductBarcode, PCBBarcode))
+                    {
+                        var rs = dialog.ShowDialog();
+                        if (rs == DialogResult.OK)
+                        {
+                            AddMessage(LogType.Info, $"扫码校验通过，载具码:{strCarrierBarcode}");
+                            OpenDailogFalg = false; //关闭扫码
+                            StopWhile = false;//开启while循环
+                        }
+                        else
+                        {
+                            ProgressState = false;
+                            return;
+                        }
+                    }
+                }
                 AddMessage(LogType.Info, $"载具码:{strCarrierBarcode};产品码:{sn}");
 
                 // 产品SN（物料码）校验
@@ -5982,28 +6000,6 @@ namespace MainForm
                 resultToPlC.cmdParam = 0; //指令参数
                 resultToPlC.cmdResult = mesResultFrmWeb;
                 WriteResultToPlc(plcNo, stationNameStr, tagMesCommName, 1, resultToPlC);
-
-                if (mesResultFrmWeb == 1)
-                {
-                    if (OpenDailogFalg)
-                    {
-                        using (var dialog = new BandBarodeDialog(strCarrierBarcode, ProductBarcode, PCBBarcode))
-                        {
-                            var rs = dialog.ShowDialog();
-                            if (rs == DialogResult.OK)
-                            {
-                                AddMessage(LogType.Info, $"扫码校验通过，载具码:{strCarrierBarcode}");
-                                OpenDailogFalg = false; //关闭扫码
-                                StopWhile = false;//开启while循环
-                            }
-                            else
-                            {
-                                ProgressState = false;
-                                return;
-                            }
-                        }
-                    }
-                }
                 
             }
             catch (Exception ex)