Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-13 0cd95d98fdf7ed22d53398242feb2a3ca185cf09

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsMaterial/GetWmsMaterialInput.cs

@@ -1,3 +1,4 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos; 
 
@@ -64,54 +65,24 @@
        public SearchFilterModeEnum IsValid_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ•°é‡
        /// æ˜¯å¦è‡ªäº§
        /// </summary>
        public bool?  IsSelfMade { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// æ˜¯å¦è‡ªäº§-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsSelfMade_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  PurchaseType { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// æ•°é‡
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™-查询关系运算符 
        /// æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  MaterialType { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
@@ -122,6 +93,46 @@
        /// è‡ªæœ‰æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SelfNum_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// å¯ç©ºé•¿åº¦
        /// </summary>
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// å¯ç©ºé•¿åº¦-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public PurchaseTypeEnum?  PurchaseType { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum PurchaseType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum?  MaterialType { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
@@ -142,16 +153,6 @@
        /// è§„æ ¼/标准（如：GB/T 8163-2018）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Standard_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        public decimal?  NullLength { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum NullLength_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤–径（单位：mm）
@@ -196,7 +197,7 @@
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public int?  IsMainBranch { get; set; }
        public YesNoEnum?  IsMainBranch { get; set; }

        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡-查询关系运算符 
@@ -254,11 +255,41 @@
        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>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> CreationTime { get; set; }
        public string CreationTime { get; set; }


        /// <summary>
@@ -276,7 +307,7 @@
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> LastModificationTime { get; set; }
        public string LastModificationTime { get; set; }


        /// <summary>
@@ -290,16 +321,6 @@
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æ˜¯å¦åˆ é™¤
        /// </summary>
        public bool?  IsDeleted { get; set; }
@@ -308,16 +329,6 @@
        /// æ˜¯å¦åˆ é™¤-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤äººID
@@ -330,21 +341,11 @@
        public SearchFilterModeEnum DeleterId_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> DeletionTime { get; set; }
        public string DeletionTime { get; set; }


        /// <summary>
@@ -366,6 +367,26 @@
        /// ä¿®æ”¹äºº-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum LastModifierName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string DeleteRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ‰©å±•å­—段1
@@ -396,26 +417,6 @@
        /// æ‰©å±•å­—段3-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ExtraField3_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œå¤‡æ³¨
        /// </summary>
        public string OperationRemark { get; set; }

        /// <summary>
        /// æ“ä½œå¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OperationRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨
        /// </summary>
        public string DeleteRemark { get; set; }

        /// <summary>
        /// åˆ é™¤å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleteRemark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

 
}