优化标签读取

UAS_MES_YDCY/FunctionCode/Make/Make_CheckRFID.cs

@@ -167,7 +167,7 @@ namespace UAS_MES_NEW.Make
                         }
                         //开始盘存
                         RET_ERRNO er = n01Api.N01_StartReading();
-                        OperateResult.AppendText("开始盘存：" + er);
+                        OperateResult.AppendText("开始盘存：" + er+"\n");
                     }
                     else
                     {
@@ -221,59 +221,63 @@ namespace UAS_MES_NEW.Make
             ans.Add(antPwr);
             // 调用API设置天线1的功率参数
             RET_ERRNO eT_ERRNO = n01Api.N01_SetMultiAntPwr(ans.ToArray());
-            OperateResult.AppendText("设置天线功率结果：" + eT_ERRNO);
+            OperateResult.AppendText("设置天线功率结果：" + eT_ERRNO+"\n");
         }
         public N01Api n01Api = new N01Api();
         private void TagReadDataResult(object sender, TagReadDataEventArgs e)
         {
-            OperateResult.AppendText("tag：" + e.EpcInfo.epc);
-            if (e.EpcInfo.epc != sncode.Text)
+            if (e.EpcInfo.epc != "" && e.EpcInfo.epc != null && sncode.Text != "")
             {
-                OperateResult.AppendText(">>读取SN" + e.EpcInfo.epc + "和输入SN" + sncode.Text + "不一致\n", Color.Red);
-            }
-            else
-            {
-                OperateResult.AppendText("<<序列号：" + sncode.Text + "\n", Color.Black);
-
-                RET_ERRNO rET_ = n01Api.N01_StopReading();
-                OperateResult.AppendText("停止盘存：" + rET_);
-                //记录日志
-                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))
+                OperateResult.AppendText("tag：" + e.EpcInfo.epc+"\n");
+                if (e.EpcInfo.epc != sncode.Text)
                 {
-                    //提示正确返回时传递的信息
-                    if (oErrorMessage.Contains("AFTERSUCCESS"))
-                        OperateResult.AppendText(">>" + oErrorMessage + "\n");
-                    if (CollectRemark.Checked && Remark.Text != "")
-                    {
-                        LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
-                    }
-                    //清空输入框的值，聚焦
-                    sncode.Text = "";
-                    sncode.Focus();
-                    //刷新打印数量和剩余数量
-                    dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
-                    BaseUtil.SetFormValue(Controls, dt);
-                    mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
-                    //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
-                    if (int.Parse(mcd_remainqty.Text) == 0 && ma_unlimitin == "0")
+                    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");
+                    //记录日志
+                    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))
                     {
-                        OperateResult.AppendText(">>工单：" + ma_code.Text + "核对完成，>>请输入SN\n", Color.Green);
+                        //提示正确返回时传递的信息
+                        if (oErrorMessage.Contains("AFTERSUCCESS"))
+                            OperateResult.AppendText(">>" + oErrorMessage + "\n");
+                        if (CollectRemark.Checked && Remark.Text != "")
+                        {
+                            LogicHandler.CollectRemarkInf(sncode.Text, "", "", oMakeCode, ma_prodcode.Text, Remark.Text);
+                        }
+                        //清空输入框的值，聚焦
+                        sncode.Text = "";
+                        sncode.Focus();
+                        //刷新打印数量和剩余数量
+                        dt = (DataTable)dh.ExecuteSql("select ma_qty - nvl(mcd_inqty, 0) mcd_remainqty,nvl(ma_unlimitin,0)ma_unlimitin from make left join makecraftdetail on mcd_macode=ma_code where ma_code='" + ma_code.Text + "' and mcd_stepcode='" + User.CurrentStepCode + "'", "select");
+                        BaseUtil.SetFormValue(Controls, dt);
+                        mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
+                        //IF 剩余数=0，则清空form中的数据， 提示用户“工单：xx已经打印完成,>>请输入SN”, 清空mapB,listC 中的数据
+                        if (int.Parse(mcd_remainqty.Text) == 0 && ma_unlimitin == "0")
+                        {
+                            OperateResult.AppendText(">>工单：" + ma_code.Text + "核对完成，>>请输入SN\n", Color.Green);
+                        }
+                        //剩余数量不为0
+                        else
+                        {
+                            OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        }
                     }
-                    //剩余数量不为0
                     else
                     {
-                        OperateResult.AppendText(">>请输入SN\n", Color.Black);
+                        OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
+                        //清空输入框的值，聚焦
+                        sncode.Text = "";
+                        sncode.Focus();
                     }
                 }
-                else
-                {
-                    OperateResult.AppendText(">>" + oErrorMessage + "\n", Color.Red, sncode);
-                    //清空输入框的值，聚焦
-                    sncode.Text = "";
-                    sncode.Focus();
-                }
             }
         }
     }