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; 
 
@@ -54,6 +55,46 @@
        public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ˜¯å¦æœ‰æ•ˆç‰©æ–™
        /// </summary>
        public bool?  IsValid { get; set; }

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

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

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

        /// <summary>
        /// æ•°é‡
        /// </summary>
        public int?  Num { get; set; }

        /// <summary>
        /// æ•°é‡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Num_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

        /// <summary>
        /// è‡ªæœ‰æ•°é‡
        /// </summary>
        public int?  SelfNum { get; set; }

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

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
@@ -64,9 +105,19 @@
        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 int?  PurchaseType { get; set; }
        public PurchaseTypeEnum?  PurchaseType { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
@@ -76,7 +127,7 @@
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  MaterialType { get; set; }
        public MaterialTypeEnum?  MaterialType { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
@@ -146,7 +197,7 @@
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public int?  IsMainBranch { get; set; }
        public YesNoEnum?  IsMainBranch { get; set; }

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


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


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


        /// <summary>
@@ -318,6 +369,26 @@
        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
        /// </summary>
        public string ExtraField1 { get; set; }