From 83dfacb2f4e5db44629251d85c06d8e283a26564 Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Tue, 31 Dec 2024 15:09:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B4=E5=90=88?= =?UTF-8?q?=E7=AE=B1=20=E6=8B=86=E7=AE=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SfsCrudWithDetailsAppServiceBase.cs | 2 +- .../Inputs/IntegrationPackingNoteDetailInput.cs | 12 ++++++++++++ .../Inputs/IntegrationPackingNoteEditInput.cs | 6 ++++++ .../Inputs/SeparationPackingNoteDetailInput.cs | 12 ++++++++++++ .../Inputs/SeparationPackingNoteEditInput.cs | 6 ++++++ .../IntegrationPackingNoteAppService.cs | 2 ++ .../SeparationPackingNoteAppService.cs | 4 ++-- .../StoreApplicationAutoMapperProfile.cs | 3 +++ .../SeparationPackingNoteManager.cs | 5 ++++- .../ExchangeDataDbContextModelCreatingExtensions.cs | 2 +- 10 files changed, 49 insertions(+), 5 deletions(-) diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs index 29c506d6b..d133c2c38 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Application/SfsCrudWithDetailsAppServiceBase.cs @@ -91,7 +91,7 @@ public abstract class SfsCrudWithDetailsAppServiceBase明细列表 [HttpPost("details/")] public virtual async Task AddDetailListAsync(Guid id, List list) - { + { var entity = await _repository.GetAsync(id).ConfigureAwait(false); Check.NotNull(entity, EntityClassName); var details = ObjectMapper.Map, List>(list); diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs index 18c4c0caa..e42db5593 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteDetailInput.cs @@ -9,6 +9,18 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class IntegrationPackingNoteDetailInput : SfsDetailInputBase { + /// + /// 单号 + /// + [Display(Name = "单号")] + public string Number { get; set; } + + /// + /// 单号 + /// + [Display(Name = "单号")] + public string WarehouseCode { get; set; } + #region 物品基础信息 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs index a8980343c..d3efb107f 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/IntegrationPackingNotes/Inputs/IntegrationPackingNoteEditInput.cs @@ -8,6 +8,12 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class IntegrationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase { + /// + /// 单号 + /// + [Display(Name = "单号")] + public string Number { get; set; } + #region 物品基础信息 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteDetailInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteDetailInput.cs index 9da303715..697844253 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteDetailInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteDetailInput.cs @@ -9,6 +9,18 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class SeparationPackingNoteDetailInput : SfsDetailInputBase { + /// + /// 单号 + /// + [Display(Name = "单号")] + public string Number { get; set; } + + /// + /// 单号 + /// + [Display(Name = "单号")] + public string WarehouseCode { get; set; } + #region 物品基础信息 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteEditInput.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteEditInput.cs index 643c64717..b5601a2eb 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteEditInput.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Notes/OperationPacking/SeparationPackingNotes/Inputs/SeparationPackingNoteEditInput.cs @@ -8,6 +8,12 @@ namespace Win_in.Sfs.Wms.Store.Application.Contracts; public class SeparationPackingNoteEditInput : SfsStoreCreateOrUpdateInputBase { + /// + /// 单号 + /// + [Display(Name = "单号")] + public string Number { get; set; } + #region 物品基础信息 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs index fb4b05824..aa5146e30 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/IntegrationPackingNotes/IntegrationPackingNoteAppService.cs @@ -1,5 +1,7 @@ +using System.Threading.Tasks; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Volo.Abp.ObjectMapping; using Win_in.Sfs.Wms.Store.Application.Contracts; using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Domain.Shared; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs index 2cf4d1292..dc41caa3c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteAppService.cs @@ -28,8 +28,8 @@ public class SeparationPackingNoteAppService : public SeparationPackingNoteAppService( ISeparationPackingNoteRepository repository, - ISeparationPackingNoteManager SeparationPackingNoteManager) : base(repository) + ISeparationPackingNoteManager separationPackingNoteManager) : base(repository) { - _separationPackingNoteManager = SeparationPackingNoteManager; + _separationPackingNoteManager = separationPackingNoteManager; } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs index f742e0b0c..0842654d7 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/StoreApplicationAutoMapperProfile.cs @@ -145,5 +145,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile KittingPackagingNoteAutoMapperProfile(); //高通WMS-立库接口 GaoTongAutoMapperProfile(); + //分割箱 整合箱 + IntegrationPackingNoteAutoMapperProfile(); + SeparationPackingNoteAutoMapperProfile(); } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteManager.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteManager.cs index 65aa65e95..be712bee3 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteManager.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/OperationPacking/SeparationPackingNotes/SeparationPackingNoteManager.cs @@ -6,7 +6,10 @@ namespace Win_in.Sfs.Wms.Store.Domain; public class SeparationPackingNoteManager : SfsStoreManagerBase, ISeparationPackingNoteManager { - public SeparationPackingNoteManager(ISfsStoreRepositoryBase repository) : base(repository) + public SeparationPackingNoteManager( + ISeparationPackingNoteRepository repository + ) : base(repository) { + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs index ba3d2cdfb..0a6a424dc 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/ExchangeData/ExchangeDataDbContextModelCreatingExtensions.cs @@ -30,7 +30,7 @@ public static class ExchangeDataDbContextModelCreatingExtensions b.Property(p => p.ReadTime); b.Property(p => p.ErrorCode).IsRequired().HasMaxLength(SfsPropertyConst.NameLength).HasConversion(); b.Property(p => p.ErrorMessage).HasMaxLength(SfsPropertyConst.RemarkLength); - b.Property(p => p.TyrpNumber).IsRequired().HasDefaultValueSql(""); + //b.Property(p => p.TyrpNumber).IsRequired().HasDefaultValueSql(); //b.Property(p => p.TyrpNumber).IsRequired().HasMaxLength(SfsPropertyConst.CodeLength); //Relations