1.22.0706.1

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);
             }
             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,
                 asn.ShipTime ?? DateTime.Today);
             return asnX12;

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

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

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

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

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]
         [Route("nopo-unread-list")]
         public async Task<ListResultDto<X12AsnDTO>> GetNoPoUnreadListAsync(string site, int count, bool autoUpdateStatus)

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

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

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

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

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");
+        }
+    }
+}

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

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

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>
     <PreserveCompilationReferences>true</PreserveCompilationReferences>
     <UserSecretsId>Win_in.Sfs.Scp.WebApi-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
-    <AssemblyVersion>1.22.0701.1</AssemblyVersion>
-    <FileVersion>1.22.0701.1</FileVersion>
+    <AssemblyVersion>1.22.0706.1</AssemblyVersion>
+    <FileVersion>1.22.0706.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>