From 505a15c0e864d12b13ab639e8e2f5984763aac49 Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 14 5月 2025 11:44:40 +0800 Subject: [PATCH] 修改命名空间 --- HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasExportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateOrUpdateDtoBase.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreUpdateDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerUpdateDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs | 8 ++-- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaUpdateDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs | 10 ++-- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersExportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresImportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateOrUpdateDtoBase.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs | 8 ++-- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresExportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersImportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateOrUpdateDtoBase.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasImportModel.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 12 +++--- HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaDto.cs | 0 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 8 ++-- HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs | 4 +- HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs | 2 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs | 8 ++-- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateDto.cs | 0 46 files changed, 58 insertions(+), 58 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs similarity index 92% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs index a8f4ccc..be662f7 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/GetWmsAreasInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs @@ -6,7 +6,7 @@ /// <summary> /// WmsArea鏌ヨ鍙傛暟瀵硅薄 /// </summary> -public class GetWmsAreasInput : ExtensiblePagedAndSortedResultRequestDto +public class GetWmsAreaInput : ExtensiblePagedAndSortedResultRequestDto { /// <summary> /// Gets or sets the filter. diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateOrUpdateDtoBase.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaCreateOrUpdateDtoBase.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateOrUpdateDtoBase.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaUpdateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaUpdateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaUpdateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasExportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasExportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasExportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasImportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreasImportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasImportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs similarity index 90% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs index 0380c5e..19ddd55 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/GetWmsContainersInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs @@ -6,7 +6,7 @@ /// <summary> /// WmsContainer鏌ヨ鍙傛暟瀵硅薄 /// </summary> -public class GetWmsContainersInput : ExtensiblePagedAndSortedResultRequestDto +public class GetWmsContainerInput : ExtensiblePagedAndSortedResultRequestDto { /// <summary> /// Gets or sets the filter. diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateOrUpdateDtoBase.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerCreateOrUpdateDtoBase.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateOrUpdateDtoBase.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerUpdateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainerUpdateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerUpdateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersExportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersExportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersExportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersImportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainers/WmsContainersImportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersImportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/ExportWmsMaterialModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs similarity index 99% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/ExportWmsMaterialModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs index b6c268d..b551de7 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/ExportWmsMaterialModel.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial { /// <summary> /// 瀵煎嚭瀹炰綋绫� diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs similarity index 95% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs index 714696f..21869a9 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs @@ -1,12 +1,12 @@ using CMS.Plugin.HIAWms.Domain.Shared.Enums; using Volo.Abp.Application.Dtos; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; /// <summary> /// WmsMaterial鏌ヨ鍙傛暟瀵硅薄 /// </summary> -public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto +public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto { /// <summary> /// Gets or sets the filter. diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs similarity index 98% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs index a0ec4b5..eb06985 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateDto.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs @@ -1,4 +1,4 @@ -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; /// <summary> /// WmsMaterial鍒涘缓鍙傛暟瀵硅薄 diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs similarity index 99% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs index 934c870..4193a03 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialCreateOrUpdateDtoBase.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs @@ -1,7 +1,7 @@ using CMS.Plugin.HIAWms.Domain.Shared.Enums; using Volo.Abp.Application.Dtos; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; /// <summary> /// WmsMaterial鍒涘缓鎴栨洿鏂板熀绫� diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs similarity index 99% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs index e7512b7..85f527b 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialDto.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs @@ -3,7 +3,7 @@ using Volo.Abp.Application.Dtos; using Volo.Abp.Domain.Entities; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; /// <summary> /// WmsMaterial鏁版嵁鍙傛暟瀵硅薄 diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs similarity index 99% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs index fe081f9..3c21342 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsExportModel.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs @@ -3,7 +3,7 @@ using System.ComponentModel; using CMS.Plugin.HIAWms.Domain.Shared.Enums; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial { /// <summary> diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs similarity index 94% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsImportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs index a157881..6c4d4aa 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialsImportModel.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs @@ -1,10 +1,10 @@ -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial { /// <summary> /// WmsMaterials瀵煎叆妯″瀷 /// </summary> - public class WmsMaterialsImportModel + public class WmsMaterialImportModels { private List<WmsMaterialImportModel> _wmsmaterials = new(); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs similarity index 98% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialUpdateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs index a594fc5..da401a7 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/WmsMaterialUpdateDto.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs @@ -1,6 +1,6 @@ using Volo.Abp.Domain.Entities; -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; /// <summary> /// WmsMaterial鏇存柊鍙傛暟瀵硅薄 diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs similarity index 88% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs index 0d3d180..11cf5d0 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/GetWmsStoresInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs @@ -5,7 +5,7 @@ /// <summary> /// WmsStore鏌ヨ鍙傛暟瀵硅薄 /// </summary> -public class GetWmsStoresInput : ExtensiblePagedAndSortedResultRequestDto +public class GetWmsStoreInput : ExtensiblePagedAndSortedResultRequestDto { /// <summary> /// Gets or sets the filter. diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateOrUpdateDtoBase.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreCreateOrUpdateDtoBase.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateOrUpdateDtoBase.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreUpdateDto.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoreUpdateDto.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreUpdateDto.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresExportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresExportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresExportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresImportModel.cs similarity index 100% rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStores/WmsStoresImportModel.cs rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresImportModel.cs diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs index 08aff0f..259dd74 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs @@ -6,7 +6,7 @@ /// <summary> /// WmsArea搴旂敤鏈嶅姟 /// </summary> -public interface IWmsAreaAppService : ICrudAppService<WmsAreaDto, Guid, GetWmsAreasInput, WmsAreaCreateDto, WmsAreaUpdateDto> +public interface IWmsAreaAppService : ICrudAppService<WmsAreaDto, Guid, GetWmsAreaInput, WmsAreaCreateDto, WmsAreaUpdateDto> { /// <summary> /// Clones the asynchronous. @@ -42,5 +42,5 @@ /// </summary> /// <param name="input">The input.</param> /// <returns></returns> - Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input); + Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input); } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs index d529fe2..9858e4f 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs @@ -6,7 +6,7 @@ /// <summary> /// WmsContainer搴旂敤鏈嶅姟 /// </summary> -public interface IWmsContainerAppService : ICrudAppService<WmsContainerDto, Guid, GetWmsContainersInput, WmsContainerCreateDto, WmsContainerUpdateDto> +public interface IWmsContainerAppService : ICrudAppService<WmsContainerDto, Guid, GetWmsContainerInput, WmsContainerCreateDto, WmsContainerUpdateDto> { /// <summary> /// Clones the asynchronous. @@ -42,5 +42,5 @@ /// </summary> /// <param name="input">The input.</param> /// <returns></returns> - Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input); + Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainerInput input); } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs index bff89f1..14212f7 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs @@ -1,4 +1,4 @@ -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; using Volo.Abp.Application.Services; namespace CMS.Plugin.HIAWms.Application.Contracts.Services; @@ -6,7 +6,7 @@ /// <summary> /// WmsMaterial搴旂敤鏈嶅姟 /// </summary> -public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialsInput, WmsMaterialCreateDto, WmsMaterialUpdateDto> +public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialInput, WmsMaterialCreateDto, WmsMaterialUpdateDto> { /// <summary> /// Clones the asynchronous. @@ -35,12 +35,12 @@ /// </summary> /// <param name="input">The input.</param> /// <returns></returns> - Task ImportAsync(WmsMaterialsImportModel input); + Task ImportAsync(WmsMaterialImportModels input); /// <summary> /// Exports the asynchronous. /// </summary> /// <param name="input">The input.</param> /// <returns></returns> - Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialsInput input); + Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input); } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs index 91e1035..357f390 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs @@ -6,7 +6,7 @@ /// <summary> /// WmsStore搴旂敤鏈嶅姟 /// </summary> -public interface IWmsStoreAppService : ICrudAppService<WmsStoreDto, Guid, GetWmsStoresInput, WmsStoreCreateDto, WmsStoreUpdateDto> +public interface IWmsStoreAppService : ICrudAppService<WmsStoreDto, Guid, GetWmsStoreInput, WmsStoreCreateDto, WmsStoreUpdateDto> { /// <summary> /// Clones the asynchronous. @@ -42,5 +42,5 @@ /// </summary> /// <param name="input">The input.</param> /// <returns></returns> - Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input); + Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoreInput input); } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs index 42301c9..ab9d5e1 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs @@ -35,7 +35,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreasInput input) + public virtual async Task<PagedResultDto<WmsAreaDto>> GetListAsync(GetWmsAreaInput input) { Check.NotNull(input, nameof(input)); @@ -45,7 +45,7 @@ } var specification = new WmsAreaSpecification(input.Name); - var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input); + var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input); var count = await _wmsareaRepository.GetCountAsync(area,input.Filter, specification); var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); @@ -300,7 +300,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreasInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsAreaInput input) { Check.NotNull(input, nameof(input)); @@ -310,7 +310,7 @@ } var specification = new WmsAreaSpecification(input.Name); - var area = ObjectMapper.Map<GetWmsAreasInput, WmsArea>(input); + var area = ObjectMapper.Map<GetWmsAreaInput, WmsArea>(input); var list = await _wmsareaRepository.GetListAsync(area,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); var result = ObjectMapper.Map<List<WmsArea>, List<WmsAreaDto>>(list); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs index d3451e9..49ba22c 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs @@ -32,7 +32,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainersInput input) + public virtual async Task<PagedResultDto<WmsContainerDto>> GetListAsync(GetWmsContainerInput input) { Check.NotNull(input, nameof(input)); @@ -42,7 +42,7 @@ } var specification = new WmsContainerSpecification(input.Name); - var container = ObjectMapper.Map < GetWmsContainersInput, WmsContainer>(input); + var container = ObjectMapper.Map < GetWmsContainerInput, WmsContainer>(input); var count = await _wmscontainerRepository.GetCountAsync(container,input.Filter, specification); var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); @@ -299,7 +299,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainersInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsContainerInput input) { Check.NotNull(input, nameof(input)); @@ -309,7 +309,7 @@ } var specification = new WmsContainerSpecification(input.Name); - var container = ObjectMapper.Map<GetWmsContainersInput, WmsContainer>(input); + var container = ObjectMapper.Map<GetWmsContainerInput, WmsContainer>(input); var list = await _wmscontainerRepository.GetListAsync(container,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); var result = ObjectMapper.Map<List<WmsContainer>, List<WmsContainerDto>>(list); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs index 6341792..e6e0457 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs @@ -1,4 +1,4 @@ -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; using CMS.Plugin.HIAWms.Application.Contracts.Services; using CMS.Plugin.HIAWms.Domain.Shared; using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterials; @@ -33,7 +33,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialsInput input) + public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input) { Check.NotNull(input, nameof(input)); @@ -43,7 +43,7 @@ } var specification = new WmsMaterialSpecification(input.Name); - var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input); + var material = ObjectMapper.Map<GetWmsMaterialInput, WmsMaterial>(input); var count = await _wmsmaterialRepository.GetCountAsync(material,input.Filter, specification); var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); @@ -198,7 +198,7 @@ } /// <inheritdoc /> - public async Task ImportAsync(WmsMaterialsImportModel input) + public async Task ImportAsync(WmsMaterialImportModels input) { Check.NotNull(input, nameof(input)); @@ -312,7 +312,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialsInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input) { Check.NotNull(input, nameof(input)); @@ -323,7 +323,7 @@ var specification = new WmsMaterialSpecification(input.Name); - var material = ObjectMapper.Map<GetWmsMaterialsInput, WmsMaterial>(input); + var material = ObjectMapper.Map<GetWmsMaterialInput, WmsMaterial>(input); var list = await _wmsmaterialRepository.GetListAsync(material,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs index 00ee77f..47d5d30 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs @@ -32,7 +32,7 @@ } /// <inheritdoc /> - public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoresInput input) + public virtual async Task<PagedResultDto<WmsStoreDto>> GetListAsync(GetWmsStoreInput input) { Check.NotNull(input, nameof(input)); @@ -42,7 +42,7 @@ } var specification = new WmsStoreSpecification(input.Name); - var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input); + var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input); var count = await _wmsstoreRepository.GetCountAsync(store,input.Filter, specification); var list = await _wmsstoreRepository.GetListAsync(store,input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification); @@ -275,7 +275,7 @@ } /// <inheritdoc /> - public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoresInput input) + public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsStoreInput input) { Check.NotNull(input, nameof(input)); @@ -285,7 +285,7 @@ } var specification = new WmsStoreSpecification(input.Name); - var store = ObjectMapper.Map<GetWmsStoresInput, WmsStore>(input); + var store = ObjectMapper.Map<GetWmsStoreInput, WmsStore>(input); var list = await _wmsstoreRepository.GetListAsync(store, input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter, specification, includeDetails: true); var result = ObjectMapper.Map<List<WmsStore>, List<WmsStoreDto>>(list); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs index ccf02e3..ea6bab1 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs @@ -21,6 +21,6 @@ * into multiple profile classes for a better organization. */ CreateMap<WmsArea, WmsAreaDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsAreaCreateDto, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); - CreateMap<GetWmsAreasInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); + CreateMap<GetWmsAreaInput, WmsArea>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs index 672037e..da75abc 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs @@ -21,6 +21,6 @@ * into multiple profile classes for a better organization. */ CreateMap<WmsContainer, WmsContainerDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsContainerCreateDto, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); - CreateMap<GetWmsContainersInput, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); + CreateMap<GetWmsContainerInput, WmsContainer>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs index 4223d68..03ee08b 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs @@ -1,5 +1,5 @@ using AutoMapper; -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; using CMS.Plugin.HIAWms.Domain.WmsMaterials; using Volo.Abp.ObjectExtending; @@ -21,6 +21,6 @@ * into multiple profile classes for a better organization. */ CreateMap<WmsMaterial, WmsMaterialDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsMaterialCreateDto, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); - CreateMap<GetWmsMaterialsInput, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); + CreateMap<GetWmsMaterialInput, WmsMaterial>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs index dfea33f..eb84bd0 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs @@ -1,5 +1,5 @@ using AutoMapper; -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks; using CMS.Plugin.HIAWms.Domain.WmsMaterials; using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks; diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs index 6bb3cce..6a7bb9c 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs @@ -21,6 +21,6 @@ * into multiple profile classes for a better organization. */ CreateMap<WmsStore, WmsStoreDto>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); CreateMap<WmsStoreCreateDto, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); - CreateMap<GetWmsStoresInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); + CreateMap<GetWmsStoreInput, WmsStore>(MemberList.None).MapExtraProperties(MappingPropertyDefinitionChecks.None); } } diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs index 7efc248..d348673 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs @@ -52,7 +52,7 @@ /// <param name="input">杈撳叆.</param> /// <returns></returns> [HttpGet] - public virtual Task<PagedResultDto<WmsAreaDto>> GetListAsync([FromQuery] GetWmsAreasInput input) + public virtual Task<PagedResultDto<WmsAreaDto>> GetListAsync([FromQuery] GetWmsAreaInput input) { return _wmsareaAppService.GetListAsync(input); } @@ -168,7 +168,7 @@ /// <returns></returns> [HttpGet] [Route("Export")] - public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsAreasInput input) + public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsAreaInput input) { input.MaxResultCount = int.MaxValue; var exportData = await _wmsareaAppService.ExportAsync(input); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs index 1780529..ce144de 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs @@ -52,7 +52,7 @@ /// <param name="input">杈撳叆.</param> /// <returns></returns> [HttpGet] - public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainersInput input) + public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainerInput input) { return _wmscontainerAppService.GetListAsync(input); } @@ -168,7 +168,7 @@ /// <returns></returns> [HttpGet] [Route("Export")] - public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsContainersInput input) + public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsContainerInput input) { input.MaxResultCount = int.MaxValue; var exportData = await _wmscontainerAppService.ExportAsync(input); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs index 830aa5e..1175223 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs @@ -1,6 +1,6 @@ using Ao.Lang; using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; -using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; +using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; using CMS.Plugin.HIAWms.Application.Contracts.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; @@ -53,7 +53,7 @@ /// <returns></returns> [HttpGet] [Route("Page")] - public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialsInput input) + public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input) { return _wmsmaterialAppService.GetListAsync(input); } @@ -148,14 +148,14 @@ stream.Seek(0L, SeekOrigin.Begin); var sheetNames = stream.GetSheetNames(); - var wmsmaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new(); + var wmsmaterialRows = sheetNames.Contains("閰嶇疆") ? MiniExcel.Query<WmsMaterialImportModels.WmsMaterialImportModel>(stream, sheetName: "閰嶇疆").ToList() : new(); if (!wmsmaterialRows.Any()) { throw new UserFriendlyException("璇锋鏌ュ鍏ョ殑琛ㄦ牸"); } - await _wmsmaterialAppService.ImportAsync(new WmsMaterialsImportModel + await _wmsmaterialAppService.ImportAsync(new WmsMaterialImportModels { WmsMaterials = wmsmaterialRows, }); @@ -169,7 +169,7 @@ /// <returns></returns> [HttpGet] [Route("Export")] - public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialsInput input) + public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input) { input.MaxResultCount = int.MaxValue; var exportData = await _wmsmaterialAppService.ExportAsync(input); diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs index e3f25e0..a6a6a7e 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs @@ -52,7 +52,7 @@ /// <param name="input">杈撳叆.</param> /// <returns></returns> [HttpGet] - public virtual Task<PagedResultDto<WmsStoreDto>> GetListAsync([FromQuery] GetWmsStoresInput input) + public virtual Task<PagedResultDto<WmsStoreDto>> GetListAsync([FromQuery] GetWmsStoreInput input) { return _wmsstoreAppService.GetListAsync(input); } @@ -168,7 +168,7 @@ /// <returns></returns> [HttpGet] [Route("Export")] - public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsStoresInput input) + public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsStoreInput input) { input.MaxResultCount = int.MaxValue; var exportData = await _wmsstoreAppService.ExportAsync(input); -- Gitblit v1.9.3