优化一些东西；

alielie

2025-11-25 006c98e5650b530e5220f279c1e803fefe69d40d

 Plugin.TestResult/Scanner.xaml.cs

@@ -1,9 +1,15 @@
using HMI.UI.Util;
using HMI.Core.Util;
using HMI.UI.MDI;
using HMI.UI.Util;
using HMI.Util;
using Panuon.WPF.UI;
using Plugin.TestResult.Model;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO.Ports;
using System.Windows;
using System.Windows.Input;

namespace Plugin.TestResult_WPF
{
@@ -12,12 +18,16 @@
        public string name { get; private set; }
        public string positionCode { get; private set; }
        public string snrCode { get; private set; }
        public string oldPosition { get; private set; }
        public int oldIndex { get; private set; }

        public BarcodeEventArg(string name, string positionCode, string snrCode)
        public BarcodeEventArg(string name, string positionCode, string snrCode, string oldPosition, int oldIndex)
        {
            this.name = name;
            this.positionCode = positionCode;
            this.snrCode = snrCode;
            this.oldPosition = oldPosition;
            this.oldIndex = oldIndex;
        }
    }

@@ -35,6 +45,10 @@
        }

        public event EventHandler<BarcodeEventArg> FinishBarcode;
        public event EventHandler<RoutedEventArgs> ComplateClick;

        private static Dictionary<string, string> snrCache = new Dictionary<string, string>();
        private static Dictionary<string, int> snrIndex = new Dictionary<string, int>();

        private DataTable dataTable;
        SerialPort serialPort;
@@ -59,26 +73,36 @@
        {
            string comStr = "";
            if (serialPort != null) return;
            if (this.title == "一区扫码")

            string section = this.Tag.ToString();
            ScannerConfig common = ScannerConfig.ReadFromIni(ViewControl.SannerIniFile, "Config");

            string portName = IniFileHelper.ReadIniData(section, "PortName", "", ViewControl.SannerIniFile);
            if (string.IsNullOrEmpty(portName))
            {
                comStr = "COM1";
                if (section.StartsWith("A"))
                {
                    portName = "COM1";
                }
                else
                {
                    portName = "COM2";
                }
            }
            else
            {
                comStr = "COM2";
            }
            common.PortName = portName;


            // 配置串口
            serialPort = new SerialPort
            {
                PortName = comStr,
                BaudRate = 115200,
                PortName = common.PortName,
                BaudRate = common.BaudRate,
                Parity = Parity.None,
                DataBits = 8,
                StopBits = StopBits.One,
                DataBits = common.DataBits,
                StopBits = common.StopBits,
                Handshake = Handshake.None,
                DtrEnable = true,
                RtsEnable = true
                DtrEnable = common.DtrEnable,
                RtsEnable = common.RtsEnable
                //ReadTimeout = 500,
                //WriteTimeout = 500,
                //ReciveBufferSize=4096
@@ -93,7 +117,8 @@
            }
            catch (Exception ex)
            {
                MsgBoxHelper.Error(this, $"初始化扫码枪失败！{ex.StackTrace}");
                ViewControl.Logger.Error("Init Scan Gun Failed.", ex);
                MsgBoxHelper.Error(this, $"{this.lang("Tr.InitGunFailed")}: {ex.StackTrace}");
            }
        }

@@ -123,7 +148,46 @@
            }
            catch (Exception ex)
            {
                MessageBox.Show($"获取扫码枪数据失败！{ex.StackTrace}");
                ViewControl.Logger.Error("Get Scan Gun Data Failed.", ex);
                MessageBox.Show($"{this.lang("Tr.GetGunData")}: {ex.StackTrace}");
            }
        }

        public static void InsertNewCode(string snr, string position, int index)
        {
            snrCache[snr] = position;
            snrIndex[snr] = index;
        }

        public static void RemoveSNR(string snr)
        {
            snrCache.Remove(snr);
            snrIndex.Remove(snr);
        }

        private void SendCode(string tag, string position, string snr)
        {
            if (snrCache.ContainsKey(snr))
            {
                var oldPosition = snrCache[snr];
                if (MsgBoxHelper2.WarnChoose($"条码[{snr}]已放置于[{oldPosition}]中，是否清除？") == MessageBoxResult.OK)
                {
                    try
                    {
                        FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, null, oldPosition, snrIndex[snr]));
                        snrCache.Remove(snr);
                        snrIndex.Remove(snr);
                        FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, snr, null, -1));
                    }
                    catch (Exception ex)
                    {
                        ToastHelper.Error(ex.Message);
                    }
                }
            }
            else
            {
                FinishBarcode.Invoke(this, new BarcodeEventArg(tag, position, snr, null, -1));
            }
        }

@@ -134,40 +198,53 @@
                string position = positionText.Text, snr = snrText.Text;
                if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
                {
                    MessageBox.Show("请输入储位条码和产品条码");
                    ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
                    return;
                }
                try
                {
                    FinishBarcode.Invoke(this, new BarcodeEventArg(title, position, snr));
                    //positionText.Text = "";
                    //snrText.Text = "";
                    SendCode(Tag.ToString(), position, snr);
                    positionText.Text = "";
                    snrText.Text = "";
                    positionText.Focus();
                }
                catch (Exception ex)
                {
                    MessageBox.Show(ex.Message);
                    ViewControl.Logger.Error("Con_Click Failed.", ex);
                    ToastHelper.Warning(this, ex.Message);
                }
            });
        }

        /// <summary>
        /// 原来的完成扫描逻辑
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        //private void Ok_Click(object sender, RoutedEventArgs e)
        //{
        //    string position = positionText.Text, snr = snrText.Text;
        //    if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
        //    {
        //        ToastHelper.Warning(this, this.lang("Tr.PleaseInputSnrs"));
        //        return;
        //    }
        //    try
        //    {
        //        SendCode(Tag.ToString(), position, snr);
        //        this.Close();
        //    }
        //    catch (Exception ex)
        //    {
        //        ViewControl.Logger.Error("Con_Click Failed.", ex);
        //        ToastHelper.Warning(this, ex.Message);
        //    }
        //}

        private void Ok_Click(object sender, RoutedEventArgs e)
        {
            string position = positionText.Text, snr = snrText.Text;
            if (string.IsNullOrEmpty(position) || string.IsNullOrEmpty(snr))
            {
                MessageBox.Show("请输入储位条码和产品条码");
                return;
            }
            try
            {
                FinishBarcode.Invoke(this, new BarcodeEventArg(title, position, snr));
                this.Close();
            }
            catch (Exception ex)
            {
                MessageBox.Show(ex.Message);
            }
            ComplateClick?.Invoke(this, e);
            this.Close();
        }

        private string ReadDataFrom(SerialPort sp)
@@ -177,7 +254,7 @@
            {
                byte[] buffer = new byte[sp.BytesToRead];
                sp.Read(buffer, 0, buffer.Length);
                barcode += System.Text.Encoding.UTF8.GetString(buffer);
                barcode += System.Text.Encoding.ASCII.GetString(buffer);
                System.Threading.Thread.Sleep(50);
            }
            return barcode;
@@ -188,10 +265,30 @@
            try
            {
                serialPort.Close();
                serialPort = null;
            }
            catch (Exception ex)
            {
            }
        }

        private void TextBox_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
        {
            if (e.Key == Key.Enter)
            {
                //string barcode = 
                Dispatcher.Invoke(() =>
                {
                    if (snrText.IsFocused)
                    {
                        Con_Click(null, null);
                    }
                    else
                    {
                        snrText.Focus();
                    }
                });
            }
        }
    }
}