Browse Source

1.22.0706.1

master
贾荣国 2 years ago
parent
commit
f16713e320
  1. 2
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs
  2. 6
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj
  3. 2
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json
  4. 7
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs
  5. 2
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs
  6. 2
      WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs
  7. 3015
      WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220706092617_test.Designer.cs
  8. 24
      WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220706092617_test.cs
  9. 4
      WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/WebApiDbContextModelSnapshot.cs
  10. 4
      WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Win_in.Sfs.Scp.WebApi.HttpApi.Host.csproj

2
WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs

@ -180,7 +180,7 @@ namespace Win_in.Sfs.Scp.WebApi
asnMstr.Details.Add(det); asnMstr.Details.Add(det);
} }
var jsonString = JsonSerializer.Serialize(asnMstr); var jsonString = JsonSerializer.Serialize(asnMstr);
var ediString = asnMstr.ToString(); var ediString = jsonString;
var asnX12 = new X12Asn(asn.Id, asn.Site, asn.AsnBillNum, ScpWebApiConsts.NO_PO_ASN, jsonString, ediString, var asnX12 = new X12Asn(asn.Id, asn.Site, asn.AsnBillNum, ScpWebApiConsts.NO_PO_ASN, jsonString, ediString,
asn.ShipTime ?? DateTime.Today); asn.ShipTime ?? DateTime.Today);
return asnX12; return asnX12;

6
WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj

@ -3,8 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyVersion>1.22.0621.1</AssemblyVersion> <AssemblyVersion>1.22.0706.1</AssemblyVersion>
<FileVersion>1.22.0621.1</FileVersion> <FileVersion>1.22.0706.1</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -38,5 +38,7 @@
<ProjectReference Include="..\Win_in.Sfs.Scp.WebApi.EntityFrameworkCore\Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj" /> <ProjectReference Include="..\Win_in.Sfs.Scp.WebApi.EntityFrameworkCore\Win_in.Sfs.Scp.WebApi.EntityFrameworkCore.csproj" />
</ItemGroup> </ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
</Project> </Project>

2
WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json

@ -50,7 +50,7 @@
"Active": true, "Active": true,
"PeriodSeconds": 10, "PeriodSeconds": 10,
"RetryTimes": 3, "RetryTimes": 3,
"BatchSize": 10, "BatchSize": 20,
"MaxCount": 100, "MaxCount": 100,
"Sites": [ "Sites": [
{ {

7
WebApiService/src/Win_in.Sfs.Scp.WebApi.Application/Asns/X12AsnAppService.cs

@ -121,6 +121,13 @@ namespace Win_in.Sfs.Scp.WebApi
} }
/// <summary>
/// 获取未读无POASN列表(Get unread Asn listwithout PO)
/// </summary>
/// <param name="site">地点(Site)</param>
/// <param name="count">数量(Count)</param>
/// <param name="autoUpdateStatus">是否自动更新状态(Auto update data status to finish)</param>
/// <returns></returns>
[HttpGet] [HttpGet]
[Route("nopo-unread-list")] [Route("nopo-unread-list")]
public async Task<ListResultDto<X12AsnDTO>> GetNoPoUnreadListAsync(string site, int count, bool autoUpdateStatus) public async Task<ListResultDto<X12AsnDTO>> GetNoPoUnreadListAsync(string site, int count, bool autoUpdateStatus)

2
WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnDet.cs

@ -6,7 +6,7 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary> /// <summary>
/// QAD发货单明细(ASN detail) SupplierAsnDetailInput /// QAD发货单明细(ASN detail) SupplierAsnDetailInput
/// </summary> /// </summary>
public class AsnDet : CreationAuditedEntity<Guid> public class AsnDet
{ {
/// <summary> /// <summary>
/// 自增长数字主键 /// 自增长数字主键

2
WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/NoPoASN/AsnMstr.cs

@ -7,7 +7,7 @@ namespace Win_in.Sfs.Scp.WebApi
/// <summary> /// <summary>
/// QAD发货单主表(ASN Master) SupplierAsnCreateInput ISupplierAsnAppService /// QAD发货单主表(ASN Master) SupplierAsnCreateInput ISupplierAsnAppService
/// </summary> /// </summary>
public class AsnMstr : EntityBase<Guid> public class AsnMstr
{ {
/// <summary> /// <summary>
/// 自增长数字主键 /// 自增长数字主键

3015
WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220706092617_test.Designer.cs

File diff suppressed because it is too large

24
WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/20220706092617_test.cs

@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace Win_in.Sfs.Scp.WebApi.Migrations
{
public partial class test : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "QLevel",
table: "WebApi_Part",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "QLevel",
table: "WebApi_Part");
}
}
}

4
WebApiService/src/Win_in.Sfs.Scp.WebApi.EntityFrameworkCore/Migrations/WebApiDbContextModelSnapshot.cs

@ -2103,6 +2103,10 @@ namespace Win_in.Sfs.Scp.WebApi.Migrations
.HasMaxLength(64) .HasMaxLength(64)
.HasColumnType("nvarchar(64)"); .HasColumnType("nvarchar(64)");
b.Property<string>("QLevel")
.HasMaxLength(64)
.HasColumnType("nvarchar(64)");
b.Property<string>("Site") b.Property<string>("Site")
.IsRequired() .IsRequired()
.HasMaxLength(64) .HasMaxLength(64)

4
WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/Win_in.Sfs.Scp.WebApi.HttpApi.Host.csproj

@ -7,8 +7,8 @@
<RootNamespace>Win_in.Sfs.Scp.WebApi</RootNamespace> <RootNamespace>Win_in.Sfs.Scp.WebApi</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Win_in.Sfs.Scp.WebApi-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId> <UserSecretsId>Win_in.Sfs.Scp.WebApi-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
<AssemblyVersion>1.22.0701.1</AssemblyVersion> <AssemblyVersion>1.22.0706.1</AssemblyVersion>
<FileVersion>1.22.0701.1</FileVersion> <FileVersion>1.22.0706.1</FileVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

Loading…
Cancel
Save