From 1cd06de78cd2236282b5e4706f6223107b6820f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E8=8D=A3=E5=9B=BD?= Date: Wed, 7 Sep 2022 18:08:38 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=8E=BB=E6=8E=89Tare=E5=B1=82=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9SE=20count=E8=AE=A1=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Win_in.Sfs.Scp.WebApi.Agent.csproj | 4 ++-- .../src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json | 2 +- .../ASN_X12/Shipments/ShipmentExtensions.cs | 3 ++- .../ASN_X12/Tares/TareExtensions.cs | 3 ++- .../Repositories/TsBarcodeRepository.cs | 3 +++ 5 files changed, 10 insertions(+), 5 deletions(-) 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 5aa8b75..4342c19 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.0820.1 - 1.22.0820.1 + 1.22.0907.1 + 1.22.0907.1 diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json index add1033..c242e57 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Agent/appsettings.json @@ -58,7 +58,7 @@ { "Code": "T8", "Receiver": "00T8USUPPU", - "MinUid": 200 + "MinUid": 1024 }, { "Code": "T5", diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Shipments/ShipmentExtensions.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Shipments/ShipmentExtensions.cs index cd39573..6c35c60 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Shipments/ShipmentExtensions.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Shipments/ShipmentExtensions.cs @@ -77,7 +77,8 @@ public static class ShipmentExtensions orphanItem.HL.HL01 = shipNotice.GetNextHl(orphanItem.SN1.Qty); orphanItem.HL.HL02 = shipment.HL.HL01; shipment.OrphanItems.Add(orphanItem); - shipNotice.AddSegment(5+orphanItem.REF_LS_LTs.Count*2); + // shipNotice.AddSegment(5+orphanItem.REF_LS_LTs.Count*2); + shipNotice.AddSegment(5); return shipment; } diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Tares/TareExtensions.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Tares/TareExtensions.cs index 8b5d189..f1a140c 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Tares/TareExtensions.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.Domain.Shared/ASN_X12/Tares/TareExtensions.cs @@ -23,7 +23,8 @@ public static class TareExtensions item.HL.HL01 = shipNotice.GetNextHl(item.SN1.Qty); item.HL.HL02 = tare.HL.HL01; tare.Items.Add(item); - shipNotice.AddSegment(5+item.REF_LS_LTs.Count*2); + // shipNotice.AddSegment(5+item.REF_LS_LTs.Count*2); + shipNotice.AddSegment(5); return tare; } 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 afe9a03..f8ce3b5 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,6 +21,9 @@ 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; } }