修改RFID读取

UAS_MES_YDCY/FunctionCode/Make/Make_CheckRFID.cs

@@ -104,12 +104,13 @@ namespace UAS_MES_NEW.Make
                 OperateResult.AppendText("未正确安装BarTender软件\n", Color.Red);
             }
         }
-
+        bool CheckPass = false;
         private void sn_code_KeyDown(object sender, KeyEventArgs e)
         {
             //按下enter键
             if (e.KeyCode == Keys.Enter)
             {
+                CheckPass = false;
                 //如果输入的值为空的话，提示不能为空
                 if (sncode.Text == "")
                 {
@@ -167,7 +168,12 @@ namespace UAS_MES_NEW.Make
                         }
                         //开始盘存
                         RET_ERRNO er = n01Api.N01_StartReading();
-                        OperateResult.AppendText("开始盘存：" + er+"\n");
+                        OperateResult.AppendText("开始盘存：" + er + "\n");
+                        if (!CheckPass)
+                        {
+                            RET_ERRNO rET_ = n01Api.N01_StopReading();
+                            OperateResult.AppendText("未获取到数据,停止盘存：" + rET_ + "\n");
+                        }
                     }
                     else
                     {
@@ -221,30 +227,29 @@ namespace UAS_MES_NEW.Make
             ans.Add(antPwr);
             // 调用API设置天线1的功率参数
             RET_ERRNO eT_ERRNO = n01Api.N01_SetMultiAntPwr(ans.ToArray());
-            OperateResult.AppendText("设置天线功率结果：" + eT_ERRNO+"\n");
+            OperateResult.AppendText("设置天线功率结果：" + eT_ERRNO + "\n");
         }
         public N01Api n01Api = new N01Api();
         private void TagReadDataResult(object sender, TagReadDataEventArgs e)
         {
             if (e.EpcInfo.epc != "" && e.EpcInfo.epc != null && sncode.Text != "")
             {
-                OperateResult.AppendText("tag：" + e.EpcInfo.epc+"\n");
+                OperateResult.AppendText("tag：" + e.EpcInfo.epc + "\n");
                 if (e.EpcInfo.epc != sncode.Text)
                 {
                     OperateResult.AppendText(">>读取SN" + e.EpcInfo.epc + "和输入SN" + sncode.Text + "不一致\n", Color.Red, sncode);
-                    //RET_ERRNO rET_ = n01Api.N01_StopReading();
-                    //OperateResult.AppendText("停止盘存：" + rET_ + "\n");
                 }
                 else
                 {
                     OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
                     RET_ERRNO rET_ = n01Api.N01_StopReading();
-                    OperateResult.AppendText("停止盘存：" + rET_+"\n");
+                    OperateResult.AppendText("获取数据成功,停止盘存：" + rET_ + "\n");
                     //记录日志
                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "RFID核对", "RFID核对成功", sncode.Text, "");
                     //更新打印的数据
                     if (LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "RFID核对", "RFID核对成功", User.UserCode, out oErrorMessage))
                     {
+                        CheckPass = true;
                         //提示正确返回时传递的信息
                         if (oErrorMessage.Contains("AFTERSUCCESS"))
                             OperateResult.AppendText(">>" + oErrorMessage + "\n");