From 6dff4bb3bb34f5e8e59aac0812d54a53ee272aba Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 15 Jan 2024 12:03:17 +0800
Subject: [PATCH] .

---
 Aucma.Core.CodeBinding/Startup.cs       | 8 +++++++-
 Aucma.Core.CodeBinding/appsettings.json | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Aucma.Core.CodeBinding/Startup.cs b/Aucma.Core.CodeBinding/Startup.cs
index 7d817c66..16fb79cb 100644
--- a/Aucma.Core.CodeBinding/Startup.cs
+++ b/Aucma.Core.CodeBinding/Startup.cs
@@ -9,6 +9,7 @@ using Admin.Core.Service;
 using Admin.Core.Tasks;
 using Aucma.Core.RunPlc;
 using Aucma.Core.Scanner;
+using Aucma.Core.ScannerGun;
 using Autofac;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -64,6 +65,8 @@ namespace Aucma.Core.CodeBinding
 
             //扫码器
             services.AddScannerSetup();
+            // 扫码枪
+            services.AddScannerGunSetup();
 
             //任务调度
             services.AddJobSetup();
@@ -89,7 +92,7 @@ namespace Aucma.Core.CodeBinding
         /// </summary>
         /// <param name="app"></param>
         /// <param name="env"></param>
-        public void Configure(IApplicationBuilder app, IScannerService scannerService, IRunPlcService runPlcService, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter)    // ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
+        public void Configure(IApplicationBuilder app, IScannerService scannerService, IScannerGunService scannerGunService, IRunPlcService runPlcService, ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter)    // ISysTasksQzService tasksQzService, ISchedulerCenter schedulerCenter
         {
             // 使用静态文件
             app.UseStaticFiles();
@@ -97,6 +100,9 @@ namespace Aucma.Core.CodeBinding
             //app.UseAuthorization();
             //开启扫码服务
             app.UseScannerMildd(scannerService);
+            //开启扫码枪服务
+            app.UseScannerGunMildd(scannerGunService);
+
             // 开启QuartzNetJob调度服务
             app.UseQuartzJobMildd(tasksQzService, schedulerCenter);
             //PLC
diff --git a/Aucma.Core.CodeBinding/appsettings.json b/Aucma.Core.CodeBinding/appsettings.json
index b24f0fcc..1aa44dbc 100644
--- a/Aucma.Core.CodeBinding/appsettings.json
+++ b/Aucma.Core.CodeBinding/appsettings.json
@@ -201,7 +201,7 @@
       "Name": "鎵爜鍣�2"
     },
     "ScannerGun": { //鎵爜鏋�
-      "Enabled": false
+      "Enabled": true
     }
   },
   "PLCServer": [