liuzl
/
Waste
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兼容Registration

This commit is contained in:
李鹏鹏 2024-12-26 09:34:25 +08:00
parent 8c05fe2a84
commit 83d37092ac
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Waste.Application/ResultInfos/ResultService.cs
View File

@ -150,7 +150,10 @@ namespace Waste.Application
it.Measure_Amount = ext?.Amount; it.Measure_Amount = ext?.Amount;
it.Measure_OpUser = ext?.OpUser; it.Measure_OpUser = ext?.OpUser;
it.Measure_UUID = ext?.UUID; it.Measure_UUID = ext?.UUID;
if (string.IsNullOrWhiteSpace(it.Registration))
{
it.Registration = ext?.Registration;
}
it.ID1 = ext?.ID1; it.ID1 = ext?.ID1;
it.ID2 = ext?.ID2; it.ID2 = ext?.ID2;
it.ID3 = ext?.ID3; it.ID3 = ext?.ID3;

1
Waste.Core/Waste.Core.csproj
View File

@ -18,6 +18,7 @@
<PackageReference Include="DotNetCore.CAP" Version="5.2.0" /> <PackageReference Include="DotNetCore.CAP" Version="5.2.0" />
<PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.2.0" /> <PackageReference Include="DotNetCore.CAP.RabbitMQ" Version="5.2.0" />
<PackageReference Include="DotNetCore.CAP.SqlServer" Version="5.2.0" /> <PackageReference Include="DotNetCore.CAP.SqlServer" Version="5.2.0" />
<PackageReference Include="DotNetCore.CAP.Dashboard" Version="5.2.0" />
<PackageReference Include="Furion" Version="2.20.6" /> <PackageReference Include="Furion" Version="2.20.6" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.20.6" /> <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="2.20.6" />
<PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.20.6" /> <PackageReference Include="Furion.Extras.DatabaseAccessor.SqlSugar" Version="2.20.6" />

2
Waste.SocketService.cs/MyPackageFilter.cs
View File

@ -512,7 +512,7 @@ namespace Waste.SocketService
package.Price = measurearr[4]; package.Price = measurearr[4];
package.Amount = measurearr[5]; package.Amount = measurearr[5];
package.OpUser = measurearr[6]; package.OpUser = measurearr[6];
package.DeviceFacEcode = measurearr[7]; package.Registration = measurearr[7];
package.GrossWeight = measurearr[8]; package.GrossWeight = measurearr[8];
package.Tare = measurearr[9]; package.Tare = measurearr[9];
package.ID1 = measurearr[10]; package.ID1 = measurearr[10];

1
Waste.Web.Core/Startup.cs
View File

@ -50,6 +50,7 @@ namespace Waste.Web.Core
//配置sqlserver支持 //配置sqlserver支持
x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]); x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]);
x.SucceedMessageExpiredAfter = 3600; x.SucceedMessageExpiredAfter = 3600;
x.UseDashboard();
}); });
} }