diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs index 2341874..04f9b6b 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/AsnBackgroundWorker/AsnBackgroundWorker.cs @@ -101,13 +101,18 @@ namespace Win_in.Sfs.Scp.WebApi { var barcodes = await scpAsnManager.GetBarcodesAsync(siteCode, asn.AsnBillNum); + var noPoAsn = CreateNoPoAsn(asn, barcodes); + asnX12List.Add(noPoAsn); + + //埃驰要求不传托盘信息 @20220905 + barcodes.ForEach(p => p.PalletCode = ""); + //埃驰要求不传托盘信息 @20220905 + if (asn.AsnBillNum.StartsWith(_options.QadAsnPrefix))//ASN to QAD { var asnX12 = CreateX12Asn(site, asn, barcodes); asnX12List.Add(asnX12); } - var noPoAsn = CreateNoPoAsn(asn, barcodes); - asnX12List.Add(noPoAsn); Logger.LogInformation($"{siteCode}:{asn.Id} {asn.AsnBillNum} was loaded"); } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj index 4342c19..77f3d11 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/Win_in.Sfs.Scp.WebApi.Agent.csproj @@ -3,8 +3,8 @@ Exe net5.0 - 1.22.0907.1 - 1.22.0907.1 + 1.22.1024.1 + 1.22.1024.1 diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TsBarcodeRepository.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TsBarcodeRepository.cs index f8ce3b5..afe9a03 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TsBarcodeRepository.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/Repositories/TsBarcodeRepository.cs @@ -21,9 +21,6 @@ namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore var list = await dbSet .Where(p =>p.Site==site && p.BillNum == billNum) .ToListAsync(); - //鍩冮┌瑕佹眰涓嶄紶鎵樼洏淇℃伅 @20220905 - list.ForEach(p=>p.PalletCode=""); - //鍩冮┌瑕佹眰涓嶄紶鎵樼洏淇℃伅 @20220905 return list; } }