1.修改8.0兼容

apps/Syc.Basic.Web.WMS.HttpApi.Host/Syc.Basic.Web.WMS.HttpApi.Host.csproj

@@ -12,10 +12,10 @@
   <ItemGroup>
 	  <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
 	  <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.2.4" />
+	  <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
-    <PackageReference Include="Volo.Abp.Autofac" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Autofac" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Swashbuckle" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
@@ -33,6 +33,8 @@
     <ProjectReference Include="..\..\services\Syc.Basic.Web.WMS.Application\Syc.Basic.Web.WMS.Application.csproj" />
     <ProjectReference Include="..\..\services\Syc.Basic.Web.WMS.EntityFrameworkCore\Syc.Basic.Web.WMS.EntityFrameworkCore.csproj" />
     <ProjectReference Include="..\..\services\Syc.Basic.Web.WMS.HttpApi\Syc.Basic.Web.WMS.HttpApi.csproj" />
+    <ProjectReference Include="..\..\share\Seyounth.Auto.Hs.Runtime\Seyounth.Auto.Hs.Runtime.csproj" />
+    <ProjectReference Include="..\..\share\Seyounth.Auto.Plc\Seyounth.Auto.Plc.csproj" />
   </ItemGroup>
 
   <ItemGroup>

apps/Syc.Basic.Web.WMS.HttpApi.Host/WMSHttpApiHostModule.cs

@@ -115,6 +115,30 @@ public class WMSHttpApiHostModule : AbpModule
                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "WMS API", Version = "v1" });
                 options.DocInclusionPredicate((docName, description) => true);
                 options.CustomSchemaIds(type => type.FullName);
+                options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme()
+                {
+                    Description = "请输入带有Bearer的Token，形如 “Bearer {Token}” ",
+                    Name = "Authorization",
+                    In = ParameterLocation.Header,
+                    Scheme = "Bearer",
+                     BearerFormat = "JWT",
+                       Reference = new OpenApiReference() 
+                       {
+                            Id = "Bearer",
+                             Type =  ReferenceType.SecurityScheme
+                       },
+                    Type = SecuritySchemeType.ApiKey
+                });
+                options.AddSecurityRequirement(new OpenApiSecurityRequirement
+              {
+                    {
+                        new OpenApiSecurityScheme
+                        {
+                            Reference = new OpenApiReference { Type = ReferenceType.SecurityScheme, Id = "Bearer" }
+                        },
+                        new[] { "readAccess", "writeAccess" }
+                    }
+              });
                 var basePath = Path.GetDirectoryName(typeof(Program).Assembly.Location);//获取应用程序所在目录（绝对，不受工作目录影响，建议采用此方法获取路径）
                 var xmlPath = Path.Combine(basePath, "Syc.Basic.Web.WMS.Application.xml");   //  添加 swagger xml 注释  这个xml文件开始是不存在的写上项目名.xml即可
             });

apps/Syc.Basic.Web.WMS.HttpApi.Host/appsettings.json

@@ -58,5 +58,33 @@
   "Redis": {
     "IsEnabled": true,
     "Configuration": "127.0.0.1:6379,defaultDatabase=0"
+  },
+  "Scanner": [
+    {
+      //人工扫纱扫码枪
+      "Id": 1,
+      "IP": "127.0.0.1",
+      "Port": 3306
+    },
+    {
+      //料箱扫码枪
+      "Id": 2,
+      "IP": "127.0.0.1",
+      "Port": 3307
     }
+  ],
+  "Balance": [
+    {
+      //装箱前电子秤
+      "Id": 1,
+      "IP": "127.0.0.1",
+      "Port":4306
+    },
+    {
+      //装箱后电子秤
+      "Id": 2,
+      "IP": "127.0.0.1",
+      "Port": 4306
+    }
+  ]
 }

services/Syc.Basic.Web.WMS.Application.Contracts/Syc.Basic.Web.WMS.Application.Contracts.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.ObjectExtending" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.ObjectExtending" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

services/Syc.Basic.Web.WMS.Application/Dto/BoxDto.cs

@@ -9,14 +9,14 @@ namespace Syc.Basic.Web.WMS.Dto
     public class BoxDto
     {
         public int Id { get; set; }
-        public string Name { get; set; }
+        public string? Name { get; set; }
-        public string Code { get; set; }
+        public string? Code { get; set; }
-        public string Spec { get; set; }
+        public string? Spec { get; set; }
-        public int Qty { get; set; }
+        public int? Qty { get; set; }
-        public double Net_Weight { get; set; }
+        public double? Net_Weight { get; set; }
-        public string Lot_No { get; set; }
+        public string? Lot_No { get; set; }
-        public double Length { get; set; }
+        public double? Length { get; set; }
-        public DateTime Dom_Time { get; set; }
+        public DateTime? Dom_Time { get; set; }
-        public DateTime Exp_Time { get; set; }
+        public DateTime? Exp_Time { get; set; }
     }
 }

services/Syc.Basic.Web.WMS.Application/Dto/SilkDto.cs

