diff --git a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json b/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json index 99b50558..b85b9f7b 100644 --- a/Admin.Core.Api/obj/Admin.Core.Api.csproj.nuget.dgspec.json +++ b/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" } } } diff --git a/Admin.Core.Api/obj/project.assets.json b/Admin.Core.Api/obj/project.assets.json index 2110e5b2..1a625fd2 100644 --- a/Admin.Core.Api/obj/project.assets.json +++ b/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": { diff --git a/Admin.Core.Api/obj/project.nuget.cache b/Admin.Core.Api/obj/project.nuget.cache index 15648b94..e685b8d7 100644 --- a/Admin.Core.Api/obj/project.nuget.cache +++ b/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": [ diff --git a/Aucma.Core.CodeBinding/App.xaml b/Aucma.Core.CodeBinding/App.xaml index 2231afe3..232a0f2d 100644 --- a/Aucma.Core.CodeBinding/App.xaml +++ b/Aucma.Core.CodeBinding/App.xaml @@ -1,9 +1,9 @@ - diff --git a/Aucma.Core.CodeBinding/App.xaml.cs b/Aucma.Core.CodeBinding/App.xaml.cs index ae42893f..7dde0091 100644 --- a/Aucma.Core.CodeBinding/App.xaml.cs +++ b/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 { /// /// Interaction logic for App.xaml diff --git a/Aucma.Core.CodeBinding/Business/codeBindingBusiness.cs b/Aucma.Core.CodeBinding/Business/codeBindingBusiness.cs deleted file mode 100644 index 8cf7c9c0..00000000 --- a/Aucma.Core.CodeBinding/Business/codeBindingBusiness.cs +++ /dev/null @@ -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 -{ - /// - /// 条码绑定业务逻辑 - /// - public sealed class codeBindingBusiness - { - - #region 对象引用 - /// - /// 日志信息 - /// - /// - private static readonly log4net.ILog log = LogManager.GetLogger(typeof(CodeBindingRecordServices)); - - private ICodeBindingRecordServices? _codeBindingRecordServices; - #endregion - - #region 委托事件 - /// - /// code1扫码信息刷新 - /// - /// - public delegate void RefreshCode1(string Code1, string time); - public event RefreshCode1 RefreshCode1Event; - /// - /// code2扫码信息刷新,记录表更新 - /// - /// - 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(); - // _codeBindingRecordServices.FirstAsync(); - //}); - - //Task.Run(() => - //{ - // Thread.Sleep(1000); - // receiveCode1("11335577"); - //}); - - - } - - /// - /// 条码绑定,条码1处理 - /// - /// - 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记录更新"); - } - - /// - /// 条码绑定,条码2处理 - /// - /// - 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放行信号 - - - - } - - } - - -} diff --git a/Aucma.Core.CodeBinding/Common/WindowManager.cs b/Aucma.Core.CodeBinding/Common/WindowManager.cs index 9d18d4f4..d1518c8b 100644 --- a/Aucma.Core.CodeBinding/Common/WindowManager.cs +++ b/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 { /// /// 窗口管理器 diff --git a/Aucma.Core.CodeBinding/ConvertTo/MultiBindingConverter.cs b/Aucma.Core.CodeBinding/ConvertTo/MultiBindingConverter.cs index 95a4712b..628782b8 100644 --- a/Aucma.Core.CodeBinding/ConvertTo/MultiBindingConverter.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Filter/AutofacPropertityModuleReg.cs b/Aucma.Core.CodeBinding/Filter/AutofacPropertityModuleReg.cs index 980d49f0..5f924e50 100644 --- a/Aucma.Core.CodeBinding/Filter/AutofacPropertityModuleReg.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Models/DoorFoamRecordModel.cs b/Aucma.Core.CodeBinding/Models/DoorFoamRecordModel.cs deleted file mode 100644 index 461afc17..00000000 --- a/Aucma.Core.CodeBinding/Models/DoorFoamRecordModel.cs +++ /dev/null @@ -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 - { - /// - /// 计划编码 - /// - public string? PlanCode { get; set; } - - /// - /// 订单编码 - /// - public string? OrderCode { get; set; } - - /// - /// 物料编码 - /// - public string? MaterialCode { get; set; } - /// - /// 物料名称 - /// - public string? MaterialName { get; set; } - - /// - /// 门体计划数 - /// - public int PlanAmount { get; set; } - - /// - /// 完成数 - /// - public int CompleteAmount { get; set; } - - /// - /// 开始时间 - /// - public DateTime BeginTime { get; set; } - - /// - /// 结束时间 - /// - public DateTime EndTime { get; set; } - - /// - /// 创建时间 - /// - public DateTime CreateTime { get; set; } - /// - /// 更新时间 - /// - public DateTime UpdateTime { get; set; } - } -} diff --git a/Aucma.Core.CodeBinding/Models/MainModel.cs b/Aucma.Core.CodeBinding/Models/MainModel.cs index 29f9f50c..1d5106d2 100644 --- a/Aucma.Core.CodeBinding/Models/MainModel.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Models/MaterialComplateInfoModel.cs b/Aucma.Core.CodeBinding/Models/MaterialComplateInfoModel.cs index fbc7029c..d82ca61b 100644 --- a/Aucma.Core.CodeBinding/Models/MaterialComplateInfoModel.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Models/ReaderInfo.cs b/Aucma.Core.CodeBinding/Models/ReaderInfo.cs index 856732b5..daab4f3f 100644 --- a/Aucma.Core.CodeBinding/Models/ReaderInfo.cs +++ b/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 { /// /// 执行计划 diff --git a/Aucma.Core.CodeBinding/Models/StatisticModel.cs b/Aucma.Core.CodeBinding/Models/StatisticModel.cs index 463a3cb8..2189cc06 100644 --- a/Aucma.Core.CodeBinding/Models/StatisticModel.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Startup.cs b/Aucma.Core.CodeBinding/Startup.cs index 2bddc79a..997c911d 100644 --- a/Aucma.Core.CodeBinding/Startup.cs +++ b/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 { /// /// Startup diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs index c1bc4188..a782280e 100644 --- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs +++ b/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(); - _doorFoamRecordServices = App.ServiceProvider.GetService(); - _codeBindingBusiness = new codeBindingBusiness(_codeBindingRecordServices); + MvCodeHelper.ReceiveCode1Event += receiveCode1; + 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 /// /// 条码2扫描时间 /// - private string code2Time; + private string code2Time = string.Empty; public string Code2Time { get { return code2Time; } @@ -130,7 +126,7 @@ namespace Aucma.Core.DoorFoam.ViewModels /// /// 绑定提示信息 /// - private string bindingInfo; + private string bindingInfo = string.Empty; public string BindingInfo { get { return bindingInfo; } @@ -189,5 +185,59 @@ namespace Aucma.Core.DoorFoam.ViewModels } + /// + /// 条码绑定,条码1处理 + /// + /// + 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); + } + + /// + /// 条码绑定,条码2处理 + /// + /// + 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放行信号 + + + + } + + + + } } diff --git a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs index 680ce715..c231d271 100644 --- a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs index b51fdb4d..0a798077 100644 --- a/Aucma.Core.CodeBinding/ViewModels/StatisticsPageViewModel.cs +++ b/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 { diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml index 26a58fbb..9bba68b2 100644 --- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml +++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml @@ -1,10 +1,10 @@ - diff --git a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs index 8f72d738..b07a5169 100644 --- a/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs +++ b/Aucma.Core.CodeBinding/Views/IndexPageView.xaml.cs @@ -1,5 +1,6 @@ -using Aucma.Core.DoorFoam.Common; -using Aucma.Core.DoorFoam.ViewModels; +using Aucma.Core.CodeBinding.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 { /// /// IndexPageView.xaml 的交互逻辑 diff --git a/Aucma.Core.CodeBinding/Views/MainWindow.xaml b/Aucma.Core.CodeBinding/Views/MainWindow.xaml index b13c25d2..4f7899ac 100644 --- a/Aucma.Core.CodeBinding/Views/MainWindow.xaml +++ b/Aucma.Core.CodeBinding/Views/MainWindow.xaml @@ -1,4 +1,4 @@ - /// Interaction logic for MainWindow.xaml diff --git a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml index e6bdf8f3..2f87b347 100644 --- a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml +++ b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml @@ -1,11 +1,11 @@ - diff --git a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml.cs b/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml.cs index 209323ce..081676d3 100644 --- a/Aucma.Core.CodeBinding/Views/StatisticsPageView.xaml.cs +++ b/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 { /// /// StatisticsPageView.xaml 的交互逻辑 diff --git a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache index 47420103..3a4d4f93 100644 Binary files a/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache and b/Aucma.Core.PrintTo/obj/Debug/net6.0-windows/Aucma.Core.PrintTo.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.Scanner/Aucma.Core.Scanner.csproj b/Aucma.Core.Scanner/Aucma.Core.Scanner.csproj index 31db9885..86e7b145 100644 --- a/Aucma.Core.Scanner/Aucma.Core.Scanner.csproj +++ b/Aucma.Core.Scanner/Aucma.Core.Scanner.csproj @@ -12,6 +12,7 @@ + diff --git a/Aucma.Core.Scanner/Helper/MvCodeHelper.cs b/Aucma.Core.Scanner/Helper/MvCodeHelper.cs index 7fd9917c..cbfd36ba 100644 --- a/Aucma.Core.Scanner/Helper/MvCodeHelper.cs +++ b/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 条码绑定上位机委托事件 + /// + /// code1扫码信息刷新 + /// + /// + public delegate void ReceiveCode1(string code1); + public static event ReceiveCode1? ReceiveCode1Event; + /// + /// code2扫码信息刷新,记录表更新 + /// + /// + 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 m_cMyDevices = new Dictionary(); - - + #region 设备连接状态 /// /// 获取不到任务设备即连接失败 @@ -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); } } diff --git a/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache b/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache index 8d2d598d..884adabf 100644 Binary files a/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache and b/Aucma.Core.Scanner/obj/Debug/net6.0/Aucma.Core.Scanner.csproj.AssemblyReference.cache differ diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll index e0527b04..875de423 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.dll differ diff --git a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb index 6e5a8f40..1ca8faab 100644 Binary files a/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/bin/Debug/net6.0-windows/HwControlLib.pdb differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.CoreCompileInputs.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.CoreCompileInputs.cache index 80b4bff6..8aa2af83 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.CoreCompileInputs.cache +++ b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -eda65df6115a9c661b772861047e9f7f80c1aecb +95cdaaa2c444f501e9d002195fedc8cf5dbf4f05 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.FileListAbsolute.txt b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.FileListAbsolute.txt index b5ecdf19..8a961822 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.csproj.FileListAbsolute.txt +++ b/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 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll index e0527b04..875de423 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.dll differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb index 6e5a8f40..1ca8faab 100644 Binary files a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb and b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib.pdb differ diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.cache b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.cache index 9594d35f..5b710c74 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.cache +++ b/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 diff --git a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref b/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref index 915d80ec..a0af3bad 100644 --- a/HwControlLib/obj/Debug/net6.0-windows/HwControlLib_MarkupCompile.lref +++ b/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;;