From 4456f43c6c73185a9f7ce46cdcdf94ab2053f02e Mon Sep 17 00:00:00 2001 From: zs <zhousong@weben-smart.com> Date: 周三, 07 5月 2025 14:19:43 +0800 Subject: [PATCH] 修改生成器及出入库记录页面 --- HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs | 372 ++++++++++++++++++++++++++++------------------------- 1 files changed, 196 insertions(+), 176 deletions(-) diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs index 53d4679..fc34c79 100644 --- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs +++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs @@ -1,229 +1,249 @@ -using CmsQueryExtensions.Extension; -using Volo.Abp.Application.Dtos; - -namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; - +using CmsQueryExtensions.Extension; +using Volo.Abp.Application.Dtos; + +namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; + /// <summary> -/// 鍑哄叆搴撹褰曡〃鏌ヨ鍙傛暟 +/// 鍑哄叆搴撹褰曟煡璇㈠弬鏁� /// </summary> -public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto -{ - +public class GetWmsInOutStockRecordInput : 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>(); - } - } + public List<string> searchFormInputAttrs + { + get + { + if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) + { + return str_searchFormInputAttrs.Split(',').ToList(); + } + return new List<string>(); + } + } + + #endregion + + /// <summary> + /// 鍗曟嵁缂栧彿 + /// </summary> + public string OrderNo { get; set; } - #endregion + /// <summary> + /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鍗曟嵁缂栧彿 - /// </summary> - public string OrderNo { get; set; } + /// <summary> + /// 鐗╂枡鍚嶇О + /// </summary> + public string MaterialName { get; set; } - /// <summary> - /// 鍗曟嵁缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鐗╂枡鍚嶇О - /// </summary> - public string MaterialName { get; set; } + /// <summary> + /// 鐗╂枡浠跺彿 + /// </summary> + public string MaterialNo { get; set; } - /// <summary> - /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鐗╂枡浠跺彿 - /// </summary> - public string MaterialNo { get; set; } + /// <summary> + /// 鎿嶄綔绫诲瀷 + /// </summary> + public int? StockType { get; set; } - /// <summary> - /// 鐗╂枡浠跺彿-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; - /// <summary> - /// 鎿嶄綔绫诲瀷 - /// </summary> - public int? StockType { get; set; } + /// <summary> + /// 瀹瑰櫒缂栧彿 + /// </summary> + public string ContainerNo { get; set; } - /// <summary> - /// 鎿嶄綔绫诲瀷-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum StockType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; + /// <summary> + /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 瀹瑰櫒缂栧彿 - /// </summary> - public string ContainerNo { get; set; } + /// <summary> + /// 鏈哄瀷 + /// </summary> + public string MaterialModel { get; set; } - /// <summary> - /// 瀹瑰櫒缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鏈哄瀷 - /// </summary> - public string MaterialModel { get; set; } - - /// <summary> - /// 鏈哄瀷-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 鎿嶄綔鏃堕棿 - /// </summary> - //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� - [HighSearchRangeAttribute] - public string OperateTime { get; set; } + /// <summary> + /// 鎿嶄綔鏃堕棿 + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<string> OperateTime { get; set; } - /// <summary> - /// 澶囨敞 - /// </summary> - public string Remark { get; set; } + /// <summary> + /// 澶囨敞 + /// </summary> + public string Remark { get; set; } - /// <summary> - /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鐗╂枡ID - /// </summary> - public string MaterialId { get; set; } + /// <summary> + /// 鐗╂枡ID + /// </summary> + public string MaterialId { get; set; } - /// <summary> - /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum MaterialId_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鐗╂枡ID-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 浠诲姟鍙� - /// </summary> - public string TaskNo { get; set; } + /// <summary> + /// 浠诲姟鍙� + /// </summary> + public string TaskNo { get; set; } - /// <summary> - /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum TaskNo_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 浠诲姟鍙�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 璧峰搴撲綅 - /// </summary> - public string SourcePlace { get; set; } + /// <summary> + /// 璧峰搴撲綅 + /// </summary> + public string SourcePlace { get; set; } - /// <summary> - /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum SourcePlace_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 璧峰搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 鐩爣搴撲綅 - /// </summary> - public string ToPlace { get; set; } + /// <summary> + /// 鐩爣搴撲綅 + /// </summary> + public string ToPlace { get; set; } - /// <summary> - /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� - /// </summary> - public SearchFilterModeEnum ToPlace_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + /// <summary> + /// 鐩爣搴撲綅-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// - /// </summary> - //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� - [HighSearchRangeAttribute] - public List<string> CreationTime { get; set; } + /// <summary> + /// 鎺掑簭 + /// </summary> + public int? Sort { get; set; } + + /// <summary> + /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// 鏄惁绂佺敤 + /// </summary> + public bool? IsDisabled { get; set; } + + /// <summary> + /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum IsDisabled_FilterMode { get; set; }= SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<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 List<string> LastModificationTime { get; set; } + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<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 List<string> DeletionTime { get; set; } + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<string> DeletionTime { get; set; } - -} + +} -- Gitblit v1.9.3