diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs index 34e3ec465..db3e91029 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/AssembleRequests/IAssembleRequestAppService.cs @@ -9,5 +9,5 @@ public interface IAssembleRequestAppService : ISfsStoreRequestMasterAppServiceBase { - + Task CreateAndHandleAsync(AssembleRequestEditInput input); } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs index c34757dc4..98d1ce710 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application.Contracts/Requests/MaterialRequests/CoatingMaterialRequests/ICoatingMaterialRequestAppService.cs @@ -10,22 +10,6 @@ public interface ICoatingMaterialRequestAppService : ISfsStoreRequestMasterAppServiceBase { - Task CreateAndHandleAsync(CoatingMaterialRequestEditInput input); - - - Task CreateAndHandleByAPIAsync(CoatingMaterialRequestEditInput input); - - /// - /// 根据类型获取叫料请求 - /// - /// - /// 叫料请求类型 - /// - /// - /// - Task> GetListByTypeAsync(SfsStoreRequestInputBase requestInput, - string type, bool includeDetails = false, CancellationToken cancellationToken = default); - - Task> GetListByTypeAsync(string type); - + Task CreateAndHandleAsync(CoatingMaterialRequestEditInput input); + } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs index 41423325d..ed88d670e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/AssembleRequests/AssembleRequestAutoMapperProfile.cs @@ -18,9 +18,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile CreateMap() .IgnoreAuditedObjectProperties() - .Ignore(x => x.ToLocationArea) - .Ignore(x => x.ToLocationGroup) - .Ignore(x => x.ToWarehouseCode) .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) @@ -28,7 +25,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile CreateMap() .IgnoreAuditedObjectProperties() - .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) + .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) .Ignore(x => x.UseOnTheWayLocation) .Ignore(x => x.Details) .Ignore(x => x.Remark) @@ -48,7 +45,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.ToLocationArea) .Ignore(x => x.ToLocationGroup) .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2) - .Ignore(x => x.ProdLine) + .Ignore(x => x.ProdLine) .Ignore(x => x.IssuedQty) .Ignore(x => x.ReceivedQty) .Ignore(x => x.ToBeIssuedQty) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs index 9e6aa8499..4e519ec6e 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Requests/MaterialRequests/CoatingMaterialRequests/CoatingMaterialRequestAutoMapperProfile.cs @@ -1,6 +1,8 @@ using AutoMapper; using Volo.Abp.AutoMapper; using Win_in.Sfs.Shared.Domain.Shared; +using Win_in.Sfs.Wms.Store.Application.Contracts; +using Win_in.Sfs.Wms.Store.Domain; using Win_in.Sfs.Wms.Store.Requests.MaterialRequests; namespace Win_in.Sfs.Wms.Store.Application; @@ -17,9 +19,6 @@ public partial class StoreApplicationAutoMapperProfile : Profile CreateMap() .IgnoreAuditedObjectProperties() - .Ignore(x => x.ToLocationArea) - .Ignore(x => x.ToLocationGroup) - .Ignore(x => x.ToWarehouseCode) .Ignore(x => x.MasterID) .Ignore(x => x.TenantId) .Ignore(x => x.Number) @@ -27,7 +26,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile CreateMap() .IgnoreAuditedObjectProperties() - .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) + .ForMember(x => x.Type, y => y.MapFrom(t => t.Type.ToString())) .Ignore(x => x.UseOnTheWayLocation) .Ignore(x => x.Details) .Ignore(x => x.Remark) @@ -47,7 +46,7 @@ public partial class StoreApplicationAutoMapperProfile : Profile .Ignore(x => x.ToLocationArea) .Ignore(x => x.ToLocationGroup) .Ignore(x => x.ItemName).Ignore(x => x.ItemDesc1).Ignore(x => x.ItemDesc2) - .Ignore(x => x.ProdLine) + .Ignore(x => x.ProdLine) .Ignore(x => x.IssuedQty) .Ignore(x => x.ReceivedQty) .Ignore(x => x.ToBeIssuedQty) diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs index dcf76a76b..f380fda18 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/AssembleRequestAutoMapperProfile.cs @@ -15,7 +15,6 @@ public partial class StoreEventAutoMapperProfile : Profile .ForMember(x => x.AssembleRequestNumber, y => y.MapFrom(d => d.Number)) .ForMember(x => x.RequestType, y => y.MapFrom(d => d.Type)) .Ignore(x => x.WarehouseCode) - .Ignore(x => x.Workshop) .Ignore(x => x.UpStreamJobNumber) .Ignore(x => x.JobType) .Ignore(x => x.IsAutoComplete) @@ -34,102 +33,5 @@ public partial class StoreEventAutoMapperProfile : Profile .Ignore(x => x.Details) ; - CreateMap() - .ForMember(x => x.RequestLocationCode, y => y.MapFrom(d => d.ToLocationCode)) - .Ignore(x => x.RecommendFromLocationArea) - .Ignore(x => x.RecommendFromLocationGroup) - .Ignore(x => x.HandledFromLocationArea) - .Ignore(x => x.HandledFromLocationGroup) - .Ignore(x => x.RecommendFromWarehouseCode) - .Ignore(x => x.HandledFromWarehouseCode) - .Ignore(x => x.OnTheWayLocationCode) - .Ignore(x => x.DistributionType) - .Ignore(x => x.RoundedQty) - .Ignore(x => x.Operation) - .Ignore(x => x.ExpiredTime) - .Ignore(x => x.TruncType) - .Ignore(x => x.PlanBeginTime) - .Ignore(x => x.PlannedSplitRule) - .Ignore(x => x.DeliveryQty) - .Ignore(x => x.Status) - .Ignore(x => x.RecommendContainerCode) - .Ignore(x => x.StdPackQty) - .Ignore(x => x.RecommendPackingCode) - .Ignore(x => x.HandledContainerCode) - .Ignore(x => x.HandledPackingCode) - .Ignore(x => x.RecommendSupplierBatch) - .Ignore(x => x.RecommendProduceDate) - .Ignore(x => x.RecommendArriveDate) - .Ignore(x => x.RecommendExpireDate) - .Ignore(x => x.HandledFromLocationCode) - .Ignore(x => x.HandledFromLocationErpCode) - .Ignore(x => x.HandledUom) - .Ignore(x => x.RecommendFromLocationErpCode) - .Ignore(x => x.HandledExpireDate) - .Ignore(x => x.HandledLot) - .Ignore(x => x.HandledArriveDate) - .Ignore(x => x.HandledProduceDate) - .Ignore(x => x.HandledQty) - .Ignore(x => x.RecommendQty) - .Ignore(x => x.Uom) - .Ignore(x => x.HandledSupplierBatch) - .Ignore(x => x.RecommendFromLocationCode) - .Ignore(x => x.RecommendLot) - .IgnoreIHasRecommendAndHandledFrom(); - - CreateMap() - .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(d => d.ArriveDate)) - .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(d => d.ContainerCode)) - .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(d => d.ExpireDate)) - .ForMember(x => x.RecommendFromLocationCode, y => y.MapFrom(d => d.LocationCode)) - .ForMember(x => x.RecommendFromLocationErpCode, y => y.MapFrom(d => d.LocationErpCode)) - .ForMember(x => x.RecommendFromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode)) - .ForMember(x => x.RecommendFromLocationArea, y => y.MapFrom(d => d.LocationArea)) - .ForMember(x => x.RecommendFromLocationGroup, y => y.MapFrom(d => d.LocationGroup)) - .ForMember(x => x.RecommendLot, y => y.MapFrom(d => d.Lot)) - .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(d => d.PackingCode)) - .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(d => d.ProduceDate)) - .ForMember(x => x.RecommendQty, y => y.MapFrom(d => d.Qty)) - .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(d => d.SupplierBatch)) - .ForMember(x => x.Uom, y => y.MapFrom(d => d.Uom)).Ignore(x => x.HandledArriveDate) - .Ignore(x => x.HandledFromLocationArea) - .Ignore(x => x.HandledFromLocationGroup) - .Ignore(x => x.ToLocationErpCode) - .Ignore(x => x.ToWarehouseCode) - .Ignore(x => x.ToLocationArea) - .Ignore(x => x.ToLocationGroup) - .Ignore(x => x.HandledFromWarehouseCode) - .Ignore(x => x.RequestLocationCode) - .Ignore(x => x.ToLocationCode) - .Ignore(x => x.ProdLine) - .Ignore(x => x.WorkStation) - .Ignore(x => x.HandledContainerCode) - .Ignore(x => x.HandledExpireDate) - .Ignore(x => x.HandledFromLocationCode) - .Ignore(x => x.HandledFromLocationErpCode) - .Ignore(x => x.HandledLot) - .Ignore(x => x.HandledPackingCode) - .Ignore(x => x.HandledProduceDate) - .Ignore(x => x.HandledQty) - .Ignore(x => x.HandledSupplierBatch) - .Ignore(x => x.HandledUom) - .Ignore(x => x.Remark) - .Ignore(x => x.OnTheWayLocationCode) - .Ignore(x => x.DistributionType) - .Ignore(x => x.RoundedQty) - .Ignore(x => x.Operation) - .Ignore(x => x.ExpiredTime) - .Ignore(x => x.TruncType) - .Ignore(x => x.PlanBeginTime) - .Ignore(x => x.PlannedSplitRule) - .Ignore(x => x.DeliveryQty) - .Ignore(x => x.RequestLocationCode) - .Ignore(x => x.ToLocationCode) - .Ignore(x => x.ProdLine) - .Ignore(x => x.WorkStation) - .Ignore(x => x.PositionCode) - .Ignore(x => x.RecommendType) - .IgnoreIHasRecommendAndHandledFrom(); - } } diff --git a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs index bd08e04bb..ba680ff7c 100644 --- a/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs +++ b/be/Modules/Store/src/Win_in.Sfs.Wms.Store.Event/AutoMapperProfiles/Requests/CoatingMaterialRequestAutoMapperProfile.cs @@ -35,102 +35,5 @@ public partial class StoreEventAutoMapperProfile : Profile .Ignore(x => x.Details) ; - CreateMap() - .ForMember(x => x.RequestLocationCode, y => y.MapFrom(d => d.ToLocationCode)) - .Ignore(x => x.RecommendFromLocationArea) - .Ignore(x => x.RecommendFromLocationGroup) - .Ignore(x => x.HandledFromLocationArea) - .Ignore(x => x.HandledFromLocationGroup) - .Ignore(x => x.RecommendFromWarehouseCode) - .Ignore(x => x.HandledFromWarehouseCode) - .Ignore(x => x.OnTheWayLocationCode) - .Ignore(x => x.DistributionType) - .Ignore(x => x.RoundedQty) - .Ignore(x => x.Operation) - .Ignore(x => x.ExpiredTime) - .Ignore(x => x.TruncType) - .Ignore(x => x.PlanBeginTime) - .Ignore(x => x.PlannedSplitRule) - .Ignore(x => x.DeliveryQty) - .Ignore(x => x.Status) - .Ignore(x => x.RecommendContainerCode) - .Ignore(x => x.StdPackQty) - .Ignore(x => x.RecommendPackingCode) - .Ignore(x => x.HandledContainerCode) - .Ignore(x => x.HandledPackingCode) - .Ignore(x => x.RecommendSupplierBatch) - .Ignore(x => x.RecommendProduceDate) - .Ignore(x => x.RecommendArriveDate) - .Ignore(x => x.RecommendExpireDate) - .Ignore(x => x.HandledFromLocationCode) - .Ignore(x => x.HandledFromLocationErpCode) - .Ignore(x => x.HandledUom) - .Ignore(x => x.RecommendFromLocationErpCode) - .Ignore(x => x.HandledExpireDate) - .Ignore(x => x.HandledLot) - .Ignore(x => x.HandledArriveDate) - .Ignore(x => x.HandledProduceDate) - .Ignore(x => x.HandledQty) - .Ignore(x => x.RecommendQty) - .Ignore(x => x.Uom) - .Ignore(x => x.HandledSupplierBatch) - .Ignore(x => x.RecommendFromLocationCode) - .Ignore(x => x.RecommendLot) - .IgnoreIHasRecommendAndHandledFrom(); - - CreateMap() - .ForMember(x => x.RecommendArriveDate, y => y.MapFrom(d => d.ArriveDate)) - .ForMember(x => x.RecommendContainerCode, y => y.MapFrom(d => d.ContainerCode)) - .ForMember(x => x.RecommendExpireDate, y => y.MapFrom(d => d.ExpireDate)) - .ForMember(x => x.RecommendFromLocationCode, y => y.MapFrom(d => d.LocationCode)) - .ForMember(x => x.RecommendFromLocationErpCode, y => y.MapFrom(d => d.LocationErpCode)) - .ForMember(x => x.RecommendFromWarehouseCode, y => y.MapFrom(d => d.WarehouseCode)) - .ForMember(x => x.RecommendFromLocationArea, y => y.MapFrom(d => d.LocationArea)) - .ForMember(x => x.RecommendFromLocationGroup, y => y.MapFrom(d => d.LocationGroup)) - .ForMember(x => x.RecommendLot, y => y.MapFrom(d => d.Lot)) - .ForMember(x => x.RecommendPackingCode, y => y.MapFrom(d => d.PackingCode)) - .ForMember(x => x.RecommendProduceDate, y => y.MapFrom(d => d.ProduceDate)) - .ForMember(x => x.RecommendQty, y => y.MapFrom(d => d.Qty)) - .ForMember(x => x.RecommendSupplierBatch, y => y.MapFrom(d => d.SupplierBatch)) - .ForMember(x => x.Uom, y => y.MapFrom(d => d.Uom)).Ignore(x => x.HandledArriveDate) - .Ignore(x => x.HandledFromLocationArea) - .Ignore(x => x.HandledFromLocationGroup) - .Ignore(x => x.ToLocationErpCode) - .Ignore(x => x.ToWarehouseCode) - .Ignore(x => x.ToLocationArea) - .Ignore(x => x.ToLocationGroup) - .Ignore(x => x.HandledFromWarehouseCode) - .Ignore(x => x.RequestLocationCode) - .Ignore(x => x.ToLocationCode) - .Ignore(x => x.ProdLine) - .Ignore(x => x.WorkStation) - .Ignore(x => x.HandledContainerCode) - .Ignore(x => x.HandledExpireDate) - .Ignore(x => x.HandledFromLocationCode) - .Ignore(x => x.HandledFromLocationErpCode) - .Ignore(x => x.HandledLot) - .Ignore(x => x.HandledPackingCode) - .Ignore(x => x.HandledProduceDate) - .Ignore(x => x.HandledQty) - .Ignore(x => x.HandledSupplierBatch) - .Ignore(x => x.HandledUom) - .Ignore(x => x.Remark) - .Ignore(x => x.OnTheWayLocationCode) - .Ignore(x => x.DistributionType) - .Ignore(x => x.RoundedQty) - .Ignore(x => x.Operation) - .Ignore(x => x.ExpiredTime) - .Ignore(x => x.TruncType) - .Ignore(x => x.PlanBeginTime) - .Ignore(x => x.PlannedSplitRule) - .Ignore(x => x.DeliveryQty) - .Ignore(x => x.RequestLocationCode) - .Ignore(x => x.ToLocationCode) - .Ignore(x => x.ProdLine) - .Ignore(x => x.WorkStation) - .Ignore(x => x.PositionCode) - .Ignore(x => x.RecommendType) - .IgnoreIHasRecommendAndHandledFrom(); - } }