Browse Source

[fix]补全部分 EditInput -> Entity的Mapper

集成Redis
贾荣国 2 years ago
parent
commit
ff167a94d7
  1. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreRequestDTOBase.cs
  2. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreCreateOrUpdateInputBase.cs
  3. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailWithFromToInputBase.cs
  4. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreImportInputBase.cs
  5. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRecommendFromDetailWithFromToInputBase.cs
  6. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRecommendToDetailWithFromToInputBase.cs
  7. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRequestCreateOrUpdateInputBase.cs
  8. 6
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestDetailInput.cs
  9. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestEditInput.cs
  10. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/DeliverJobs/DeliverJobAutoMapperProfile.cs
  11. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ProductionReturnJobs/ProductionReturnJobAutoMapperProfile.cs
  12. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductReceiptNotes/ProductReceiptNoteAutoMapperProfile.cs
  13. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductRecycleNotes/ProductRecycleNoteAutoMapperProfile.cs
  14. 2
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductionReturnNotes/ProductionReturnNoteAutoMapperProfile.cs
  15. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs
  16. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAutoMapperProfile.cs
  17. 3
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAutoMapperProfile.cs
  18. 4
      be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductionReturnRequests/ProductionReturnRequestAutoMapperProfile.cs

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/DTOs/SfsStoreRequestDTOBase.cs