@@ -9,12 +9,12 @@ namespace Syc.Basic.Web.WMS.Dto
     public class SilkDto
     {
         public int Id { get; set; }
-        public string Code { get; set; }
+        public string? Code { get; set; }
-        public string Type { get; set; }
+        public string? Type { get; set; }
-        public string Spec { get; set; }
+        public string? Spec { get; set; }
-        public double Net_Weight { get; set; }
+        public double? Net_Weight { get; set; }
-        public double Length { get; set; }
+        public double? Length { get; set; }
-        public DateTime Date { get; set; }
+        public DateTime? Date { get; set; }
-        public string Lot_No { get; set; }
+        public string? Lot_No { get; set; }
     }
 }

services/Syc.Basic.Web.WMS.Application/Mapper/SystemMapper.cs

@@ -24,13 +24,13 @@ namespace Syc.Basic.Web.Mapper
                 .ForMember(dest => dest.Createtime,opt => opt.MapFrom(m => m.createdAt))
                 .ReverseMap();
 
-            CreateMap<Silk, SilkDto>();
+            //CreateMap<Silk, SilkDto>();
-            CreateMap<SilkDto, Silk>();
+            //CreateMap<SilkDto, Silk>();
 
-            CreateMap<Box, BoxDto>()
+            //CreateMap<Box, BoxDto>()
-                 .ForMember(dest => dest.Net_Weight, opt => opt.MapFrom(m => m.Net_Weight))
+            //     .ForMember(dest => dest.Net_Weight, opt => opt.MapFrom(m => m.Net_Weight))
-                 .ForMember(dest => dest.Length, opt => opt.MapFrom(m => m.Length))
+            //     .ForMember(dest => dest.Length, opt => opt.MapFrom(m => m.Length))
-                .ReverseMap();
+            //    .ReverseMap();
             //CreateMap<BoxDto, Box>();
         }
     }

services/Syc.Basic.Web.WMS.Application/Service/TcpService.cs

@@ -21,7 +21,8 @@ namespace Syc.Basic.Web.WMS.Service
         private readonly ILogger<TcpService> logger;
         private readonly IScannerService scannerService;
 
