From 0e4ee9eeb9552babb6541d7be3b60400ce69df79 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周五, 16 5月 2025 12:00:35 +0800
Subject: [PATCH] 报错解决
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs | 452 +++++++++++++++++++++++++-------------------------
HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial导出模板.xlsx | 0
HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs | 20 +-
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs | 1
HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts | 25 ++
6 files changed, 262 insertions(+), 242 deletions(-)
diff --git a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
index d99653e..15d52c0 100644
--- a/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
+++ b/HIAWms/hiawms_web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx
@@ -34,6 +34,7 @@
const disabled = ref(false)
+ const materialTypeList = ref([])
const current = computed(() => {
return props.row || null
})
@@ -404,6 +405,9 @@
purchaseType_FilterMode: formData.value.purchaseType_FilterMode || '',
materialTypeCode: formData.value.materialTypeCode || '',
materialType_FilterMode: formData.value.materialType_FilterMode || '',
+ materialTypeDesc: materialTypeList.value.find(
+ (item) => item.materialTypeCode === formData.value.materialTypeCode
+ )?.materialTypeDesc,
primaryUnit: formData.value.primaryUnit || '',
primaryUnit_FilterMode: formData.value.primaryUnit_FilterMode || '',
standard: formData.value.standard || '',
@@ -542,6 +546,8 @@
const materialTypeEnum = await wmsMaterialDrawer.getMaterialType()
updateFormTypeOptions('materialTypeCode', materialTypeEnum)
+ materialTypeList.value = materialTypeEnum
+
const purchaseTypeEnum = await wmsMaterialDrawer.getWmsEnumData({
EnumName: 'PurchaseTypeEnum',
})
diff --git a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
index a23713e..79d701b 100644
--- a/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
+++ b/HIAWms/hiawms_web/src/widgets/WmsStoreInfo/Controllers/WmsAreaDrawer.ts
@@ -17,6 +17,7 @@
*/
const initiateData: Ref<Record<string, any>> = ref({})
const formData = ref<Record<string, any>>({})
+ const storeList = ref([])
// ref
const formRef = ref()
const disabled = ref(false)
@@ -75,10 +76,16 @@
label: '浠撳簱浠ｇ爜',
prop: 'storeCode',
el: 'select',
+ placeholder: '璇烽�夋嫨浠撳簱浠ｇ爜',
options: [],
- // storeValueAndLabel: true,
- placeholder: '璇疯緭鍏ヤ粨搴撲唬鐮�',
},
+ // {
+ // label: '浠撳簱浠ｇ爜',
+ // prop: 'storeCode',
+ // el: 'select',
+ // options: [],
+ // placeholder: '璇疯緭鍏ヤ粨搴撲唬鐮�',
+ // },
// {
// label: '浠撳簱鍚嶇О',
// prop: 'storeName',
@@ -145,8 +152,10 @@
areaDesc: formData.value.areaDesc, // 鎻忚堪
areaStatus: formData.value.areaStatus, // 搴撳尯鐘舵��
areaType: formData.value.areaType, // 搴撳尯绫诲瀷
- storeCode: formData.value.storeCode.areaCode, // 浠撳簱浠ｇ爜
- storeName: formData.value.storeCode.storeName, // 浠撳簱鍚嶇О
+ storeCode: formData.value.storeCode, // 浠撳簱浠ｇ爜
+ storeName: storeList.value.find(
+ (item) => item.storeCode === formData.value.storeCode
+ )?.materialTypeDesc, // 浠撳簱鍚嶇О
remark: formData.value.remark, // 澶囨敞
}
if (!current.value) {
@@ -198,8 +207,12 @@
})
updateFormItemOptions('areaType', areaTypeEnum)
- const storeList = await getStoreDataList()
- updateFormStoreOptions('storeCode', storeList)
+ const stores = await getStoreDataList()
+ storeList.value = stores
+ console.log('storeList', stores)
+ updateFormStoreOptions('storeCode', stores)
+
+ console.log(formItems)
if (current.value) {
const res = await wmsAreaDrawer.getWmsAreaDetail(current.value)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs
index 4eb1ab8..0867aa2 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsContainer/GetWmsContainerInput.cs
@@ -1,292 +1,292 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
-using CmsQueryExtensions.Extension;
-using Volo.Abp.Application.Dtos;
-
-namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
-
+using CMS.Plugin.HIAWms.Domain.Shared.Enums;
+using CmsQueryExtensions.Extension;
+using Volo.Abp.Application.Dtos;
+
+namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsContainer;
+
/// <summary>
/// 鎵樼洏绠＄悊鏌ヨ鍙傛暟
/// </summary>
-public class GetWmsContainerInput : ExtensiblePagedAndSortedResultRequestDto
-{
-
+public class GetWmsContainerInput : ExtensiblePagedAndSortedResultRequestDto
+{
+
#region 鍏抽敭瀛楁煡璇�
-
+
/// <summary>
/// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛�
/// </summary>
- public string searchVal { get; set; }
-
+ public string searchVal { get; set; }
+
/// <summary>
/// 閫氱敤鏌ヨ閰嶇疆 (1:妯＄硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
-
+ public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
/// <summary>
/// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- [NoAutoQuery]
- public string str_searchFormInputAttrs { get; set; }
+ [NoAutoQuery]
+ public string str_searchFormInputAttrs { get; set; }
/// <summary>
/// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級
/// </summary>
- public List<string> searchFormInputAttrs
- {
- get
- {
- if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
- {
- return str_searchFormInputAttrs.Split(',').ToList();
- }
- return new List<string>();
- }
- }
-
- #endregion
-
- /// <summary>
- /// 鎵樼洏缂栧彿
- /// </summary>
- public string ContainerNo { get; set; }
+ public List<string> searchFormInputAttrs
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
+ {
+ return str_searchFormInputAttrs.Split(',').ToList();
+ }
+ return new List<string>();
+ }
+ }
- /// <summary>
- /// 鎵樼洏缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ #endregion
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public ContainerTypeEnum? ContainerType { get; set; }
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
+ public string ContainerNo { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ContainerType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 鎵樼洏缂栧彿-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鎵樼洏鐘舵��
- /// </summary>
- public ContainerStatusEnum? ContainerStatus { get; set; }
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
+ public ContainerTypeEnum? ContainerType { get; set; }
- /// <summary>
- /// 鎵樼洏鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ContainerStatus_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 鎵樼洏绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ContainerType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 闀垮害
- /// </summary>
- public decimal? SpecLength { get; set; }
+ /// <summary>
+ /// 鎵樼洏鐘舵��
+ /// </summary>
+ public ContainerStatusEnum? ContainerStatus { get; set; }
- /// <summary>
- /// 闀垮害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SpecLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 鎵樼洏鐘舵��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ContainerStatus_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 瀹藉害
- /// </summary>
- public decimal? SpecWidth { get; set; }
+ /// <summary>
+ /// 闀垮害
+ /// </summary>
+ public decimal? SpecLength { get; set; }
- /// <summary>
- /// 瀹藉害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SpecWidth_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 闀垮害-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SpecLength_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 楂樺害
- /// </summary>
- public decimal? SpecHeight { get; set; }
+ /// <summary>
+ /// 瀹藉害
+ /// </summary>
+ public decimal? SpecWidth { get; set; }
- /// <summary>
- /// 楂樺害-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum SpecHeight_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 瀹藉害-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SpecWidth_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 闄愰暱
- /// </summary>
- public decimal? LimitLength { get; set; }
+ /// <summary>
+ /// 楂樺害
+ /// </summary>
+ public decimal? SpecHeight { get; set; }
- /// <summary>
- /// 闄愰暱-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LimitLength_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 楂樺害-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum SpecHeight_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 闄愬
- /// </summary>
- public decimal? LimitWidth { get; set; }
+ /// <summary>
+ /// 闄愰暱
+ /// </summary>
+ public decimal? LimitLength { get; set; }
- /// <summary>
- /// 闄愬-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LimitWidth_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 闄愰暱-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LimitLength_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 闄愰珮
- /// </summary>
- public decimal? LimitHeight { get; set; }
+ /// <summary>
+ /// 闄愬
+ /// </summary>
+ public decimal? LimitWidth { get; set; }
- /// <summary>
- /// 闄愰珮-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LimitHeight_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 闄愬-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LimitWidth_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 杞介噸涓婇檺
- /// </summary>
- public decimal? MaxWeight { get; set; }
+ /// <summary>
+ /// 闄愰珮
+ /// </summary>
+ public decimal? LimitHeight { get; set; }
- /// <summary>
- /// 杞介噸涓婇檺-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaxWeight_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 闄愰珮-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LimitHeight_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- public int? ExceptionNumber { get; set; }
+ /// <summary>
+ /// 杞介噸涓婇檺
+ /// </summary>
+ public decimal? MaxWeight { get; set; }
- /// <summary>
- /// 寮傚父鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum ExceptionNumber_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 杞介噸涓婇檺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaxWeight_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 鐗╂枡鏁伴噺
- /// </summary>
- public int? MaterialNumber { get; set; }
+ /// <summary>
+ /// 寮傚父鏁伴噺
+ /// </summary>
+ public int? ExceptionNumber { get; set; }
- /// <summary>
- /// 鐗╂枡鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum MaterialNumber_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 寮傚父鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum ExceptionNumber_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField1 { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏁伴噺
+ /// </summary>
+ public int? MaterialNumber { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField1_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鐗╂枡鏁伴噺-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum MaterialNumber_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField2 { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField1 { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField2_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField1_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
- /// </summary>
- public string RedundantField3 { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField2 { get; set; }
- /// <summary>
- /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField2_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public int? Sort { get; set; }
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��
+ /// </summary>
+ public string RedundantField3 { get; set; }
- /// <summary>
- /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum RedundantField3_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Remark { get; set; }
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public int? Sort { get; set; }
- /// <summary>
- /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public bool? IsDisabled { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
- /// <summary>
- /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public string CreationTime { get; set; }
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
+
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string CreationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string CreatorId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string CreatorId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public string LastModificationTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string LastModificationTime { get; set; }
- /// <summary>
- ///
- /// </summary>
- public string LastModifierId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string LastModifierId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- public bool? IsDeleted { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public bool? IsDeleted { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- public string DeleterId { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ public string DeleterId { get; set; }
- /// <summary>
- /// -鏌ヨ鍏崇郴杩愮畻绗�
- /// </summary>
- public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.妯＄硦鏌ヨ;
+ /// <summary>
+ /// -鏌ヨ鍏崇郴杩愮畻绗�
+ /// </summary>
+ public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
- /// <summary>
- ///
- /// </summary>
- //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
- [HighSearchRangeAttribute]
- public string DeletionTime { get; set; }
+ /// <summary>
+ ///
+ /// </summary>
+ //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规��
+ [HighSearchRangeAttribute]
+ public string DeletionTime { get; set; }
-
-}
+
+}
\ No newline at end of file
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs
index f6dab7c..a163592 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/WmsMaterialDto.cs
@@ -43,19 +43,19 @@
}
}
/// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
+ /// 鐗╂枡绫诲瀷缂栫爜
/// </summary>
public string MaterialTypeCode { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
- /// </summary>
- public string MaterialTypeDesc { get; set; }
-
- /// <summary>
- /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
- /// </summary>
- public string? PrimaryUnit { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷鎻忚堪
+ /// </summary>
+ public string MaterialTypeDesc { get; set; }
+
+ /// <summary>
+ /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
+ /// </summary>
+ public string? PrimaryUnit { get; set; }
/// <summary>
/// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
index 8d459cf..59917f1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/WmsContainerController.cs
@@ -52,6 +52,7 @@
/// <param name="input">杈撳叆.</param>
/// <returns></returns>
[HttpGet]
+ [Route("Page")]
public virtual Task<PagedResultDto<WmsContainerDto>> GetListAsync([FromQuery] GetWmsContainerInput input)
{
return _wmscontainerAppService.GetListAsync(input);
diff --git "a/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx" "b/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
index 16a561b..6de1ef8 100644
--- "a/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
+++ "b/HIAWms/server/src/CMS.Plugin.HIAWms/Resources/Templates/WmsMaterial\345\257\274\345\207\272\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3