change -修改扫码器业务

Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json

@@ -1159,6 +1159,9 @@
             "projectReferences": {
               "E:\\c#\\AUCMA\\main\\Admin.Core.Common\\Admin.Core.Common.csproj": {
                 "projectPath": "E:\\c#\\AUCMA\\main\\Admin.Core.Common\\Admin.Core.Common.csproj"
+              },
+              "E:\\c#\\AUCMA\\main\\Admin.Core.IService\\Admin.Core.IService.csproj": {
+                "projectPath": "E:\\c#\\AUCMA\\main\\Admin.Core.IService\\Admin.Core.IService.csproj"
               }
             }
           }

Admin.Core.Api/obj/project.assets.json

@@ -4198,6 +4198,7 @@
         "framework": ".NETCoreApp,Version=v6.0",
         "dependencies": {
           "Admin.Core.Common": "1.0.0",
+          "Admin.Core.IService": "1.0.0",
           "System.Drawing.Common": "7.0.0"
         },
         "compile": {

Admin.Core.Api/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "SUegXTCAB7TQ9eQhY20mNmYbC9dM0KemtU+LTn5vR4DDs1r79dJUfHJkklQqyIumLQlBx8Tr+bTsiIpfYXpOQQ==",
+  "dgSpecHash": "x/1IYBx+cRPCyFZGAukeOvkK0sLYLVzLNs25ip6AWQgTqIyIk7CMOa6rBNEqNeQpbgnquat9YFa0RocMmKEMUg==",
   "success": true,
   "projectFilePath": "E:\\c#\\AUCMA\\main\\Admin.Core.Api\\Admin.Core.Api.csproj",
   "expectedPackageFiles": [

Aucma.Core.CodeBinding/App.xaml

@@ -1,9 +1,9 @@
-<Application x:Class="Aucma.Core.DoorFoam.App"
+<Application x:Class="Aucma.Core.CodeBinding.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:local="clr-namespace:Aucma.Core.DoorFoam"
+             xmlns:local="clr-namespace:Aucma.Core.CodeBinding"
              d1p1:Ignorable="d">
 
     <Application.Resources>

Aucma.Core.CodeBinding/App.xaml.cs

@@ -1,4 +1,4 @@
-using Aucma.Core.DoorFoam.Views;
+using Aucma.Core.CodeBinding.Views;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
@@ -10,7 +10,7 @@ using Autofac.Extensions.DependencyInjection;
 using Microsoft.AspNetCore.Hosting;
 using Admin.Core.Common;
 
-namespace Aucma.Core.DoorFoam
+namespace Aucma.Core.CodeBinding
 {
     /// <summary>
     /// Interaction logic for App.xaml

Aucma.Core.CodeBinding/Business/codeBindingBusiness.cs

@@ -1,135 +0,0 @@
-using Admin.Core.Common;
-using Admin.Core.IRepository;
-using Admin.Core.IService;
-using Admin.Core.Model;
-using Admin.Core.Service;
-using Aucma.Core.PLc;
-using CommunityToolkit.Mvvm.ComponentModel;
-using log4net;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection.Emit;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Aucma.Core.CodeBinding
-{
-    /// <summary>
-    /// 条码绑定业务逻辑
-    /// </summary>
-    public sealed class codeBindingBusiness
-    {
-   
-        #region 对象引用
-        /// <summary>
-        /// 日志信息
-        /// </summary>
-        /// <param name="Code1"></param>
-        private static readonly log4net.ILog log = LogManager.GetLogger(typeof(CodeBindingRecordServices));
-
-        private ICodeBindingRecordServices? _codeBindingRecordServices;
-        #endregion
-
-        #region 委托事件
-        /// <summary>
-        /// code1扫码信息刷新
-        /// </summary>
-        /// <param name="Code1"></param>
-        public delegate void RefreshCode1(string Code1, string time);
-        public event RefreshCode1 RefreshCode1Event;
-        /// <summary>
-        /// code2扫码信息刷新,记录表更新
-        /// </summary>
-        /// <param name="Code1"></param>
-        public delegate void RefreshCode2(CodeBindingRecord record);
-        public event RefreshCode2 RefreshCode2Event;
-        #endregion
-
-        public codeBindingBusiness(ICodeBindingRecordServices _codeBindingRecordServices)
-        {
-            _codeBindingRecordServices = _codeBindingRecordServices;
-            var list = _codeBindingRecordServices.FirstAsync().Result;
-
-            Task.Run(() =>
-            {
-                //plc使用    var obj = PlcHelper.melsecList.FirstOrDefault(d => d.EquipName.Equals("后板Plc"));
-                Thread.Sleep(1000);
-                receiveCode1("11335577");
-            });
-        }
-        private codeBindingBusiness()
-        {
-
-            //Task.Run(() =>
-            //{
-            //    Thread.Sleep(5000);
-            //    _codeBindingRecordServices = App.ServiceProvider.GetService<ICodeBindingRecordServices>();
-            //    _codeBindingRecordServices.FirstAsync();
-            //});
-
-            //Task.Run(() =>
-            //{
-            //    Thread.Sleep(1000);
-            //    receiveCode1("11335577");
-            //});
-
-
-       }
-
-        /// <summary>
-        /// 条码绑定,条码1处理
-        /// </summary>
-        /// <param name="materialType"></param>
-        private void receiveCode1(string code1)
-        {
-            log.Info("进入条码1处理函数receiveCode1,code1:" + code1);
-            DateTime time  =  System.DateTime.Now;
-            string strTime = time.ToString();
-            // 1.刷新界面条码信息
-            RefreshCode1Event?.Invoke(code1,strTime);
-            // 2.创建任务更新数据库条码1
-            CodeBindingRecord codeRecord = new CodeBindingRecord();
-            codeRecord.BoxCode = code1;
-            codeRecord.BoxName = "去数据库查询";
-            codeRecord.RecordTime1 = time;
-            codeRecord.RecordTime2 = time;
-            codeRecord.ProductCode = "扫码枪扫描";
-            codeRecord.BindingResult = "成功";
-            Thread.Sleep(10000);
-            RefreshCode2Event?.Invoke(codeRecord);
-            //   _codeBindingRecordServices.AddAsync(codeRecord);
-            //log.Info("条码1记录更新");
-        }
-
-        /// <summary>
-        /// 条码绑定,条码2处理
-        /// </summary>
-        /// <param name="materialType"></param>
-        private void receiveCode2(string code2)
-        {
-            log.Info("进入条码2处理函数receiveCode1,code2:" + code2);
-            // 1.刷新界面信息
-
-            // 2.数据库匹配条码1并绑定
-
-            CodeBindingRecord record = _codeBindingRecordServices.QueryByTime().Result;
-            record.ProductCode = code2;
-            record.RecordTime2 = System.DateTime.Now;
-
-            // 产品入库？
-
-
-            // 3.下发plc放行信号
-
-
-
-        }
-
-    }
-
-
-}

Aucma.Core.CodeBinding/Common/WindowManager.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam.Common
+namespace Aucma.Core.CodeBinding.Common
 {
     /// <summary>
     /// 窗口管理器

Aucma.Core.CodeBinding/ConvertTo/MultiBindingConverter.cs

@@ -1,5 +1,5 @@
 using Admin.Core.Model;
-using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.CodeBinding.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 
-namespace Aucma.Core.DoorFoam.ConvertTo
+namespace Aucma.Core.CodeBinding.ConvertTo
 {
     public class MultiBindingConverter : IMultiValueConverter
     {

Aucma.Core.CodeBinding/Filter/AutofacPropertityModuleReg.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam
+namespace Aucma.Core.CodeBinding
 {
     public class AutofacPropertityModuleReg : Autofac.Module
     {

Aucma.Core.CodeBinding/Models/DoorFoamRecordModel.cs

@@ -1,60 +0,0 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Aucma.Core.DoorFoam.Models
-{
-    public class DoorFoamRecordModel
-    {
-        /// <summary>
-        /// 计划编码
-        /// </summary>
-        public string? PlanCode { get; set; }
-
-        /// <summary>
-        /// 订单编码
-        /// </summary>
-        public string? OrderCode { get; set; }
-
-        /// <summary>
-        /// 物料编码
-        /// </summary>
-        public string? MaterialCode { get; set; }
-        /// <summary>
-        /// 物料名称
-        /// </summary>
-        public string? MaterialName { get; set; }
-
-        /// <summary>
-        /// 门体计划数
-        /// </summary>
-        public int PlanAmount { get; set; }
-
-        /// <summary>
-        /// 完成数
-        /// </summary>
-        public int CompleteAmount { get; set; }
-
-        /// <summary>
-        /// 开始时间
-        /// </summary>
-        public DateTime BeginTime { get; set; }
-
-        /// <summary>
-        /// 结束时间
-        /// </summary>
-        public DateTime EndTime { get; set; }
-
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreateTime { get; set; }
-        /// <summary>
-        /// 更新时间
-        /// </summary>
-        public DateTime UpdateTime { get; set; }
-    }
-}

Aucma.Core.CodeBinding/Models/MainModel.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam.Models
+namespace Aucma.Core.CodeBinding.Models
 {
     public class MainModel : ObservableObject
     {

Aucma.Core.CodeBinding/Models/MaterialComplateInfoModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam.Models
+namespace Aucma.Core.CodeBinding.Models
 {
     public class MaterialComplateInfo
     {

Aucma.Core.CodeBinding/Models/ReaderInfo.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam.Models
+namespace Aucma.Core.CodeBinding.Models
 {
     /// <summary>
     /// 执行计划

Aucma.Core.CodeBinding/Models/StatisticModel.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Aucma.Core.DoorFoam.Models
+namespace Aucma.Core.CodeBinding.Models
 {
     public class StatisticModel
     {

Aucma.Core.CodeBinding/Startup.cs

@@ -15,7 +15,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using System.Text;
 
-namespace Aucma.Core.DoorFoam
+namespace Aucma.Core.CodeBinding
 {
     /// <summary>
     /// Startup

Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs

@@ -2,7 +2,7 @@
 using System;
 using System.Collections.ObjectModel;
 using log4net;
-using Aucma.Core.DoorFoam.Common;
+using Aucma.Core.CodeBinding.Common;
 using LiveCharts;
 using System.Collections.Generic;
 using Admin.Core.Model;
@@ -13,7 +13,7 @@ using Microsoft.Extensions.DependencyInjection;
 using System.Threading.Tasks;
 using System.Windows.Controls;
 using System.Collections;
-using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.CodeBinding.Models;
 using System.Reflection.Emit;
 using NPOI.SS.Formula.Functions;
 using System.Threading;
@@ -22,27 +22,23 @@ using static Admin.Core.Service.CodeBindingRecordServices;
 using System.Windows.Data;
 using System.Windows;
 using System.Linq;
-using Aucma.Core.CodeBinding;
+using Aucma.Core.Scanner;
 /*
 * 首页信息
 */
-namespace Aucma.Core.DoorFoam.ViewModels
+namespace Aucma.Core.CodeBinding.ViewModels
 {
     public partial class IndexPageViewModel : ObservableObject
     {
         private static readonly log4net.ILog log = LogManager.GetLogger(typeof(IndexPageViewModel));
-        private readonly codeBindingBusiness _codeBindingBusiness;
-        private readonly IDoorFoamRecordServices? _doorFoamRecordServices;
         private readonly ICodeBindingRecordServices? _codeBindingRecordServices;
         public  IndexPageViewModel()
-        {
+        { 
             _codeBindingRecordServices = App.ServiceProvider.GetService<ICodeBindingRecordServices>();
-            _doorFoamRecordServices = App.ServiceProvider.GetService<IDoorFoamRecordServices>();
+            MvCodeHelper.ReceiveCode1Event += receiveCode1;
-            _codeBindingBusiness = new codeBindingBusiness(_codeBindingRecordServices);
+            MvCodeHelper.ReceiveCode2Event += receiveCode2;
             //  var list = _codeBindingRecordServices.FirstAsync().Result;
 
-            _codeBindingBusiness.RefreshCode1Event += RefreshCode1;
-            _codeBindingBusiness.RefreshCode2Event += RefreshCode2;
             LoadData();
             // 程序运行 5 秒后添加新数据项
             add();
@@ -117,7 +113,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
         /// <summary>
         /// 条码2扫描时间
         /// </summary>
-        private string code2Time;
+        private string code2Time = string.Empty;
         public string Code2Time
         {
             get { return code2Time; }
@@ -130,7 +126,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
         /// <summary>
         /// 绑定提示信息
         /// </summary>
-        private string bindingInfo;
+        private string bindingInfo = string.Empty;
         public string BindingInfo
         {
             get { return bindingInfo; }
@@ -189,5 +185,59 @@ namespace Aucma.Core.DoorFoam.ViewModels
            
         }
 
+        /// <summary>
+        /// 条码绑定,条码1处理
+        /// </summary>
+        /// <param name="materialType"></param>
+        private void receiveCode1(string code1)
+        {
+            log.Info("进入条码1处理函数receiveCode1,code1:" + code1);
+            DateTime time = System.DateTime.Now;
+            string strTime = time.ToString();
+            // 1.刷新界面条码信息
+            RefreshCode1(code1, strTime);
+            // 2.创建任务更新数据库条码1
+            CodeBindingRecord codeRecord = new CodeBindingRecord();
+            codeRecord.BoxCode = code1;
+            codeRecord.BoxName = "去数据库查询";
+            codeRecord.RecordTime1 = time;
+            codeRecord.RecordTime2 = time;
+            codeRecord.ProductCode = "扫码枪扫描";
+            codeRecord.BindingResult = "成功";
+            Thread.Sleep(10000);
+
+            //   _codeBindingRecordServices.AddAsync(codeRecord);
+            //log.Info("条码1记录更新");
+
+            RefreshCode2(codeRecord);
+        }
+
+        /// <summary>
+        /// 条码绑定,条码2处理
+        /// </summary>
+        /// <param name="materialType"></param>
+        private void receiveCode2(string code2)
+        {
+            log.Info("进入条码2处理函数receiveCode1,code2:" + code2);
+            // 1.刷新界面信息
+
+            // 2.数据库匹配条码1并绑定
+
+            CodeBindingRecord record = _codeBindingRecordServices.QueryByTime().Result;
+            record.ProductCode = code2;
+            record.RecordTime2 = System.DateTime.Now;
+
+            // 产品入库？
+
+
+            // 3.下发plc放行信号
+
+
+
+        }
+
+
+
+
     }
 }

Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs

@@ -1,4 +1,4 @@
-using Aucma.Core.DoorFoam.Views;
+using Aucma.Core.CodeBinding.Views;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using System.Windows;
@@ -8,7 +8,7 @@ using System.Diagnostics;
 using System.Threading;
 using NPOI.HSSF.Record;
 
-namespace Aucma.Core.DoorFoam.ViewModels
+namespace Aucma.Core.CodeBinding.ViewModels
 {
     public partial class MainWindowViewModel : ObservableObject
     {

Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs

@@ -1,7 +1,7 @@
 using Admin.Core.IService;
 using Admin.Core.Model;
 using Admin.Core.Service;
-using Aucma.Core.DoorFoam.Models;
+using Aucma.Core.CodeBinding.Models;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using log4net;
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Xml.Linq;
 
-namespace Aucma.Core.DoorFoam.ViewModels
+namespace Aucma.Core.CodeBinding.ViewModels
 {
     public partial class StatisticsPageViewModel : ObservableObject
     {

Aucma.Core.CodeBinding/Views/IndexPageView.xaml

@@ -1,10 +1,10 @@
-<UserControl x:Class="Aucma.Core.DoorFoam.Views.IndexPageView"
+<UserControl x:Class="Aucma.Core.CodeBinding.Views.IndexPageView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-             xmlns:local="clr-namespace:Aucma.Core.DoorFoam.Views"
+             xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views"
              mc:Ignorable="d"       
              d:DesignHeight="800"
              d:DesignWidth="1000" >

Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs

@@ -1,5 +1,6 @@
-using Aucma.Core.DoorFoam.Common;
+using Aucma.Core.CodeBinding.ViewModels;
-using Aucma.Core.DoorFoam.ViewModels;
+using Aucma.Core.CodeBinding.Common;
+using Aucma.Core.CodeBinding.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -15,7 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Aucma.Core.DoorFoam.Views
+namespace Aucma.Core.CodeBinding.Views
 {
     /// <summary>
     /// IndexPageView.xaml 的交互逻辑

Aucma.Core.CodeBinding/Views/MainWindow.xaml

@@ -1,4 +1,4 @@
-<Window x:Class="Aucma.Core.DoorFoam.Views.MainWindow"
+<Window x:Class="Aucma.Core.CodeBinding.Views.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs

@@ -1,7 +1,7 @@
-using Aucma.Core.DoorFoam.ViewModels;
+using Aucma.Core.CodeBinding.ViewModels;
 using System.Windows;
 
-namespace Aucma.Core.DoorFoam.Views
+namespace Aucma.Core.CodeBinding.Views
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml

@@ -1,11 +1,11 @@
-<UserControl x:Class="Aucma.Core.DoorFoam.Views.StatisticsPageView"
+<UserControl x:Class="Aucma.Core.CodeBinding.Views.StatisticsPageView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-             xmlns:local="clr-namespace:Aucma.Core.DoorFoam.Views"
+             xmlns:local="clr-namespace:Aucma.Core.CodeBinding.Views"
-             xmlns:cvt="clr-namespace:Aucma.Core.DoorFoam.ConvertTo"
+             xmlns:cvt="clr-namespace:Aucma.Core.CodeBinding.ConvertTo"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
 

Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml.cs

@@ -1,4 +1,4 @@
-using Aucma.Core.DoorFoam.ViewModels;
+using Aucma.Core.CodeBinding.ViewModels;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,7 +14,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 
-namespace Aucma.Core.DoorFoam.Views
+namespace Aucma.Core.CodeBinding.Views
 {
     /// <summary>
     /// StatisticsPageView.xaml 的交互逻辑

Aucma.Core.Scanner/Aucma.Core.Scanner.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Admin.Core.Common\Admin.Core.Common.csproj" />
+    <ProjectReference Include="..\Admin.Core.IService\Admin.Core.IService.csproj" />
   </ItemGroup>
 
   <ItemGroup>

Aucma.Core.Scanner/Helper/MvCodeHelper.cs

@@ -1,4 +1,6 @@
 using Admin.Core.Common;
+using Admin.Core.IService;
+using Admin.Core.Model;
 using log4net;
 using MvCodeReaderSDKNet;
 using System.Drawing;
@@ -6,20 +8,39 @@ using System.Drawing.Drawing2D;
 using System.Runtime.InteropServices;
 using System.Text;
 using UAParser;
+using static System.Runtime.CompilerServices.RuntimeHelpers;
 
 namespace Aucma.Core.Scanner
 {
     public  class MvCodeHelper
     {
+
+        #region 委托事件
+
+        #region 条码绑定上位机委托事件
+        /// <summary>
+        /// code1扫码信息刷新
+        /// </summary>
+        /// <param name="Code1"></param>
+        public  delegate void ReceiveCode1(string code1);
+        public static event ReceiveCode1? ReceiveCode1Event;
+        /// <summary>
+        /// code2扫码信息刷新,记录表更新
+        /// </summary>
+        /// <param name="Code1"></param>
+        public delegate void ReceiveCode2(string code2);
+        public static event ReceiveCode2? ReceiveCode2Event;
+        #endregion
+
+        #endregion
         private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MvCodeHelper));
         // 获取到的所有设备
        public static  MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST m_stDeviceList = new MvCodeReader.MV_CODEREADER_DEVICE_INFO_LIST();
        
        // 连接上的设备和其ip(string)集合
         public static Dictionary<MvCodeReader, string> m_cMyDevices = new Dictionary<MvCodeReader, string>();
-   
-
 
+     
         #region 设备连接状态
         /// <summary>
         /// 获取不到任务设备即连接失败
@@ -182,12 +203,12 @@ namespace Aucma.Core.Scanner
                                                 // 扫码器1，处理扫码器1的业务
                                                 if(hashmap.Value.Equals(Appsettings.app("Middleware", "Scanner1", "Ip")))
                                                 {
-
+                                                    ReceiveCode1Event?.Invoke(strCode);
                                                 }
                                                 else if(hashmap.Value.Equals(Appsettings.app("Middleware", "Scanner2", "Ip"))) 
                                                 {
                                                 // 扫码器2，处理扫码器2的业务
-
+                                                ReceiveCode2Event?.Invoke(strCode);
                                                 }
                                                 
                                             }

HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-eda65df6115a9c661b772861047e9f7f80c1aecb
+95cdaaa2c444f501e9d002195fedc8cf5dbf4f05

HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.FileListAbsolute.txt

@@ -65,3 +65,20 @@ E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.dll
 E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\refint\HwControlLib.dll
 E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.pdb
 E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\ref\HwControlLib.dll
+C:\Users\ADMIN\Desktop\main\HwControlLib\bin\Debug\net6.0-windows\HwControlLib.deps.json
+C:\Users\ADMIN\Desktop\main\HwControlLib\bin\Debug\net6.0-windows\HwControlLib.dll
+C:\Users\ADMIN\Desktop\main\HwControlLib\bin\Debug\net6.0-windows\HwControlLib.pdb
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.csproj.AssemblyReference.cache
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib_MarkupCompile.cache
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib_MarkupCompile.lref
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\Themes\Generic.baml
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.g.resources
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.GeneratedMSBuildEditorConfig.editorconfig
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.AssemblyInfoInputs.cache
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.AssemblyInfo.cs
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.csproj.CoreCompileInputs.cache
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.dll
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\refint\HwControlLib.dll
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\HwControlLib.pdb
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\ref\HwControlLib.dll

HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.cache

@@ -4,7 +4,7 @@
 library
 C#
 .cs
-E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\
 HwControlLib
 none
 false

HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref

@@ -1,4 +1,4 @@
-E:\c#\AUCMA\main\HwControlLib\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs
+C:\Users\ADMIN\Desktop\main\HwControlLib\obj\Debug\net6.0-windows\GeneratedInternalTypeHelper.g.cs
 
-FE:\c#\AUCMA\main\HwControlLib\Themes\Generic.xaml;;
+FC:\Users\ADMIN\Desktop\main\HwControlLib\Themes\Generic.xaml;;