diff --git a/Admin.Core.Extensions/Middlewares/TouchSocketMildd.cs b/Admin.Core.Extensions/Middlewares/TouchSocketMildd.cs index 0d73b1c0..23c4d522 100644 --- a/Admin.Core.Extensions/Middlewares/TouchSocketMildd.cs +++ b/Admin.Core.Extensions/Middlewares/TouchSocketMildd.cs @@ -30,7 +30,7 @@ namespace Admin.Core.Extensions catch (Exception e) { log.Error($"An error was reported when starting the job service.\n{e.Message}"); - throw; + //throw; } } } diff --git a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs index 1f7bcabf..20334bc5 100644 --- a/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.CodeBinding/ViewModels/MainWindowViewModel.cs @@ -59,12 +59,15 @@ namespace Aucma.Core.CodeBinding.ViewModels timer.Interval = TimeSpan.FromSeconds(1); timer.Tick += Timer_Tick; timer.Start(); - + Scanner1State(false); + Scanner2State(false); // Job_AllState_Quartz.RefreshStateEvent += RefreshStatus; // MvCodeHelper.RefreshStateEvent += RefreshScanner; TouchSocketService.RefreshStateEvent += RefreshScanner; - // InitHikRobot(); + GunBusiness.InstanceSerialPort3(); + + // InitHikRobot(); } #region 开启海康扫码器 @@ -103,7 +106,6 @@ namespace Aucma.Core.CodeBinding.ViewModels - GunBusiness.InstanceSerialPort3(); Business.MvCodeHelper.Liner(); }); @@ -126,7 +128,7 @@ namespace Aucma.Core.CodeBinding.ViewModels if (ip == SnScannerIp) { - Scanner1State(flag); ; + Scanner1State(flag); } else if (ip == MesScannerIp) { diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json index 6b55e0bf..45595cba 100644 --- a/Aucma.Core.CodeBinding/appsettings.json +++ b/Aucma.Core.CodeBinding/appsettings.json @@ -197,7 +197,7 @@ }, "TouchSocket": { "Enabled": true, - "Address": "10.10.92.123:5000" + "Address": "10.10.92.139:5000" } }, "ScannerServer": [