From ebe4d8039d712a81983b00f19c6f240c63291b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B4=BE=E8=8D=A3=E5=9B=BD?= Date: Wed, 25 May 2022 09:47:05 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BD=BF=E7=94=A8TS=5FBARCODE=E7=9A=84?= =?UTF-8?q?PalletCode=E5=81=9A=E4=B8=BA=E6=89=98=E7=9B=98=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsnBackgroundWorker/AsnFactory.cs | 4 ++-- WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TS_BARCODE.cs | 2 ++ .../DbContext/V1ScpDbContextModelCreatingExtensions.cs | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/AsnBackgroundWorker/AsnFactory.cs b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/AsnBackgroundWorker/AsnFactory.cs index e1ef836..4a71f94 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/AsnBackgroundWorker/AsnFactory.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.WebApi.HttpApi.Host/AsnBackgroundWorker/AsnFactory.cs @@ -60,10 +60,10 @@ namespace Win_in.Sfs.Scp.WebApi //计算与添加托盘和尾箱 - var palletCodes = barcodes.Select(p => p.Extend2).Distinct().ToList(); + var palletCodes = barcodes.Select(p => p.PalletCode).Distinct().ToList(); foreach (var palletCode in palletCodes) { - var palletBarcodes = barcodes.Where(p => p.Extend2==palletCode).ToList(); + var palletBarcodes = barcodes.Where(p => p.PalletCode == palletCode).ToList(); var items = new List(); var group = palletBarcodes diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TS_BARCODE.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TS_BARCODE.cs index fbefe27..aa8a7b6 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TS_BARCODE.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.Domain/Asns/TS_BARCODE.cs @@ -87,6 +87,8 @@ namespace Win_in.Sfs.Scp.v1.Domain.Asns [DisplayName("是否扫描")] public bool IsScanned { get; set; } + public string PalletCode { get; set; }//托盘号 + public Guid? TenantId { get; } } diff --git a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/DbContext/V1ScpDbContextModelCreatingExtensions.cs b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/DbContext/V1ScpDbContextModelCreatingExtensions.cs index f5c411d..974bed0 100644 --- a/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/DbContext/V1ScpDbContextModelCreatingExtensions.cs +++ b/WebApiService/src/Win_in.Sfs.Scp.v1.EntityFrameworkCore/DbContext/V1ScpDbContextModelCreatingExtensions.cs @@ -337,6 +337,7 @@ namespace Win_in.Sfs.Scp.v1.EntityFrameworkCore b.Property(q => q.Extend1); b.Property(q => q.Extend2); b.Property(q => q.Extend3); + b.Property(q => q.PalletCode).HasMaxLength(50); b.Property(q => q.IsScanned);