From c1e67e8c6dadf36ad43d0664e0ebe1fcce7ff3c6 Mon Sep 17 00:00:00 2001 From: liuyunfeng Date: Wed, 27 Mar 2024 17:34:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E6=B5=8B=E8=AF=95=E6=96=B0?= =?UTF-8?q?=E7=A7=BB=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Enums/Inventory/EnumTransType.cs | 7 +++++++ .../TransferLibJobAutoMapperProfile.cs | 10 +++++++++- .../TransferLibNoteMapperProfile.cs | 14 +++----------- .../TransferLibRequestAppService.cs | 4 ++-- .../TransferLibRequestMapperProfile.cs | 15 ++++++++++++++- .../StoreApplicationAutoMapperProfile.cs | 4 ++-- 6 files changed, 37 insertions(+), 17 deletions(-) diff --git a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs index 845532ea3..f1259ee84 100644 --- a/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs +++ b/be/Modules/Shared/src/Win_in.Sfs.Shared.Domain.Shared/Enums/Inventory/EnumTransType.cs @@ -91,6 +91,13 @@ public enum EnumTransType [Display(Name = "库内转移")] Transfer = 31, + /// + /// 新版库内转移 + /// + [Display(Name = "新版库内转移")] + TransferLib = 68, + + /// /// 库间调拨 /// diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAutoMapperProfile.cs index f7ecc2eec..f210ab4c0 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/TransferLibJobs/TransferLibJobAutoMapperProfile.cs @@ -20,6 +20,14 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) - .Ignore(x => x.Id); + .Ignore(x => x.Id) + .IgnoreAuditedObjectProperties(); + + CreateMap() + .IgnoreAuditedObjectProperties() + .Ignore(x => x.Number) + .Ignore(x => x.Id) + .IgnoreAuditedObjectProperties(); + } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferLibNotes/TransferLibNoteMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferLibNotes/TransferLibNoteMapperProfile.cs index ea28afa69..2a7587d42 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferLibNotes/TransferLibNoteMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferLibNotes/TransferLibNoteMapperProfile.cs @@ -11,18 +11,10 @@ public partial class StoreApplicationAutoMapperProfile : Profile { CreateMap() .ReverseMap(); - + CreateMap() + .ReverseMap(); CreateMap() - .IgnoreAuditedObjectProperties() - ; - - CreateMap() - .IgnoreAuditedObjectProperties() - ; - - CreateMap(); - - CreateMap(); + .IgnoreAuditedObjectProperties(); CreateMap() .IgnoreAuditedObjectProperties() diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs index 4f43dd476..1f30e5791 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestAppService.cs @@ -172,7 +172,7 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase private async Task SetEntityPropertiesAsync(TransferLibRequest entity, EnumTransSubType subType) { - var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Transfer, subType) + var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.TransferLib, subType) .ConfigureAwait(false); Check.NotNull(tranType, "事务类型", "事务类型不存在"); entity.Worker = CurrentUser.GetUserName(); @@ -319,7 +319,7 @@ public class TransferLibRequestAppService : SfsStoreRequestAppServiceBase var entity = ObjectMapper.Map(input); var subType = Enum.Parse(input.Type); - var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.Transfer, subType) + var tranType = await TransactionTypeAclService.GetByTransTypeAsync(EnumTransType.TransferLib, subType) .ConfigureAwait(false); entity.Type = ((int)subType).ToString(); entity.AutoCompleteJob = tranType.AutoCompleteJob; diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestMapperProfile.cs index 9d0327fb8..562796986 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/TransferLibRequests/TransferLibRequestMapperProfile.cs @@ -21,7 +21,20 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) - .Ignore(x => x.Id); + .Ignore(x => x.Id) + .IgnoreAuditedObjectProperties(); + + CreateMap() + .IgnoreAuditedObjectProperties() + .Ignore(x => x.ActiveDate) + .Ignore(x => x.Remark) + .Ignore(x => x.ExtraProperties) + .Ignore(x => x.ConcurrencyStamp) + .Ignore(x => x.RequestStatus) + .Ignore(x => x.TenantId) + .Ignore(x => x.Number) + .Ignore(x => x.Id) + .IgnoreAuditedObjectProperties(); CreateMap() .IgnoreAuditedObjectProperties() 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 d1a07929e..55b7fc0cf 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 @@ -85,6 +85,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile UnplannedReceiptNoteAutoMapperProfile(); WarehouseTransferNoteMapperProfile(); TransferNoteMapperProfile(); + TransferLibNoteMapperProfile(); NoOkConvertOkNoteAutoMapperProfile(); InventoryInitialNoteAutoMapperProfile(); WipWarehouseAdjustNoteMapperProfile(); @@ -110,11 +111,10 @@ public partial class StoreApplicationAutoMapperProfile : Profile UnplannedReceiptJobAutoMapperProfile(); ProductionReturnJobAutoMapperProfile(); - + TransferLibJobAutoMapperProfile(); #endregion ExchangeDataAutoMapperProfile(); EquipmentRecordAutoMapperProfile(); - TransferLibJobAutoMapperProfile(); } }