@ -3,7 +3,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreRequestDTOBase<TDetailDTO> : SfsStoreDTOBase<TDetailDTO>
public abstract class SfsStoreRequestDTOBase<TDetailDTO> : SfsStoreDTOBase<TDetailDTO>
{
/// <summary>
/// 自动提交审批
@ -18,7 +18,7 @@ public class SfsStoreRequestDTOBase<TDetailDTO> : SfsStoreDTOBase<TDetailDTO>
public bool AutoAgree { get; set; }
/// <summary>
/// 自动执行
/// 自动执行
/// </summary>
[Display(Name = "自动执行")]
public bool AutoHandle { get; set; }

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreCreateOrUpdateInputBase.cs

@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreCreateOrUpdateInputBase : SfsCreateOrUpdateInputBase
public abstract class SfsStoreCreateOrUpdateInputBase : SfsCreateOrUpdateInputBase
{
/// <summary>
/// 操作员

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreDetailWithFromToInputBase.cs

@ -5,7 +5,7 @@ using Win_in.Sfs.Shared.Domain.Shared;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreDetailWithFromToInputBase
public abstract class SfsStoreDetailWithFromToInputBase
: SfsStoreDetailWithQtyInputBase
, IHasFromToPacking
, IHasFromToLot

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreImportInputBase.cs

@ -3,7 +3,7 @@ using Win_in.Sfs.Shared.Application.Contracts;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreImportInputBase : SfsImportInputBase
public abstract class SfsStoreImportInputBase : SfsImportInputBase
{
//[Display(Name = "单号")]
@ -35,7 +35,7 @@ public class SfsStoreImportInputBase : SfsImportInputBase
public bool AutoAgree { get; set; } = true;
/// <summary>
/// 自动执行
/// 自动执行
/// </summary>
[Display(Name = "自动执行")]
[ImporterHeader(IsIgnore = true)]

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRecommendFromDetailWithFromToInputBase.cs

@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreRecommendFromDetailWithFromToInputBase : SfsStoreDetailWithFromToInputBase, IHasRecommendAndHandledFrom
public abstract class SfsStoreRecommendFromDetailWithFromToInputBase : SfsStoreDetailWithFromToInputBase, IHasRecommendAndHandledFrom
{
#region IHasRecommendFrom
/// <summary>

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRecommendToDetailWithFromToInputBase.cs

@ -4,7 +4,7 @@ using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreRecommendToDetailWithFromToInputBase : SfsStoreDetailWithFromToInputBase, IHasRecommendAndHandledTo
public abstract class SfsStoreRecommendToDetailWithFromToInputBase : SfsStoreDetailWithFromToInputBase, IHasRecommendAndHandledTo
{
#region IHasRecommendTo
/// <summary>

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Bases/Inputs/SfsStoreRequestCreateOrUpdateInputBase.cs

@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class SfsStoreRequestCreateOrUpdateInputBase : SfsStoreCreateOrUpdateInputBase
public abstract class SfsStoreRequestCreateOrUpdateInputBase : SfsStoreCreateOrUpdateInputBase
{
/// <summary>
/// 自动提交审批
@ -17,7 +17,7 @@ public class SfsStoreRequestCreateOrUpdateInputBase : SfsStoreCreateOrUpdateInpu
public bool AutoAgree { get; set; } = true;
/// <summary>
/// 自动执行
/// 自动执行
/// </summary>
[Display(Name = "自动执行")]
public bool AutoHandle { get; set; } = true;

6
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestDetailInput.cs

@ -0,0 +1,6 @@
namespace Win_in.Sfs.Wms.Store.Application.Contracts;
public class ProductionReturnRequestDetailInput : SfsStoreDetailWithFromToInputBase
{
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/ProductionReturnRequests/Inputs/ProductionReturnRequestEditInput.cs

@ -24,6 +24,6 @@ public class ProductionReturnRequestEditInput : SfsStoreRequestCreateOrUpdateInp
/// 明细列表
/// </summary>
[Display(Name = "明细列表")]
public List<SfsStoreDetailWithFromToInputBase> Details { get; set; } = new List<SfsStoreDetailWithFromToInputBase>();
public List<ProductionReturnRequestDetailInput> Details { get; set; } = new List<ProductionReturnRequestDetailInput>();
#endregion
}

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/DeliverJobs/DeliverJobAutoMapperProfile.cs

@ -18,6 +18,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
CreateMap<DeliverJobDetailDTO, DeliverJobDetail>()
.IgnoreAuditedObjectProperties();
CreateMap<DeliverJobEditInput, DeliverJob>();
CreateMap<DeliverJobDetailInput, DeliverJobDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Jobs/ProductionReturnJobs/ProductionReturnJobAutoMapperProfile.cs

@ -16,6 +16,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.IgnoreAuditedObjectProperties()
;
CreateMap<ProductionReturnJobEditInput, ProductionReturnJob>();
CreateMap<ProductionReturnJobDetailInput, ProductionReturnJobDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductReceiptNotes/ProductReceiptNoteAutoMapperProfile.cs

@ -17,6 +17,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.ProdLine)
.ReverseMap();
CreateMap<ProductReceiptNoteEditInput, ProductReceiptNote>();
CreateMap<ProductReceiptNoteDetailInput, ProductReceiptNoteDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductRecycleNotes/ProductRecycleNoteAutoMapperProfile.cs

@ -13,6 +13,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.NoteAndBackFlushDetails)
.ReverseMap();
CreateMap<ProductRecycleNoteEditInput, ProductRecycleNote>();
CreateMap<ProductRecycleNoteDetailInput, ProductRecycleNoteDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)
@ -26,6 +28,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.ForMember(x => x.ProductItemDesc2, y => y.MapFrom(d => d.ItemDesc2))
.ReverseMap();
CreateMap<ProductRecycleMaterialDetailInput, ProductRecycleMaterialDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

2
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/ProductionReturnNotes/ProductionReturnNoteAutoMapperProfile.cs

@ -14,6 +14,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
CreateMap<ProductionReturnNoteDetail, ProductionReturnNoteDetailDTO>();
CreateMap<ProductionReturnNoteEditInput, ProductionReturnNote>();
CreateMap<ProductionReturnNoteDetailInput, ProductionReturnNoteDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/DeliverRequests/DeliverRequestAutoMapperProfile.cs

@ -17,6 +17,8 @@ public partial class StoreApplicationAutoMapperProfile : Profile
CreateMap<DeliverRequestDetail, DeliverRequestDetailDTO>()
.ReverseMap();
CreateMap<DeliverRequestEditInput, DeliverRequest>();
CreateMap<DeliverRequestDetailInput, DeliverRequestDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)
@ -24,6 +26,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.Number)
.Ignore(x => x.Id);
CreateMap<DeliverRequestImportInput, DeliverRequest>()
.ForMember(x => x.DeliverRequestType, y => y.MapFrom(t => EnumDeliverRequestType.Normal))
.Ignore(x => x.CustomerAddressCode)

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductReceiptRequests/ProductReceiptRequestAutoMapperProfile.cs

@ -15,6 +15,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
CreateMap<ProductReceiptRequestDetail, ProductReceiptRequestDetailDTO>()
.ReverseMap();
CreateMap<ProductReceiptRequestEditInput, ProductReceiptRequest>();
CreateMap<ProductReceiptRequestDetailInput, ProductReceiptRequestDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.MasterID)

3
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductRecycleRequests/ProductRecycleRequestAutoMapperProfile.cs

@ -23,6 +23,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.Ignore(x => x.Number)
.Ignore(x => x.Id);
CreateMap<ProductRecycleRequestEditInput, ProductRecycleRequest>();
CreateMap<PreparationPlan, PreparationPlanEditInput>();
CreateMap<ProductRecycleRequestImportInput, ProductRecycleRequest>()

4
be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/ProductionReturnRequests/ProductionReturnRequestAutoMapperProfile.cs

@ -16,7 +16,9 @@ public partial class StoreApplicationAutoMapperProfile : Profile
.IgnoreAuditedObjectProperties()
.ReverseMap();
CreateMap<SfsStoreDetailWithFromToInputBase, ProductionReturnRequestDetail>()
CreateMap<ProductionReturnRequestEditInput, ProductionReturnRequest>();
CreateMap<ProductionReturnRequestDetailInput, ProductionReturnRequestDetail>()
.IgnoreAuditedObjectProperties()
.Ignore(x => x.ToWarehouseCode)
.Ignore(x => x.MasterID)

Loading…
Cancel
Save