From 792f2462a2ce5141f72bee69fe9ec003856905a1 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 14 5月 2025 14:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasExportModel.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/GetWmsAreaInput.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerUpdateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesImportModel.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsAreaAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 2
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx | 11 ++
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersExportModel.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/ExportWmsMaterialModel.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresImportModel.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateOrUpdateDtoBase.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreCreateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoresExportModel.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialImportModels.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreasImportModel.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/GetWmsPlacesInput.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesExportModel.cs | 2
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.Contracts/Dtos/WmsPlace/WmsPlaceDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs | 10 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs | 3
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateOrUpdateDtoBase.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreUpdateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/GetWmsStoreInput.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs | 10 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaUpdateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs | 2
HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts | 8
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs | 10 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialCreateOrUpdateDtoBase.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsCommonAppService.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsStoreAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialInfoAutoMapperProfile.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerCreateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialExportModel.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsContainerAppService.cs | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsStore/WmsStoreDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateOrUpdateDtoBase.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsMaterialAppService.cs | 8
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialUpdateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainerDto.cs | 2
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx | 18 +++
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/WmsContainersImportModel.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateOrUpdateDtoBase.cs | 2
HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx | 6
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts | 5 +
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialAutoMapperProfile.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceUpdateDto.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialStockAutoMapperProfile.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs | 10 +-
HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsArea/WmsAreaCreateDto.cs | 2
71 files changed, 163 insertions(+), 128 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
index 9e583a7..6fab32f 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsMaterialStock/Views/Pages/WmsMaterialStock/WmsMaterialStock.tsx
@@ -350,7 +350,7 @@
<div class={styles.headerContent}>
<div class={styles.header}>
<IconButton
- v-permission="wmsMaterialStockDetail-add"
+ v-permission="wmsMaterialStock-add"
icon="add-p"
onClick={onAddWmsMaterialStock}
type="primary"
@@ -374,7 +374,7 @@
</el-upload> */}
<IconButton
- v-permission="wmsMaterialStockDetail-output"
+ v-permission="wmsMaterialStock-output"
icon="out"
onClick={handleExport}
>
@@ -408,7 +408,7 @@
閲嶇疆
</IconButton> */}
<IconButton
- v-permission="wmsMaterialStock-add"
+ v-permission="wmsMaterialStockDetail-hightQuery"
icon="search"
onClick={onAdvancedQuery}
type="primary"
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
index c3b230a..75bdf96 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsPlaceDrawer.tsx
@@ -18,6 +18,7 @@
getAreaAreaDataList,
getWmsEnumData,
} from '@/widgets/HIAWms/Models/Service/WmsMaterialDrawer'
+import { lang } from '@/libs/Language/Language'
export const useWmsPlaceDrawer = (props: any, ctx?: any) => {
const wmsPlaceDrawer = injectModel<WmsPlaceDrawer>('wmsPlaceDrawer')
@@ -137,6 +138,19 @@
],
},
{
+ label: '鏄惁绂佺敤',
+ prop: 'isDisabled',
+ el: 'select',
+ options: [
+ { label: '鏄�', value: true },
+ { label: '鍚�', value: false },
+ ],
+ placeholder: '璇烽�夋嫨鏄惁绂佺敤',
+ rules: [
+ { required: true, message: '鏄惁绂佺敤涓嶈兘涓虹┖', trigger: 'change' },
+ ],
+ },
+ {
label: '鏈�澶у簱瀛樻暟',
prop: 'maxStockNumber',
el: (props: any, { attrs }: SetupContext) => {
@@ -203,11 +217,13 @@
emptyContainer: formData.value.emptyContainer, // 鏄惁绌烘墭
maxStockNumber: formData.value.maxStockNumber, // 鏈�澶у簱瀛樻暟
remark: formData.value.remark, // 澶囨敞
+ isDisabled: formData.value.isDisabled, // 鏄惁绂佺敤
}
if (!current.value) {
await wmsPlaceDrawer.addWmsPlace(data)
} else {
const id = current.value.id
+ console.log(data, 'data')
await wmsPlaceDrawer.updateWmsPlace(id, data)
}
ElMessage.success('淇濆瓨鎴愬姛')
@@ -279,6 +295,7 @@
emptyContainer: res.emptyContainer, // 鏄惁绌烘墭
remark: res.remark, // 澶囨敞
maxStockNumber: res.maxStockNumber, // 鏈�澶у簱瀛樻暟
+ isDisabled: res.isDisabled, // 鏄惁绂佺敤
id: res.id, // 涓婚敭ID
}
updateCheckData()
@@ -290,6 +307,7 @@
aisle: 1, // 宸烽亾
layerNo: 1, // 灞�
islock: 0, // 鏄惁閿佸畾
+ isDisabled: false, // 鏄惁绂佺敤
emptyContainer: 0, // 鏄惁绌烘墭
}
updateCheckData()
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
index 1a331aa..c76c741 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/Config.ts
@@ -50,6 +50,11 @@
field: 'emptyContainerDesc',
title: '鏄惁绌烘墭',
},
+
+ {
+ field: 'isDisabled',
+ title: '鏄惁绂佺敤',
+ },
{
field: 'remark',
title: '澶囨敞',
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
index ddd7982..1a09758 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Views/Pages/WmsPlace/WmsPlace.tsx
@@ -205,6 +205,17 @@
isHidePagination={isHidePagination}
pageSize={50}
v-slots={{
+ isDisabled: ({ row }: any) => {
+ return (
+ <div>
+ {row.isDisabled != null
+ ? row.isDisabled
+ ? '鏄�'
+ : '鍚�'
+ : '-'}
+ </div>
+ )
+ },
name: ({ row }: any) => {
return row?.name ? (
<TdButton
diff --git a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
index f6febed..9b84601 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsTask/Views/Pages/WmsTask/Config.ts
@@ -72,10 +72,10 @@
field: 'mutableParam1',
title: '鍨嬪彿',
},
- // {
- // field: 'mutableParam2',
- // title: '鍙彉鍙橀噺2',
- // },
+ {
+ field: 'mutableParam2',
+ title: '鍘熸枡鏍囪瘑',
+ },
// {
// field: 'mutableParam3',
// title: '鍙彉鍙橀噺3',
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 87%
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..d7f0f26 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
@@ -1,12 +1,12 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
/// <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 83%
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
index eaa43d2..b40149c 100644
--- 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
@@ -1,4 +1,4 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
/// <summary>
/// WmsArea鍒涘缓鍙傛暟瀵硅薄
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 96%
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
index 632c8e7..e304049 100644
--- 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
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
/// <summary>
/// WmsArea鍒涘缓鎴栨洿鏂板熀绫�
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 97%
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
index 4434b11..2cd7759 100644
--- 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
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
/// <summary>
/// WmsArea鏁版嵁鍙傛暟瀵硅薄
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 81%
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
index 972ed36..bb97260 100644
--- 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
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
/// <summary>
/// WmsArea鏇存柊鍙傛暟瀵硅薄
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 97%
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
index d0d841b..3a6459a 100644
--- 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
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea
{
/// <summary>
/// WmsAreas瀵煎嚭妯″瀷
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 90%
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
index ef41a7b..021ee08 100644
--- 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
@@ -1,6 +1,6 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreasExportModel;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreasExportModel;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea
{
/// <summary>
/// WmsAreas瀵煎叆妯″瀷
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 89%
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..381554b 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
@@ -1,12 +1,12 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
/// <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 98%
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
index d8e5d03..006e93c 100644
--- 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
@@ -1,4 +1,4 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
/// <summary>
/// WmsContainer鍒涘缓鍙傛暟瀵硅薄
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 99%
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
index b436229..4d3f9df 100644
--- 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
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
/// <summary>
/// WmsContainer鍒涘缓鎴栨洿鏂板熀绫�
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 99%
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
index 12519dc..ec7f090 100644
--- 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
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
/// <summary>
/// WmsContainer鏁版嵁鍙傛暟瀵硅薄
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 98%
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
index 804744b..e28e307 100644
--- 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
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
/// <summary>
/// WmsContainer鏇存柊鍙傛暟瀵硅薄
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 99%
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
index f88d958..6ffd131 100644
--- 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
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer
{
/// <summary>
/// WmsContainers瀵煎嚭妯″瀷
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 95%
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
index 5f1cdc0..6018f4b 100644
--- 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
@@ -1,6 +1,6 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers.WmsContainersExportModel;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer.WmsContainersExportModel;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer
{
/// <summary>
/// WmsContainers瀵煎叆妯″瀷
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/WmsPlaces/GetWmsPlacesInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/GetWmsPlacesInput.cs
similarity index 95%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/GetWmsPlacesInput.cs
index 7aeea9b..01a0001 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/GetWmsPlacesInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/GetWmsPlacesInput.cs
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
/// <summary>
/// WmsPlace鏌ヨ鍙傛暟瀵硅薄
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateDto.cs
similarity index 83%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateDto.cs
index 8730f57..f9800bc 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateDto.cs
@@ -1,4 +1,4 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
/// <summary>
/// WmsPlace鍒涘缓鍙傛暟瀵硅薄
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateOrUpdateDtoBase.cs
similarity index 97%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateOrUpdateDtoBase.cs
index 1581475..a5f6bf1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceCreateOrUpdateDtoBase.cs
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
/// <summary>
/// WmsPlace鍒涘缓鎴栨洿鏂板熀绫�
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceDto.cs
similarity index 97%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceDto.cs
index 5a89f52..8f08b27 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceDto.cs
@@ -3,7 +3,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
/// <summary>
/// WmsPlace鏁版嵁鍙傛暟瀵硅薄
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceUpdateDto.cs
similarity index 81%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceUpdateDto.cs
index 31432f2..b4c17c6 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlaceUpdateDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlaceUpdateDto.cs
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
/// <summary>
/// WmsPlace鏇存柊鍙傛暟瀵硅薄
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesExportModel.cs
similarity index 98%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesExportModel.cs
index 9c22122..057af5d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesExportModel.cs
@@ -1,7 +1,7 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using MiniExcelLibs.Attributes;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace
{
/// <summary>
/// WmsPlaces瀵煎嚭妯″瀷
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesImportModel.cs
similarity index 89%
rename from HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs
rename to HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesImportModel.cs
index d6c86eb..a480f7a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlaces/WmsPlacesImportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsPlace/WmsPlacesImportModel.cs
@@ -1,6 +1,6 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlacesExportModel;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlacesExportModel;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace
{
/// <summary>
/// WmsPlaces瀵煎叆妯″瀷
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 78%
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..99714e1 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
@@ -1,11 +1,11 @@
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
/// <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 83%
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
index bfb8a5d..ffc5b37 100644
--- 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
@@ -1,4 +1,4 @@
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
/// <summary>
/// WmsStore鍒涘缓鍙傛暟瀵硅薄
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 93%
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
index 216bb01..700573d 100644
--- 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
@@ -1,6 +1,6 @@
using Volo.Abp.Application.Dtos;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
/// <summary>
/// WmsStore鍒涘缓鎴栨洿鏂板熀绫�
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 96%
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
index 314626d..f03ea26 100644
--- 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
@@ -1,7 +1,7 @@
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
/// <summary>
/// WmsStore鏁版嵁鍙傛暟瀵硅薄
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 81%
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
index f679a99..573c1e4 100644
--- 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
@@ -1,6 +1,6 @@
using Volo.Abp.Domain.Entities;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
/// <summary>
/// WmsStore鏇存柊鍙傛暟瀵硅薄
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 96%
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
index fac0db6..6a64bab 100644
--- 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
@@ -1,6 +1,6 @@
using MiniExcelLibs.Attributes;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore
{
/// <summary>
/// WmsStores瀵煎嚭妯″瀷
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 89%
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
index 42194fa..9849a9d 100644
--- 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
@@ -1,6 +1,6 @@
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores.WmsStoresExportModel;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore.WmsStoresExportModel;
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore
{
/// <summary>
/// WmsStores瀵煎叆妯″瀷
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..ddc91e8 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
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -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/IWmsCommonAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsCommonAppService.cs
index 23708ad..44c546f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsCommonAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsCommonAppService.cs
@@ -1,5 +1,5 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using System;
using System.Collections.Generic;
using System.Linq;
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..2ac6e48 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
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -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/IWmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
index 06ef88c..5878c0b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs
@@ -1,10 +1,10 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services
{
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/IWmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs
index 04c1832..30d5e01 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsPlaceAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
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..8de7a6a 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
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using Volo.Abp.Application.Services;
namespace CMS.Plugin.HIAWms.Application.Contracts.Services;
@@ -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..f69b16b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsAreaAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.Shared;
@@ -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/WmsCommonAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs
index 51dd062..177cf9a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsCommonAppService.cs
@@ -1,6 +1,6 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
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..ea822b8 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsContainerAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsContainers;
@@ -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/WmsEnumAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
index 92399d4..6b9e8d9 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs
@@ -1,6 +1,6 @@
锘縰sing CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
@@ -13,8 +13,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Application.Implements
{
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/WmsPlaceAppService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
index 2615a9d..69f8c26 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsPlaceAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsPlaces;
@@ -104,6 +104,7 @@
wmsplace.RedundantField2 = input.RedundantField2;
wmsplace.RedundantField3 = input.RedundantField3;
wmsplace.Remark = input.Remark;
+ wmsplace.IsDisabled = input.IsDisabled;
await _wmsplaceRepository.UpdateAsync(wmsplace);
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..aa83a4a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsStoreAppService.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using CMS.Plugin.HIAWms.Domain.Shared;
@@ -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..ec602cb 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsAreaAutoMapperProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using Volo.Abp.ObjectExtending;
@@ -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..c23f597 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsContainerAutoMapperProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using Volo.Abp.ObjectExtending;
@@ -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/WmsMaterialInfoAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialInfoAutoMapperProfile.cs
index 3c94602..267831a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialInfoAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsMaterialInfoAutoMapperProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialInfos;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Domain.WmsMaterialInfos;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using Volo.Abp.ObjectExtending;
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/WmsPlaceAutoMapperProfile.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs
index 85c14d0..b44769d 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsPlaceAutoMapperProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using Volo.Abp.ObjectExtending;
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..0534de3 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application/MapperProfiles/WmsStoreAutoMapperProfile.cs
@@ -1,5 +1,5 @@
using AutoMapper;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using Volo.Abp.ObjectExtending;
@@ -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/Apis/IHIAWmsExternalApi.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs
index 507d8c0..a39aec4 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Apis/IHIAWmsExternalApi.cs
@@ -1,4 +1,4 @@
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using WebApiClientCore.Attributes;
namespace CMS.Plugin.HIAWms.Apis
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs
index 7efc248..11eebbc 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsAreaController.cs
@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -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..8d459cf 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -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/WmsEnumController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
index 41c7f75..ab3ba2c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsEnumController.cs
@@ -1,7 +1,7 @@
锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
@@ -9,8 +9,8 @@
using Microsoft.AspNetCore.Mvc;
using System;
using System.Web;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsAreas.WmsAreaCreateOrUpdateDtoBase;
-using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces.WmsPlaceCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsArea.WmsAreaCreateOrUpdateDtoBase;
+using static CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace.WmsPlaceCreateOrUpdateDtoBase;
namespace CMS.Plugin.HIAWms.Controller
{
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs
index 0be5e48..0f608c2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsInsStockController.cs
@@ -1,6 +1,6 @@
锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.BindInstockDto;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.MaterialManagement.Abstractions.Models;
using Microsoft.AspNetCore.Mvc;
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/WmsPlaceController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs
index de889ce..31b5f93 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsPlaceController.cs
@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlaces;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsPlace;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs
index e3f25e0..4b2a5ec 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsStoreController.cs
@@ -1,6 +1,6 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStore;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
@@ -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);
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs
index fcc707e..0d4ae3c 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/ProjectService/HIAWmsProjectService.cs
@@ -1,6 +1,6 @@
using CMS.Plugin.FlowManagement.Abstractions.FlowBusiness;
using CMS.Plugin.HIAWms.Apis;
-using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainers;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Jobs;
using CMS.Project;
--
Gitblit v1.9.3