-        public TcpService(IScannerService ScannerService, IPrinterService PrinterService, IBalanceService BalanceService, IRepository<Silk> SilkRepository, ILogger<TcpService> Logger)
+        public TcpService(IScannerService ScannerService, IPrinterService PrinterService, IBalanceService BalanceService, IRepository<Silk> SilkRepository, ILogger<TcpService> Logger,
+            IScanner boxScanner)
         {
             scannerService = ScannerService;
             printerService = PrinterService;

services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.csproj

@@ -12,8 +12,8 @@
   <ItemGroup>
 	  <PackageReference Include="DotNetCore.CAP" Version="8.2.0" />
 	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageReference Include="Volo.Abp.AutoMapper" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.AutoMapper" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

services/Syc.Basic.Web.WMS.Application/Syc.Basic.Web.WMS.Application.xml

@@ -106,6 +106,45 @@
             <param name="input"></param>
             <returns></returns>
         </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.Profile">
+            <summary>
+            个人信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.UpdateStatus(Syc.Basic.Web.WMS.Dtos.User.UpdateUserStatInput)">
+            <summary>
+            更改用户状态
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.CurrentUserInfo">
+            <summary>
+            获取用户信息
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.SearchUserAsync(Syc.Basic.Web.WMS.Dtos.User.SearchUserInput)">
+            <summary>
+            用户搜索
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.GetByIdAsync(System.Collections.Generic.List{System.Int32})">
+            <summary>
+            根据 id 获取用户信息
+            </summary>
+            <param name="ids"></param>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
+        <member name="M:Syc.Basic.Web.WMS.Service.UserAppService.GetUserPosition">
+            <summary>
+            获取用户职位
+            </summary>
+            <returns></returns>
+            <exception cref="T:System.NotImplementedException"></exception>
+        </member>
         <member name="T:Syc.Basic.Web.Service.MenuService">
             <summary>
             菜单服务

services/Syc.Basic.Web.WMS.Domain.Shared/Syc.Basic.Web.WMS.Domain.Shared.csproj

@@ -14,9 +14,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Localization" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Localization" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Localization.Abstractions" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Localization.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Validation" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Validation" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

services/Syc.Basic.Web.WMS.Domain/Entitys/Box.cs

@@ -9,14 +9,14 @@ namespace Syc.Basic.Web.WMS.Entitys
 {
     public class Box:Entity<int>
     {
-        public string Name { get; set; }
+        public string? Name { get; set; }
-        public string Code { get; set; }
+        public string? Code { get; set; }
-        public string Spec { get; set; }
+        public string? Spec { get; set; }
-        public int Qty { get; set; }
+        public int? Qty { get; set; }
-        public double Net_Weight { get; set; }
+        public double? Net_Weight { get; set; }
-        public string Lot_No { get; set; }
+        public string? Lot_No { get; set; }
-        public double Length { get; set; }
+        public double? Length { get; set; }
-        public DateTime Dom_Time { get; set; }
+        public DateTime? Dom_Time { get; set; }
-        public DateTime Exp_Time { get; set; }
+        public DateTime? Exp_Time { get; set; }
     }
 }

services/Syc.Basic.Web.WMS.Domain/Entitys/Silk.cs

@@ -9,12 +9,12 @@ namespace Syc.Basic.Web.WMS.Entitys
 {
     public class Silk:Entity<int>
     {
-        public string Code { get; set; }
+        public string? Code { get; set; }
-        public string Type { get; set; }
+        public string? Type { get; set; }
-        public string Spec { get; set; }
+        public string? Spec { get; set; }
-        public double Net_Weight { get; set; }
+        public double? Net_Weight { get; set; }
-        public double Length { get; set; }
+        public double? Length { get; set; }
-        public DateTime Date { get; set; }
+        public DateTime? Date { get; set; }
-        public string Lot_No { get; set; }
+        public string? Lot_No { get; set; }
     }
 }

services/Syc.Basic.Web.WMS.Domain/Syc.Basic.Web.WMS.Domain.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="6.0.0" />
+		<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

services/Syc.Basic.Web.WMS.EntityFrameworkCore/Syc.Basic.Web.WMS.EntityFrameworkCore.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="8.0" />
   </ItemGroup>
 
   <ItemGroup>

services/Syc.Basic.Web.WMS.HttpApi.Client/Syc.Basic.Web.WMS.HttpApi.Client.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Http.Client" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Http.Client" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

services/Syc.Basic.Web.WMS.HttpApi/Syc.Basic.Web.WMS.HttpApi.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
 	  <!--<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />-->
-    <PackageReference Include="Volo.Abp.Core" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Core" Version="8.0.0" />
-	  <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="8.0.0" />
 	  <!--<PackageReference Include="Volo.Abp.UI" Version="6.0.0" />-->
   </ItemGroup>
 

share/Seyounth.Auto.Hs.Runtime/HsExtensions.cs

@@ -28,6 +28,8 @@ public static class HsExtensions
         services.AddSingleton<IPrinterService, PrinterService>();
         services.AddSingleton<IScannerService, ScannerService>();
         services.AddSingleton<IHsAutoRuntime, HsAutoRuntime>();
+        services.AddSingleton<IScanner,YarnScanner>();
+        services.AddSingleton<IScanner,BoxScanner>();
         #region 接口调试阶段先注释
         //services.AddHostedService<PlcBackgroundService>();
         // services.AddHostedService<HsBackgroundService>();

share/Seyounth.Auto.Hs.Runtime/Scanner/ScannerService.cs

@@ -4,12 +4,11 @@ namespace Seyounth.Auto.Hs.Runtime.Scanner;
 
 public class ScannerService : IScannerService
 {
-    public ScannerService(ILogger<ScannerService> logger)
+    public ScannerService(ILogger<ScannerService> logger,IEnumerable<IScanner> scanners)
     {
         _logger = logger;
+        _scanners.AddRange(scanners);
         //todo:向_scanners里添加HikScanner
-
-        _scanners.ForEach(x => x.OnScanned += (barcode) => OnScanned?.Invoke(x, barcode));
     }
 
     public IReadOnlyList<IScanner> Scanners => _scanners;

share/Seyounth.Auto.Hs.Runtime/Seyounth.Auto.Hs.Runtime.csproj

@@ -8,6 +8,8 @@
 
     <ItemGroup>
       <PackageReference Include="MediatR" Version="12.5.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.5" />
       <PackageReference Include="Seyounth.Extensions.Plc" Version="1.0.1" />
     </ItemGroup>

share/Syc.Abp.Application.Contracts/Syc.Abp.Application.Contracts.csproj

@@ -11,8 +11,8 @@
 	</ItemGroup>
   <ItemGroup>
 	  <PackageReference Include="Syc.Core.Tools" Version="1.0.0" />
-    <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Core" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Core" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

share/Syc.Abp.Application.Contracts/SycAbpContractsModule.cs

@@ -21,7 +21,6 @@ using Volo.Abp.AspNetCore.Mvc.Conventions;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
 using Volo.Abp.AspNetCore.Mvc.Validation;
 using Volo.Abp.Json;
-using Volo.Abp.Json.Newtonsoft;
 using Volo.Abp.Json.SystemTextJson.JsonConverters;
 using Volo.Abp.Modularity;
 

share/Syc.Abp.Caching/Syc.Abp.Caching.csproj

@@ -7,7 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="6.0.0" />
+	  <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	  <PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

share/Syc.Abp.Domain/Syc.Abp.Domain.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
 	  <PackageReference Include="Syc.Core.Tools" Version="1.0.0" />
-    <PackageReference Include="Volo.Abp.Core" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Core" Version="8.0.0" />
-    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
+	  <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.0" />
   </ItemGroup>
 
 </Project>

share/Syc.Abp.HttpApi.Client/Syc.Abp.HttpApi.Client.csproj

@@ -7,10 +7,7 @@
   </PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.31" />
-		<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+		<PackageReference Include="Volo.Abp.Core" Version="8.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.8" />
-		<PackageReference Include="Volo.Abp.Http.Client" Version="6.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Syc.Abp.Application.Contracts\Syc.Abp.Application.Contracts.csproj" />