From 0c9c9e0581041ea91845434fb02d93dab1649047 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 04 5月 2025 14:37:13 +0800
Subject: [PATCH] 222

---
 Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterials/GetWmsMaterialsInput.cs |  326 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 222 insertions(+), 104 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 a72053f..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"
@@ -1,39 +1,34 @@
-using CMS.Plugin.HIAWms.Domain.Shared.Enums;
 using CmsQueryExtensions.Extension;
 using Volo.Abp.Application.Dtos;
 
 namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterials;
 
-/// <summary>
-/// WmsMaterial鏌ヨ鍙傛暟瀵硅薄
-/// </summary>
+/// <summary> 
+/// 鐗╂枡鍩虹淇℃伅琛ㄦ煡璇㈠弬鏁� 
+/// </summary> 
 public class GetWmsMaterialsInput : ExtensiblePagedAndSortedResultRequestDto
 {
-    ///// <summary>
-    ///// Gets or sets the filter.
-    ///// </summary>
-    //public string Filter { get; set; }
 
-    #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
@@ -48,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>
     /// 鐗╂枡鍚嶇О
@@ -65,14 +59,29 @@
     public string MaterialName { get; set; }
 
     /// <summary>
+    /// 鐗╂枡鍚嶇О-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
     /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級
     /// </summary>
-    public PurchaseTypeEnum? PurchaseType { get; set; }
+    public int? PurchaseType { get; set; }
+
+    /// <summary>
+    /// 閲囪喘绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum PurchaseType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
     /// <summary>
     /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級
     /// </summary>
-    public MaterialTypeEnum? MaterialType { get; set; }
+    public int? MaterialType { get; set; }
+
+    /// <summary>
+    /// 鐗╂枡绫诲瀷锛堟灇涓惧�硷級-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.绮惧噯鏌ヨ;
 
     /// <summary>
     /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�
@@ -80,19 +89,39 @@
     public string PrimaryUnit { get; set; }
 
     /// <summary>
+    /// 涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�-鏌ヨ鍏崇郴杩愮畻绗� 
+    /// </summary>
+    public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; } = SearchFilterModeEnum.妯＄硦鏌ヨ;
+
+    /// <summary>
     /// 瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�
     /// </summary>
     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涓嶉攬閽級
@@ -100,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 YesNoEnum? IsMainBranch { get; set; }
+    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>
     /// 鐢熶骇宸ュ巶
@@ -115,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