diff --git a/Waste.Application/ResultInfos/ResultService.cs b/Waste.Application/ResultInfos/ResultService.cs index 803d54a..28d2fac 100644 --- a/Waste.Application/ResultInfos/ResultService.cs +++ b/Waste.Application/ResultInfos/ResultService.cs @@ -150,7 +150,10 @@ namespace Waste.Application it.Measure_Amount = ext?.Amount; it.Measure_OpUser = ext?.OpUser; it.Measure_UUID = ext?.UUID; - + if (string.IsNullOrWhiteSpace(it.Registration)) + { + it.Registration = ext?.Registration; + } it.ID1 = ext?.ID1; it.ID2 = ext?.ID2; it.ID3 = ext?.ID3; diff --git a/Waste.Core/Waste.Core.csproj b/Waste.Core/Waste.Core.csproj index 8633834..5bec2c4 100644 --- a/Waste.Core/Waste.Core.csproj +++ b/Waste.Core/Waste.Core.csproj @@ -18,6 +18,7 @@ + diff --git a/Waste.SocketService.cs/MyPackageFilter.cs b/Waste.SocketService.cs/MyPackageFilter.cs index 6b60551..137a3ab 100644 --- a/Waste.SocketService.cs/MyPackageFilter.cs +++ b/Waste.SocketService.cs/MyPackageFilter.cs @@ -512,7 +512,7 @@ namespace Waste.SocketService package.Price = measurearr[4]; package.Amount = measurearr[5]; package.OpUser = measurearr[6]; - package.DeviceFacEcode = measurearr[7]; + package.Registration = measurearr[7]; package.GrossWeight = measurearr[8]; package.Tare = measurearr[9]; package.ID1 = measurearr[10]; diff --git a/Waste.Web.Core/Startup.cs b/Waste.Web.Core/Startup.cs index 58cdb4a..78fcac5 100644 --- a/Waste.Web.Core/Startup.cs +++ b/Waste.Web.Core/Startup.cs @@ -50,6 +50,7 @@ namespace Waste.Web.Core //配置sqlserver支持 x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]); x.SucceedMessageExpiredAfter = 3600; + x.UseDashboard(); }); }