From afc28acd440fec723ceb22d55600bbd2754e8e23 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周日, 04 5月 2025 10:57:15 +0800 Subject: [PATCH] 22 --- Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs | 317 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 220 insertions(+), 97 deletions(-) diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" index 52e7652..d2143d0 100644 --- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" +++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs" @@ -3,32 +3,32 @@ namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials; -/// <summary> -/// 鐗╂枡鍩虹鏌ヨ鍙傛暟 -/// </summary> +/// <summary> +/// 鐗╂枡鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁� +/// </summary> public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto { - #region 鍏抽敭瀛楁煡璇� + #region 鍏抽敭瀛楁煡璇� - /// <summary> - /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� - /// </summary> + /// <summary> + /// 鍏抽敭瀛楁ā绯婃煡璇紙娉ㄦ剰鏄皬鍐欙紒锛� + /// </summary> public string searchVal { get; set; } - /// <summary> - /// 閫氱敤鏌ヨ閰嶇疆 (1:妯$硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 - /// </summary> + /// <summary> + /// 閫氱敤鏌ヨ閰嶇疆 (1:妯$硦鏌ヨ , 2:绮惧噯鏌ヨ)锛堟敞鎰忔槸灏忓啓锛侊級 + /// </summary> public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - /// <summary> - /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 - /// </summary> + /// <summary> + /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 + /// </summary> [NoAutoQuery] public string str_searchFormInputAttrs { get; set; } - /// <summary> - /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 - /// </summary> + /// <summary> + /// 瀛愭悳绱㈢粍浠朵紶閫掔殑閫氱敤鏌ヨ閰嶇疆鐨勫睘鎬у悕锛堟敞鎰忔槸灏忓啓锛侊級 + /// </summary> public List<string> searchFormInputAttrs { get @@ -43,16 +43,15 @@ #endregion - - /// <summary> - /// Gets or sets the name. - /// </summary> - public string Name { get; set; } - /// <summary> /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛� /// </summary> public string MaterialCode { get; set; } + + /// <summary> + /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 鐗╂枡鍚嶇О @@ -60,9 +59,19 @@ public string MaterialName { get; set; } /// <summary> - /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 鏋氫妇绫诲瀷蹇呴』鏄痠nt绫诲瀷 + /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 /// </summary> public int? PurchaseType { get; set; } + + /// <summary> + /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級 @@ -70,9 +79,19 @@ public int? MaterialType { get; set; } /// <summary> + /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛� /// </summary> public string PrimaryUnit { get; set; } + + /// <summary> + /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛� @@ -80,14 +99,29 @@ public string Standard { get; set; } /// <summary> + /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Standard_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> /// 澶栧緞锛堝崟浣嶏細mm锛� /// </summary> - public decimal? OuterDiameter { get; set; } + public string OuterDiameter { get; set; } + + /// <summary> + /// 澶栧緞锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 澹佸帤锛堝崟浣嶏細mm锛� /// </summary> - public decimal? WallThickness { get; set; } + public string WallThickness { get; set; } + + /// <summary> + /// 澹佸帤锛堝崟浣嶏細mm锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> /// 鏉愯川锛堝锛�304涓嶉攬閽級 @@ -95,14 +129,29 @@ public string MaterialQuality { get; set; } /// <summary> - /// 闀垮害锛堝崟浣嶏細m锛� + /// 鏉愯川锛堝锛�304涓嶉攬閽級-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> - public decimal? Length { get; set; } + public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛� + /// 闀垮害锛堝崟浣嶏細m锛� + /// </summary> + public string Length { get; set; } + + /// <summary> + /// 闀垮害锛堝崟浣嶏細m锛�-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鏄惁涓轰富鏀 /// </summary> public int? IsMainBranch { get; set; } + + /// <summary> + /// 鏄惁涓轰富鏀-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; /// <summary> /// 鐢熶骇宸ュ巶 @@ -110,79 +159,153 @@ public string Factory { get; set; } /// <summary> - /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級 - /// </summary> - public string Certification { get; set; } - - #region 鏌ヨ绛涢�夋潯浠� - /// <summary> - /// Gets or sets the name. - /// </summary> - public SearchFilterModeEnum Name_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; - - /// <summary> - /// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛� - /// </summary> - public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 鐗╂枡鍚嶇О - /// </summary> - public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級 - /// </summary> - public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; - - /// <summary> - /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級 - /// </summary> - public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; - - /// <summary> - /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛� - /// </summary> - public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛� - /// </summary> - public SearchFilterModeEnum Standard_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 澶栧緞锛堝崟浣嶏細mm锛� - /// </summary> - public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 澹佸帤锛堝崟浣嶏細mm锛� - /// </summary> - public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 鏉愯川锛堝锛�304涓嶉攬閽級 - /// </summary> - public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 闀垮害锛堝崟浣嶏細m锛� - /// </summary> - public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - - /// <summary> - /// 鏄惁涓轰富鏀锛坱rue: 涓绘敮绠�, false: 闈炰富鏀锛� - /// </summary> - public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; - - /// <summary> - /// 鐢熶骇宸ュ巶 + /// 鐢熶骇宸ュ巶-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum Factory_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; /// <summary> - /// 璇佷功缂栧彿锛堝锛氬帇鍔涘鍣ㄨ璇侊級 + /// 璇佷功缂栧彿 + /// </summary> + public string Certification { get; set; } + + /// <summary> + /// 璇佷功缂栧彿-鏌ヨ鍏崇郴杩愮畻绗� /// </summary> public SearchFilterModeEnum Certification_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; - #endregion + + /// <summary> + /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField1 { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum RedundantField1_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField2 { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum RedundantField2_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ�� + /// </summary> + public string RedundantField3 { get; set; } + + /// <summary> + /// 鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum RedundantField3_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鎺掑簭 + /// </summary> + public int? Sort { get; set; } + + /// <summary> + /// 鎺掑簭-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Sort_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// 澶囨敞 + /// </summary> + public string Remark { get; set; } + + /// <summary> + /// 澶囨敞-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// 鏄惁绂佺敤 + /// </summary> + public bool? IsDisabled { get; set; } + + /// <summary> + /// 鏄惁绂佺敤-鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum IsDisabled_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// + /// </summary> + public string ConcurrencyStamp { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum ConcurrencyStamp_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<string> CreationTime { get; set; } + + + /// <summary> + /// + /// </summary> + public string CreatorId { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<string> LastModificationTime { get; set; } + + + /// <summary> + /// + /// </summary> + public string LastModifierId { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// + /// </summary> + public bool? IsDeleted { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ; + + /// <summary> + /// + /// </summary> + public string DeleterId { get; set; } + + /// <summary> + /// -鏌ヨ鍏崇郴杩愮畻绗� + /// </summary> + public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.妯$硦鏌ヨ; + + /// <summary> + /// + /// </summary> + //琛ㄧず鏄� 楂樼骇鏌ヨ鑼冨洿鏌ヨ鐗规�� + [HighSearchRangeAttribute] + public List<string> DeletionTime { get; set; } + + + } -- Gitblit v1.9.3