222

schangxiang@126.com

2025-05-06 bbd8b2922a59500444f70f0c11b4c76f63bd07f9

222

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

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

@@ -1,311 +1,301 @@
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨æŸ¥è¯¢å‚æ•° 
/// </summary> 
public class GetWmsMaterialInput : ExtensiblePagedAndSortedResultRequestDto
{

public class GetWmsMaterialInput : 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 MaterialCode { get; set; }

    #endregion
        /// <summary>
        /// ç‰©æ–™ç¼–码（唯一标识）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialCode_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// ç‰©æ–™ç¼–码（唯一标识）
    /// </summary>
    public string MaterialCode { get; set; }
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

    /// <summary>
    /// ç‰©æ–™ç¼–码（唯一标识）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialCode_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// ç‰©æ–™åç§°
    /// </summary>
    public string MaterialName { get; set; }
        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public int?  PurchaseType { get; set; }

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

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

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

    /// <summary>
    /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public int? MaterialType { get; set; }
        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        public string PrimaryUnit { get; set; }

    /// <summary>
    /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialType_FilterMode { get; set; } = SearchFilterModeEnum.精准查询;
        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum PrimaryUnit_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
    /// </summary>
    public string PrimaryUnit { get; set; }
        /// <summary>
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string Standard { get; set; }

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

    /// <summary>
    /// è§„æ ¼/标准（如：GB/T 8163-2018）
    /// </summary>
    public string Standard { get; set; }
        /// <summary>
        /// å¤–径（单位：mm）
        /// </summary>
        public decimal?  OuterDiameter { get; set; }

    /// <summary>
    /// è§„æ ¼/标准（如：GB/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 string OuterDiameter { get; set; }
        /// <summary>
        /// å£åŽšï¼ˆå•ä½ï¼šmm）
        /// </summary>
        public decimal?  WallThickness { get; set; }

    /// <summary>
    /// å¤–径（单位：mm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum OuterDiameter_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å£åŽšï¼ˆå•ä½ï¼šmm）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum WallThickness_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）
    /// </summary>
    public string WallThickness { get; set; }
        /// <summary>
        /// æè´¨ï¼ˆå¦‚：304不锈钢）
        /// </summary>
        public string MaterialQuality { get; set; }

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum WallThickness_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// æè´¨ï¼ˆå¦‚：304不锈钢）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// æè´¨ï¼ˆå¦‚：304不锈钢）
    /// </summary>
    public string MaterialQuality { get; set; }
        /// <summary>
        /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
        /// </summary>
        public decimal?  Length { get; set; }

    /// <summary>
    /// æè´¨ï¼ˆå¦‚：304不锈钢）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialQuality_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// é•¿åº¦ï¼ˆå•ä½ï¼šm）-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Length_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
    /// </summary>
    public string Length { get; set; }
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public int?  IsMainBranch { get; set; }

    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Length_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
    /// </summary>
    public int? IsMainBranch { get; set; }
        /// <summary>
        /// ç”Ÿäº§å·¥åŽ‚
        /// </summary>
        public string Factory { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum IsMainBranch_FilterMode { get; set; } = SearchFilterModeEnum.精准查询;
        /// <summary>
        /// ç”Ÿäº§å·¥åŽ‚-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Factory_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// ç”Ÿäº§å·¥åŽ‚
    /// </summary>
    public string Factory { get; set; }
        /// <summary>
        /// è¯ä¹¦ç¼–号
        /// </summary>
        public string Certification { get; set; }

    /// <summary>
    /// ç”Ÿäº§å·¥åŽ‚-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Factory_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// è¯ä¹¦ç¼–号-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Certification_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// è¯ä¹¦ç¼–号
    /// </summary>
    public string Certification { get; set; }
        /// <summary>
        /// å†—余字段1 - é¢„留扩展用途
        /// </summary>
        public string RedundantField1 { get; set; }

    /// <summary>
    /// è¯ä¹¦ç¼–号-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Certification_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å†—余字段1 - é¢„留扩展用途-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum RedundantField1_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// å†—余字段1 - é¢„留扩展用途
    /// </summary>
    public string RedundantField1 { get; set; }
        /// <summary>
        /// å†—余字段2 - é¢„留扩展用途
        /// </summary>
        public string RedundantField2 { get; set; }

    /// <summary>
    /// å†—余字段1 - é¢„留扩展用途-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum RedundantField1_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å†—余字段2 - é¢„留扩展用途-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum RedundantField2_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// å†—余字段2 - é¢„留扩展用途
    /// </summary>
    public string RedundantField2 { get; set; }
        /// <summary>
        /// å†—余字段3 - é¢„留扩展用途
        /// </summary>
        public string RedundantField3 { get; set; }

    /// <summary>
    /// å†—余字段2 - é¢„留扩展用途-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum RedundantField2_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// å†—余字段3 - é¢„留扩展用途-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum RedundantField3_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// å†—余字段3 - é¢„留扩展用途
    /// </summary>
    public string RedundantField3 { get; set; }
        /// <summary>
        /// æŽ’序
        /// </summary>
        public int?  Sort { get; set; }

    /// <summary>
    /// å†—余字段3 - é¢„留扩展用途-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum RedundantField3_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// æŽ’序-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Sort_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;

    /// <summary>
    /// æŽ’序
    /// </summary>
    public int? Sort { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }

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

    /// <summary>
    /// å¤‡æ³¨
    /// </summary>
    public string Remark { get; set; }
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool?  IsDisabled { get; set; }

    /// <summary>
    /// å¤‡æ³¨-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDisabled_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>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [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; }



}
 
} 

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

@@ -1,17 +1,17 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial创建参数对象
/// </summary>
public class WmsMaterialCreateDto : WmsMaterialCreateOrUpdateDtoBase
{
    /// <summary>
    /// æŽ’序
    /// </summary>
    public virtual int? Sort { get; set; }

    /// <summary>
    /// æ˜¯å¦ç¦ç”¨
    /// </summary>
    public bool? IsDisabled { get; set; } = false;
}
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨åˆ›å»ºå‚数对象 
/// </summary> 
public class WmsMaterialCreateDto : WmsMaterialCreateOrUpdateDtoBase 
{ 
    /// <summary> 
    /// æŽ’序 
    /// </summary> 
    public virtual int? Sort { get; set; } 
 
    /// <summary> 
    /// æ˜¯å¦ç¦ç”¨ 
    /// </summary> 
    public bool? IsDisabled { get; set; } = false; 
} 

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

@@ -1,101 +1,124 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
using Volo.Abp.Application.Dtos; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨åˆ›å»ºæˆ–更新基类 
/// </summary> 
public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto 
{ 
            /// <summary>
        /// ç‰©æ–™ç¼–码（唯一标识）
        /// </summary>
        public string MaterialCode { get; set; }

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

/// <summary>
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯åˆ›å»ºæˆ–更新基类
/// </summary>
public abstract class WmsMaterialCreateOrUpdateDtoBase : ExtensibleEntityDto
{
    /// <summary>
    /// ç‰©æ–™ç¼–码（唯一标识）
    /// </summary>
    public string MaterialCode { get; set; }
        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public PurchaseTypeEnum PurchaseType { get; set; }

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

    /// <summary>
    /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public PurchaseTypeEnum PurchaseType { get; set; }
        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        public string? PrimaryUnit { get; set; }

    /// <summary>
    /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public MaterialTypeEnum MaterialType { get; set; }
        /// <summary>
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

    /// <summary>
    /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
    /// </summary>
    public string PrimaryUnit { get; set; }
        /// <summary>
        /// å¤–径（单位：mm）
        /// </summary>
        public decimal OuterDiameter { get; set; }

    /// <summary>
    /// è§„æ ¼/标准（如：GB/T 8163-2018）
    /// </summary>
    public string Standard { get; set; }
        /// <summary>
        /// å£åŽšï¼ˆå•ä½ï¼šmm）
        /// </summary>
        public decimal WallThickness { get; set; }

    /// <summary>
    /// å¤–径（单位：mm）
    /// </summary>
    public decimal OuterDiameter { get; set; }
        /// <summary>
        /// æè´¨ï¼ˆå¦‚：304不锈钢）
        /// </summary>
        public string? MaterialQuality { get; set; }

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）
    /// </summary>
    public decimal WallThickness { get; set; }
        /// <summary>
        /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
        /// </summary>
        public decimal Length { get; set; }

    /// <summary>
    /// æè´¨ï¼ˆå¦‚：304不锈钢）
    /// </summary>
    public string MaterialQuality { get; set; }
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public YesNoEnum IsMainBranch { get; set; }

    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
    /// </summary>
    public decimal Length { get; set; }
        /// <summary>
        /// ç”Ÿäº§å·¥åŽ‚
        /// </summary>
        public string? Factory { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡ï¼ˆtrue: ä¸»æ”¯ç®¡, false: éžä¸»æ”¯ç®¡ï¼‰
    /// </summary>
    public YesNoEnum IsMainBranch { get; set; }
        /// <summary>
        /// è¯ä¹¦ç¼–号
        /// </summary>
        public string? Certification { get; set; }

    /// <summary>
    /// ç”Ÿäº§å·¥åŽ‚
    /// </summary>
    public string Factory { get; set; }
        /// <summary>
        /// å†—余字段1 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField1 { get; set; }

    /// <summary>
    /// è¯ä¹¦ç¼–号（如：压力容器认证）
    /// </summary>
    public string Certification { get; set; }
        /// <summary>
        /// å†—余字段2 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField2 { get; set; }

    /// <summary>
    /// å†—余字段1 - é¢„留扩展用途
    /// </summary>
    public string RedundantField1 { get; set; }
        /// <summary>
        /// å†—余字段3 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField3 { get; set; }

    /// <summary>
    /// å†—余字段2 - é¢„留扩展用途
    /// </summary>
    public string RedundantField2 { get; set; }
        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

    /// <summary>
    /// å†—余字段3 - é¢„留扩展用途
    /// </summary>
    public string RedundantField3 { get; set; }
    /// <summary>
    /// å¤‡æ³¨
    /// </summary>
    public virtual string Remark { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

    /// <summary>
    /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class.
    /// </summary>
    public WmsMaterialCreateOrUpdateDtoBase() : base(false)
    {
    }
}
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? CreatorId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? LastModifierId { get; set; }

 
 
    /// <summary> 
    /// Initializes a new instance of the <see cref="WmsMaterialCreateOrUpdateDtoBase"/> class. 
    /// </summary> 
    public WmsMaterialCreateOrUpdateDtoBase() : base(false) 
    { 
    } 
} 

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

@@ -1,158 +1,200 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
using Volo.Abp.Application.Dtos; 
using Volo.Abp.Data; 
using Volo.Abp.Domain.Entities; 
 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨æ•°æ®å‚数对象 
/// </summary> 
public  class WmsMaterialDto:  ExtensibleEntityDto<Guid>, IHasConcurrencyStamp 
{ 
            /// <summary>
        /// ç‰©æ–™ç¼–码（唯一标识）
        /// </summary>
        public string MaterialCode { get; set; }

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }

/// <summary>
/// WmsMaterial数据参数对象
/// </summary>
public class WmsMaterialDto : ExtensibleEntityDto<Guid>, IHasConcurrencyStamp
{
    /// <summary>
    /// ç‰©æ–™ç¼–码（唯一标识）
    /// </summary>
    public string MaterialCode { get; set; }
        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public PurchaseTypeEnum PurchaseType { get; set; }

    /// <summary>
    /// ç‰©æ–™åç§°
    /// </summary>
    public string MaterialName { get; set; }
        /// <summary>
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public string PurchaseTypeDesc
        { 
            get 
            { 
                return GetEnumDescriptionUtil.GetEnumDescription(PurchaseType); 
            } 
        } 
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public MaterialTypeEnum MaterialType { get; set; }

    /// <summary>
    /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public PurchaseTypeEnum PurchaseType { get; set; }
        /// <summary>
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        public string MaterialTypeDesc
        { 
            get 
            { 
                return GetEnumDescriptionUtil.GetEnumDescription(MaterialType); 
            } 
        } 
        /// <summary>
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        public string? PrimaryUnit { get; set; }

    /// <summary>
    /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public string PurchaseTypeDesc
    {
        get
        {
             return GetEnumDescriptionUtil.GetEnumDescription(PurchaseType);
        }
    }
        /// <summary>
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        public string? Standard { get; set; }

    /// <summary>
    /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public MaterialTypeEnum MaterialType { get; set; }
        /// <summary>
        /// å¤–径（单位：mm）
        /// </summary>
        public decimal OuterDiameter { get; set; }

    /// <summary>
    /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
    /// </summary>
    public string MaterialTypeDesc
    {
        get
        {
            return GetEnumDescriptionUtil.GetEnumDescription(MaterialType);
        }
    }
        /// <summary>
        /// å£åŽšï¼ˆå•ä½ï¼šmm）
        /// </summary>
        public decimal WallThickness { get; set; }

    /// <summary>
    /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
    /// </summary>
    public string PrimaryUnit { get; set; }
        /// <summary>
        /// æè´¨ï¼ˆå¦‚：304不锈钢）
        /// </summary>
        public string? MaterialQuality { get; set; }

    /// <summary>
    /// è§„æ ¼/标准（如：GB/T 8163-2018）
    /// </summary>
    public string Standard { get; set; }
        /// <summary>
        /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
        /// </summary>
        public decimal Length { get; set; }

    /// <summary>
    /// å¤–径（单位：mm）
    /// </summary>
    public decimal OuterDiameter { get; set; }
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public YesNoEnum IsMainBranch { get; set; }

    /// <summary>
    /// å£åŽšï¼ˆå•ä½ï¼šmm）
    /// </summary>
    public decimal WallThickness { get; set; }
        /// <summary>
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        public string IsMainBranchDesc
        { 
            get 
            { 
                return GetEnumDescriptionUtil.GetEnumDescription(IsMainBranch); 
            } 
        } 
        /// <summary>
        /// ç”Ÿäº§å·¥åŽ‚
        /// </summary>
        public string? Factory { get; set; }

    /// <summary>
    /// æè´¨ï¼ˆå¦‚：304不锈钢）
    /// </summary>
    public string MaterialQuality { get; set; }
        /// <summary>
        /// è¯ä¹¦ç¼–号
        /// </summary>
        public string? Certification { get; set; }

    /// <summary>
    /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
    /// </summary>
    public decimal Length { get; set; }
        /// <summary>
        /// å†—余字段1 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField1 { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡ï¼ˆ1: ä¸»æ”¯ç®¡, 2: éžä¸»æ”¯ç®¡ï¼‰
    /// </summary>
    public YesNoEnum IsMainBranch { get; set; }
        /// <summary>
        /// å†—余字段2 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField2 { get; set; }

    /// <summary>
    /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
    /// </summary>
    public string IsMainBranchDesc
    {
        get
        {
            return GetEnumDescriptionUtil.GetEnumDescription(IsMainBranch);
        }
    }
        /// <summary>
        /// å†—余字段3 - é¢„留扩展用途
        /// </summary>
        public string? RedundantField3 { get; set; }

    /// <summary>
    /// ç”Ÿäº§å·¥åŽ‚
    /// </summary>
    public string Factory { get; set; }
        /// <summary>
        /// æŽ’序
        /// </summary>
        public int Sort { get; set; }

    /// <summary>
    /// è¯ä¹¦ç¼–号（如：压力容器认证）
    /// </summary>
    public string Certification { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }

    /// <summary>
    /// å†—余字段1 - é¢„留扩展用途
    /// </summary>
    public string RedundantField1 { get; set; }
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        public bool? IsDisabled { get; set; }

    /// <summary>
    /// å†—余字段2 - é¢„留扩展用途
    /// </summary>
    public string RedundantField2 { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public ExtraPropertyDictionary? ExtraProperties { get; set; }

    /// <summary>
    /// å†—余字段3 - é¢„留扩展用途
    /// </summary>
    public string RedundantField3 { get; set; }
    /// <summary>
    /// æŽ’序
    /// </summary>
    public virtual int Sort { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string? ConcurrencyStamp { get; set; }

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

    /// <summary>
    /// æ˜¯å¦ç¦ç”¨
    /// </summary>
    public virtual bool? IsDisabled { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public string? CreatorId { get; set; }

    /// <summary>
    /// å¹¶å‘戳
    /// </summary>
    public string ConcurrencyStamp { get; set; }
        /// <summary>
        /// 
        /// </summary>
        public DateTime? LastModificationTime { get; set; }

    /// <summary>
    /// Gets the export data.
    /// </summary>
    /// <returns></returns>
    public Dictionary<string, object> GetExportData()
    {
        var exportData = new Dictionary<string, object>();
        foreach (var property in this.GetType().GetProperties())
        {
            exportData.Add(property.Name, property.GetValue(this));
        }
        /// <summary>
        /// 
        /// </summary>
        public string? LastModifierId { get; set; }

        return exportData;
    }
}
        /// <summary>
        /// 
        /// </summary>
        public bool IsDeleted { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public string? DeleterId { get; set; }

        /// <summary>
        /// 
        /// </summary>
        public DateTime? DeletionTime { get; set; }

 
 
    /// <summary> 
    /// Gets the export data. 
    /// </summary> 
    /// <returns></returns> 
    public Dictionary<string, object> GetExportData() 
    { 
        var exportData = new Dictionary<string, object>(); 
        foreach (var property in this.GetType().GetProperties()) 
        { 
            exportData.Add(property.Name, property.GetValue(this)); 
        } 
 
        return exportData; 
    } 
} 

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

@@ -1,157 +1,138 @@
using MiniExcelLibs.Attributes;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
{

    /// <summary>
    /// WmsMaterial导出模型
    /// </summary>
    public class MaterialExportModel
    {
        /// <summary>
using MiniExcelLibs.Attributes; 
using System.ComponentModel.DataAnnotations; 
using System.ComponentModel; 
using CMS.Plugin.HIAWms.Domain.Shared.Enums; 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨å¯¼å‡ºæ¨¡åž‹ 
/// </summary> 
public  class WmsMaterialExportModel 
{ 
            /// <summary>
        /// ç‰©æ–™ç¼–码（唯一标识）
        /// </summary>
        /// <example>MAT-2023-001</example>
        [ExcelColumn(Name = "物料编码", Width = 25)]
        [ExcelColumn(Name = "物料编码（唯一标识）", Width = 25)]
        public string MaterialCode { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        /// <example>304不锈钢管</example>
        [ExcelColumn(Name = "物料名称", Width = 25)]
        public string MaterialName { get; set; }

        /// <summary>
        /// é‡‡è´­ç±»åž‹
        /// é‡‡è´­ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        /// <remarks>
        /// 0:标准采购 1:紧急采购 2:协议采购
        /// </remarks>
        /// <example>0</example>
        [ExcelColumn(Name = "采购类型", Width = 25)]
        [ExcelColumn(Name = "采购类型（枚举值）", Width = 25)]
        public PurchaseTypeEnum PurchaseType { get; set; }

        /// <summary>
        /// ç‰©æ–™ç±»åž‹
        /// ç‰©æ–™ç±»åž‹ï¼ˆæžšä¸¾å€¼ï¼‰
        /// </summary>
        /// <remarks>
        /// 1:原材料 2:半成品 3:成品
        /// </remarks>
        /// <example>1</example>
        [ExcelColumn(Name = "物料类型", Width = 25)]
        [ExcelColumn(Name = "物料类型（枚举值）", Width = 25)]
        public MaterialTypeEnum MaterialType { get; set; }

        /// <summary>
        /// ä¸»è®¡é‡å•ä½
        /// ä¸»å•ä½ï¼ˆå¦‚：kg、m、个）
        /// </summary>
        /// <example>kg</example>
        [ExcelColumn(Name = "主单位", Width = 25)]
        [ExcelColumn(Name = "主单位（如：kg、m、个）", Width = 25)]
        public string PrimaryUnit { get; set; }

        /// <summary>
        /// è§„æ ¼/技术标准
        /// è§„æ ¼/标准（如：GB/T 8163-2018）
        /// </summary>
        /// <example>GB/T 8163-2018</example>
        [ExcelColumn(Name = "规格/标准", Width = 25)]
        [ExcelColumn(Name = "规格/标准（如：GB/T 8163-2018）", Width = 25)]
        public string Standard { get; set; }

        /// <summary>
        /// å¤–径（单位：毫米）
        /// å¤–径（单位：mm）
        /// </summary>
        /// <example>50.5</example>
        [ExcelColumn(Name = "外径(mm)", Width = 25)]
        [ExcelColumn(Name = "外径（单位：mm）", Width = 25)]
        public decimal OuterDiameter { get; set; }

        /// <summary>
        /// å£åŽšï¼ˆå•ä½ï¼šæ¯«ç±³ï¼‰
        /// å£åŽšï¼ˆå•ä½ï¼šmm）
        /// </summary>
        /// <example>2.5</example>
        [ExcelColumn(Name = "壁厚(mm)", Width = 25)]
        [ExcelColumn(Name = "壁厚（单位：mm）", Width = 25)]
        public decimal WallThickness { get; set; }

        /// <summary>
        /// æè´¨è¯´æ˜Ž
        /// æè´¨ï¼ˆå¦‚：304不锈钢）
        /// </summary>
        /// <example>304不锈钢</example>
        [ExcelColumn(Name = "材质", Width = 25)]
        [ExcelColumn(Name = "材质（如：304不锈钢）", Width = 25)]
        public string MaterialQuality { get; set; }

        /// <summary>
        /// é•¿åº¦ï¼ˆå•ä½ï¼šç±³ï¼‰
        /// é•¿åº¦ï¼ˆå•ä½ï¼šm）
        /// </summary>
        /// <example>6.0</example>
        [ExcelColumn(Name = "长度(m)", Width = 25)]
        [ExcelColumn(Name = "长度（单位：m）", Width = 25)]
        public decimal Length { get; set; }

        /// <summary>
        /// æ˜¯å¦ä¸»æ”¯ç®¡æ ‡è¯†
        /// æ˜¯å¦ä¸ºä¸»æ”¯ç®¡
        /// </summary>
        /// <example>true</example>
        [ExcelColumn(Name = "是否主支管", Width = 25)]
        [Description("是/否")]
        [ExcelColumn(Name = "是否为主支管", Width = 25)]
        public YesNoEnum IsMainBranch { get; set; }

        /// <summary>
        /// ç”Ÿäº§å·¥åŽ‚名称
        /// ç”Ÿäº§å·¥åŽ‚
        /// </summary>
        /// <example>上海第一工厂</example>
        [ExcelColumn(Name = "生产工厂", Width = 25)]
        public string Factory { get; set; }

        /// <summary>
        /// è®¤è¯è¯ä¹¦ç¼–号
        /// è¯ä¹¦ç¼–号
        /// </summary>
        /// <example>CER-2023-001</example>
        [ExcelColumn(Name = "证书编号", Width = 25)]
        public string Certification { get; set; }

        /// <summary>
        /// é¢„留扩展字段1
        /// å†—余字段1 - é¢„留扩展用途
        /// </summary>
        /// <remarks>
        /// å¯ç”¨äºŽä¸´æ—¶å­˜å‚¨ä¾›åº”商编码等扩展信息
        /// </remarks>
        [ExcelColumn(Name = "扩展字段1", Width = 25)]
        [ExcelColumn(Name = "冗余字段1 - é¢„留扩展用途", Width = 25)]
        public string RedundantField1 { get; set; }

        /// <summary>
        /// é¢„留扩展字段2
        /// å†—余字段2 - é¢„留扩展用途
        /// </summary>
        /// <remarks>
        /// å¯ç”¨äºŽä¸´æ—¶å­˜å‚¨æ‰¹æ¬¡å·ç­‰æ‰©å±•ä¿¡æ¯
        /// </remarks>
        [ExcelColumn(Name = "扩展字段2", Width = 25)]
        [ExcelColumn(Name = "冗余字段2 - é¢„留扩展用途", Width = 25)]
        public string RedundantField2 { get; set; }

        /// <summary>
        /// é¢„留扩展字段3
        /// å†—余字段3 - é¢„留扩展用途
        /// </summary>
        /// <remarks>
        /// å¯ç”¨äºŽä¸´æ—¶å­˜å‚¨è‡ªå®šä¹‰åˆ†ç±»ç­‰æ‰©å±•ä¿¡æ¯
        /// </remarks>
        [ExcelColumn(Name = "扩展字段3", Width = 25)]
        [ExcelColumn(Name = "冗余字段3 - é¢„留扩展用途", Width = 25)]
        public string RedundantField3 { get; set; }

        /// <summary>
        /// æŽ’序
        /// </summary>
        [ExcelColumn(Name = "排序", Width = 25)]
        public int Sort { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [ExcelColumn(Name = "备注",Width = 25)]
        [ExcelColumn(Name = "备注", Width = 25)]
        public string Remark { get; set; }

        public Dictionary<string, object> GetExportData()
        {
            var exportData = new Dictionary<string, object>();
            foreach (var property in this.GetType().GetProperties())
            {
                exportData.Add(property.Name, property.GetValue(this));
            }
        /// <summary>
        /// æ˜¯å¦ç¦ç”¨
        /// </summary>
        [ExcelColumn(Name = "是否禁用", Width = 25)]
        public bool? IsDisabled { get; set; }

            return exportData;
        }
    }
}

 
 
    public Dictionary<string, object> GetExportData() 
        { 
            var exportData = new Dictionary<string, object>(); 
            foreach (var property in this.GetType().GetProperties()) 
            { 
                exportData.Add(property.Name, property.GetValue(this)); 
            } 
 
            return exportData; 
        } 
} 

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

@@ -1,14 +1,13 @@
using Volo.Abp.Domain.Entities;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;

/// <summary>
/// WmsMaterial更新参数对象
/// </summary>
public class WmsMaterialUpdateDto : WmsMaterialCreateOrUpdateDtoBase, IHasConcurrencyStamp
{
    /// <summary>
    /// å¹¶å‘戳
    /// </summary>
    public string ConcurrencyStamp { get; set; }
}
using Volo.Abp.Domain.Entities; 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨æ›´æ–°å‚数对象 
/// </summary> 
public class WmsMaterialUpdateDto : WmsMaterialCreateOrUpdateDtoBase, IHasConcurrencyStamp 
{ 
   /// <summary> 
    /// å¹¶å‘戳 
    /// </summary> 
    public string ConcurrencyStamp { get; set; } 
} 

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

@@ -1,33 +1,33 @@

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial
{
    /// <summary>
    /// WmsMaterials导入模型
    /// </summary>
    public class WmsMaterialsImportModel
    {
        private List<WmsMaterialImportModel> _wmsmaterials = new();

        public List<WmsMaterialImportModel> WmsMaterials
        {
            get => _wmsmaterials;
            set
            {
                _wmsmaterials = value;
                var rowIndex = 2;
                _wmsmaterials?.ForEach(x => x.RowIndex = rowIndex++);
            }
        }

        /// <summary>
        /// WmsMaterial导入模型
        /// </summary>
        public class WmsMaterialImportModel : MaterialExportModel
        {
            /// <summary>
            /// è¡Œå·
            /// </summary>
            public int RowIndex { get; set; }
        }
    }
}
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial 
{ 
    /// <summary> 
    /// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨å¯¼å…¥æ¨¡åž‹ 
    /// </summary> 
    public class WmsMaterialsImportModel 
    { 
        private List<WmsMaterialImportModel> _WmsMaterials = new(); 
 
        public List<WmsMaterialImportModel> WmsMaterials 
        { 
            get => _WmsMaterials; 
            set 
            { 
                _WmsMaterials = value; 
                var rowIndex = 2; 
                _WmsMaterials?.ForEach(x => x.RowIndex = rowIndex++); 
            } 
        } 
 
        /// <summary> 
        /// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨å¯¼å…¥æ¨¡åž‹ 
        /// </summary> 
        public class WmsMaterialImportModel : WmsMaterialExportModel 
        { 
            /// <summary> 
            /// è¡Œå· 
            /// </summary> 
            public int RowIndex { get; set; } 
        } 
    } 
} 

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

@@ -1,46 +1,46 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using Volo.Abp.Application.Services;

namespace CMS.Plugin.HIAWms.Application.Contracts.Services;

/// <summary>
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯åº”用服务接口
/// </summary>
public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialInput, WmsMaterialCreateDto, WmsMaterialUpdateDto>
{
    /// <summary>
    /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids);

    /// <summary>
    /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    Task DeleteManyAsync(IEnumerable<Guid> ids);

    /// <summary>
    /// è°ƒæ•´æŽ’序物料基础信息
    /// </summary>
    /// <param name="id"></param>
    /// <param name="sort"></param>
    /// <returns></returns>
    Task AdjustSortAsync(Guid id, int sort);

    /// <summary>
    /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task ImportAsync(WmsMaterialsImportModel input);

    /// <summary>
    /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input);
}
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
using Volo.Abp.Application.Services; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Services; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨åº”用服务接口 
/// </summary> 
public interface IWmsMaterialAppService : ICrudAppService<WmsMaterialDto, Guid, GetWmsMaterialInput, WmsMaterialCreateDto, WmsMaterialUpdateDto> 
{ 
    /// <summary> 
    /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    Task DeleteManyAsync(IEnumerable<Guid> ids); 
 
    /// <summary> 
    /// è°ƒæ•´æŽ’序物料基础信息表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
    /// <returns></returns> 
    Task AdjustSortAsync(Guid id, int sort); 
 
    /// <summary> 
    /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    Task ImportAsync(WmsMaterialsImportModel input); 
 
    /// <summary> 
    /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input); 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs

@@ -1,432 +1,445 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using Volo.Abp.ObjectMapping;

namespace CMS.Plugin.HIAWms.Application.Implements;

/// <summary>
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯åº”用服务
/// </summary>
public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService
{
    private readonly IWmsMaterialRepository _wmsmaterialRepository;

    /// <summary>
    /// Initializes a new instance of the <see cref="WmsMaterialAppService"/> class.
    /// </summary>
    /// <param name="wmsmaterialRepository">The task job repository.</param>
    public WmsMaterialAppService(IWmsMaterialRepository wmsmaterialRepository)
    {
        _wmsmaterialRepository = wmsmaterialRepository;
    }

    /// <summary>
    /// èŽ·å–指定物料基础信息
    /// </summary>
    /// <param name="id"></param>
    /// <returns></returns>
    public virtual async Task<WmsMaterialDto> GetAsync(Guid id)
    {
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await _wmsmaterialRepository.GetAsync(id));
    }

    /// <summary>
    /// åˆ†é¡µèŽ·å–物料基础信息
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input)
    {
        Check.NotNull(input, nameof(input));

        if (input.Sorting.IsNullOrWhiteSpace())
        {
            input.Sorting = nameof(WmsMaterial.Sort);
        }

        #region åŠ¨æ€æž„造查询条件 

        //动态构造查询条件 
        var whereConditions = DynamicGetQueryParams(input);

        #endregion

        var count = await _wmsmaterialRepository.GetCountAsync(whereConditions);
        var list = await _wmsmaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount);

        return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list));
    }

using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
using CMS.Plugin.HIAWms.Application.Contracts.Services; 
using CMS.Plugin.HIAWms.Domain.Shared; 
using CMS.Plugin.HIAWms.Domain.Shared.Util; 
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial; 
using CMS.Plugin.HIAWms.Domain.WmsMaterial; 
using CmsQueryExtensions.Extension; 
using System.Linq.Expressions; 
using Volo.Abp; 
using Volo.Abp.Application.Dtos; 
using Volo.Abp.Data; 
using Volo.Abp.ObjectExtending; 
using Volo.Abp.ObjectMapping; 
 
namespace CMS.Plugin.HIAWms.Application.Implements; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨åº”用服务 
/// </summary> 
public class WmsMaterialAppService : CMSPluginAppService, IWmsMaterialAppService 
{ 
    private readonly IWmsMaterialRepository wmsmaterialsRepository; 
 
    /// <summary> 
    /// åŠ¨æ€æž„造查询条件 
    /// Initializes a new instance of the <see cref="WmsMaterialAppService"/> class. 
    /// </summary> 
    /// <param name="input">输入参数</param> 
    /// <param name="WmsMaterialRepository">The task job repository.</param> 
    public WmsMaterialAppService(IWmsMaterialRepository WmsMaterialRepository) 
    { 
        wmsmaterialsRepository = WmsMaterialRepository; 
    } 
 
    /// <summary> 
    /// èŽ·å–指定物料基础信息表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    private FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> DynamicGetQueryParams(GetWmsMaterialInput input)
    {
        //动态构造查询条件 
        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterial, GetWmsMaterialInput>(input);
        if (!whereConditions.IsSuccess)
        {
            throw new Exception("动态构造查询条件失败:" + whereConditions.ErrMsg);
        }

        //也可再次自定义构建查询条件 
        Expression<Func<WmsMaterial, bool>> extendExpression = a => a.IsDeleted == false;
        // ä½¿ç”¨ System.Linq.PredicateBuilder çš„ And
        var pres = (System.Linq.Expressions.Expression<Func<WmsMaterial, bool>>)(whereConditions.data);
        whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression);

        return whereConditions;
    }

    /// <summary>
    /// æ–°å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public virtual async Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
        }

        var maxSort = await _wmsmaterialRepository.GetMaxSortAsync();
        var sort = input.Sort ?? maxSort;

        var wmsmaterial = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
        wmsmaterial.Sort = sort;
        input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);

        await _wmsmaterialRepository.InsertAsync(wmsmaterial);

        if (input.Sort.HasValue && wmsmaterial.Sort != maxSort)
        {
            await AdjustSortAsync(wmsmaterial.Id, wmsmaterial.Sort);
        }

        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
    }

    /// <summary>
    /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="id"></param>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public virtual async Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
    {
        await CheckCreateOrUpdateDtoAsync(input);

        var wmsmaterial = await _wmsmaterialRepository.GetAsync(id);
        var exist = await _wmsmaterialRepository.NameExistAsync(input.MaterialCode, wmsmaterial.Id);
        if (exist)
        {
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]);
        }

        wmsmaterial.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp);
        input.MapExtraPropertiesTo(wmsmaterial, MappingPropertyDefinitionChecks.None);

        wmsmaterial.MaterialName = input.MaterialName;
        wmsmaterial.PurchaseType = input.PurchaseType;
        wmsmaterial.MaterialType = input.MaterialType;
        wmsmaterial.PrimaryUnit = input.PrimaryUnit;
        wmsmaterial.Standard = input.Standard;
        wmsmaterial.OuterDiameter = input.OuterDiameter;
        wmsmaterial.WallThickness = input.WallThickness;
        wmsmaterial.MaterialQuality = input.MaterialQuality;
        wmsmaterial.Length = input.Length;
        wmsmaterial.IsMainBranch = input.IsMainBranch;
        wmsmaterial.Factory = input.Factory;
        wmsmaterial.Certification = input.Certification;

        await _wmsmaterialRepository.UpdateAsync(wmsmaterial);

        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(wmsmaterial);
    }

    /// <summary>
    /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids)
    {
        //var wmsmaterials = new List<WmsMaterial>();
        //if (ids != null)
        //{
        //    var sort = await _wmsmaterialRepository.GetMaxSortAsync();
        //    foreach (var id in ids)
        //    {
        //        var wmsmaterial = await _wmsmaterialRepository.FindAsync(id);
        //        if (wmsmaterial != null)
        //        {
        //            var name = wmsmaterial.Name + WmsMaterialConsts.CloneTag;
        //            var notExist = false;
        //            while (!notExist)
        //            {
        //                var exist = await _wmsmaterialRepository.NameExistAsync(name);
        //                if (exist || wmsmaterials.Any(x => x.Name == name))
        //                {
        //                    name += WmsMaterialConsts.CloneTag;
        //                    continue;
        //                }

        //                notExist = true;
        //            }

        //            //wmsmaterial = await _wmsmaterialRepository.InsertAsync(wmsmaterial.Clone(GuidGenerator.Create(), name, sort++));
        //            wmsmaterials.Add(wmsmaterial);
        //        }
        //    }
        //}

        //return ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(wmsmaterials);
        return new List<WmsMaterialDto>();
    }

    /// <summary>
    /// åˆ é™¤å•ä¸ªç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="id"></param>
    /// <returns></returns>
    public virtual Task DeleteAsync(Guid id)
    {
        return _wmsmaterialRepository.DeleteAsync(id);
    }

    /// <summary>
    /// åˆ é™¤å¤šä¸ªç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="ids"></param>
    /// <returns></returns>
    public async Task DeleteManyAsync(IEnumerable<Guid> ids)
    {
        foreach (var id in ids)
        {
            await DeleteAsync(id);
        }
    }

    /// <summary>
    /// è°ƒæ•´æŽ’序物料基础信息
    /// </summary>
    /// <param name="id"></param>
    /// <param name="sort"></param>
    /// <returns></returns>
    public virtual async Task AdjustSortAsync(Guid id, int sort)
    {
        var list = await _wmsmaterialRepository.GetListAsync(null, nameof(WmsMaterial.Sort));
        if (list != null && list.Any())
        {
            var initSort = 1;
            list.ForEach(x => x.AdjustSort(initSort++));
            var entity = list.FirstOrDefault(x => x.Id == id);
            if (entity != null)
            {
                if (sort == 1)
                {
                    list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                }
                else if (entity.Sort > sort)
                {
                    list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                    list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
                }
                else if (entity.Sort < sort)
                {
                    list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1));
                    list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1));
                }

                entity.AdjustSort(sort);
            }
        }

        await _wmsmaterialRepository.UpdateManyAsync(list);
    }

    /// <summary>
    /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    /// <exception cref="UserFriendlyException"></exception>
    public async Task ImportAsync(WmsMaterialsImportModel input)
    {
        Check.NotNull(input, nameof(input));

        var wmsmaterialCreateDtos = new List<(int RowIndex, WmsMaterialCreateDto Item)>();
        var wmsmaterialUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialUpdateDto Item)>();
        var importItems = input.WmsMaterials;

        if (importItems != null && importItems.Any())
        {
            #region å¯¼å…¥æ ¡éªŒ

            // åˆ¤æ–­åç§°æ˜¯å¦é‡å¤ï¼Œå¹¶è¾“出第几行重复
            var duplicateWmsMaterials = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList();
            if (duplicateWmsMaterials?.Any() == true)
            {
                var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} è¡Œï¼š{x.Key}  åç§°é‡å¤");
                var errorMsg = $"导入失败！配置， {string.Join(",", duplicateWmsMaterialMsgs)}，终止导入";
                throw new UserFriendlyException(errorMsg);
            }

            #endregion

            foreach (var impItem in importItems)
            {
                if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace())
                {
                    continue;
                }

                if (impItem.MaterialCode.IsNullOrWhiteSpace())
                {
                    var errorMsg = $"导入失败！配置，第{impItem.RowIndex}行：WmsMaterial名称不能为空";
                    throw new UserFriendlyException(errorMsg);
                }

                var oldWmsMaterial = await _wmsmaterialRepository.FindByNameAsync(impItem.MaterialCode);
                if (oldWmsMaterial != null)
                {
                    var wmsmaterialUpdateDto = new WmsMaterialUpdateDto
                    {
                        MaterialCode = impItem.MaterialCode,
                        MaterialName = impItem.MaterialName,
                        PurchaseType = impItem.PurchaseType,
                        MaterialType = impItem.MaterialType,
                        PrimaryUnit = impItem.PrimaryUnit,
                        Standard = impItem.Standard,
                        OuterDiameter = impItem.OuterDiameter,
                        WallThickness = impItem.WallThickness,
                        MaterialQuality = impItem.MaterialQuality,
                        Length = impItem.Length,
                        IsMainBranch = impItem.IsMainBranch,
                        Factory = impItem.Factory,
                        Certification = impItem.Certification,
                        Remark = impItem.Remark,
                    };

                    wmsmaterialUpdateDtos.Add((impItem.RowIndex, oldWmsMaterial.Id, wmsmaterialUpdateDto));
                }
                else
                {
                    var wmsmaterialCreateDto = new WmsMaterialCreateDto
                    {
                        MaterialCode = impItem.MaterialCode,
                        MaterialName = impItem.MaterialName,
                        PurchaseType = impItem.PurchaseType,
                        MaterialType = impItem.MaterialType,
                        PrimaryUnit = impItem.PrimaryUnit,
                        Standard = impItem.Standard,
                        OuterDiameter = impItem.OuterDiameter,
                        WallThickness = impItem.WallThickness,
                        MaterialQuality = impItem.MaterialQuality,
                        Length = impItem.Length,
                        IsMainBranch = impItem.IsMainBranch,
                        Factory = impItem.Factory,
                        Certification = impItem.Certification,
                        Remark = impItem.Remark,
                    };

                    wmsmaterialCreateDtos.Add((impItem.RowIndex, wmsmaterialCreateDto));
                }
            }
        }

        // æ–°å¢ž
        foreach (var wmsmaterialDto in wmsmaterialCreateDtos)
        {
            try
            {
                await CreateAsync(wmsmaterialDto.Item);
            }
            catch (Exception e)
            {
                var errorMsg = $"导入失败！配置，第{wmsmaterialDto.RowIndex}行：{e.Message}，终止导入";
                throw new UserFriendlyException(errorMsg);
            }
        }

        // æ›´æ–°
        foreach (var wmsmaterialDto in wmsmaterialUpdateDtos)
        {
            try
            {
                await UpdateAsync(wmsmaterialDto.Id, wmsmaterialDto.Item);
            }
            catch (Exception e)
            {
                var errorMsg = $"导入失败！配置，第{wmsmaterialDto.RowIndex}行：{e.Message}，终止导入";
                throw new UserFriendlyException(errorMsg);
            }
        }
    }

    /// <summary>
    /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input)
    {
        Check.NotNull(input, nameof(input));

        if (input.Sorting.IsNullOrWhiteSpace())
        {
            input.Sorting = nameof(WmsMaterial.Sort);
        }

        #region åŠ¨æ€æž„造查询条件 

        //动态构造查询条件 
        var whereConditions = DynamicGetQueryParams(input);

        #endregion


        var list = await _wmsmaterialRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true);
        var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list);

        var sheets = new Dictionary<string, object>
        {
            ["配置"] = ExportHelper.ConvertListToExportData(result),
        };

        var fileName = result.Count > 1 ? "WmsMaterial列表" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial模版";
        return (sheets, fileName);
    }

    /// <summary>
    /// æ ¡éªŒç‰©æ–™åŸºç¡€ä¿¡æ¯ï¼Œå½“新建或更新时
    /// </summary>
    /// <param name="input"></param>
    /// <returns></returns>
    protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input)
    {
        Check.NotNull(input, nameof(input));
        Check.NotNullOrWhiteSpace(input.MaterialCode, "编号", WmsMaterialConsts.MaxCodeLength);
        Check.NotNullOrWhiteSpace(input.MaterialName, "名称", WmsMaterialConsts.MaxNameLength);
        Check.Length(input.Remark, "备注", WmsMaterialConsts.MaxRemarkLength);
        return Task.CompletedTask;
    }
}
    public virtual async Task<WmsMaterialDto> GetAsync(Guid id) 
    { 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(await wmsmaterialsRepository.GetAsync(id)); 
    } 
 
    /// <summary> 
    /// åˆ†é¡µèŽ·å–物料基础信息表 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    public virtual async Task<PagedResultDto<WmsMaterialDto>> GetListAsync(GetWmsMaterialInput input) 
    { 
        Check.NotNull(input, nameof(input)); 
 
        if (input.Sorting.IsNullOrWhiteSpace()) 
        { 
            input.Sorting = nameof(WmsMaterial.Sort); 
        } 
 
        #region åŠ¨æ€æž„造查询条件  
 
        //动态构造查询条件  
        var whereConditions = DynamicGetQueryParams(input); 
 
        #endregion 
 
        var count = await wmsmaterialsRepository.GetCountAsync(whereConditions); 
        var list = await wmsmaterialsRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount); 
 
        return new PagedResultDto<WmsMaterialDto>(count, ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list)); 
    } 
 
    /// <summary>  
    /// åŠ¨æ€æž„造查询条件  
    /// </summary>  
    /// <param name="input">输入参数</param>  
    /// <returns></returns>  
    private FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> DynamicGetQueryParams(GetWmsMaterialInput input) 
    { 
        //动态构造查询条件  
        var whereConditions = WhereConditionsExtensions.GetWhereConditions<WmsMaterial, GetWmsMaterialInput>(input); 
        if (!whereConditions.IsSuccess) 
        { 
            throw new Exception("动态构造查询条件失败:" + whereConditions.ErrMsg); 
        } 
 
        //也可再次自定义构建查询条件  
        Expression<Func<WmsMaterial, bool>> extendExpression = a => a.IsDeleted == false; 
        // ä½¿ç”¨ System.Linq.PredicateBuilder çš„ And 
        var pres = (System.Linq.Expressions.Expression<Func<WmsMaterial, bool>>)(whereConditions.data); 
        whereConditions.data = System.Linq.PredicateBuilder.And(pres, extendExpression); 
 
        return whereConditions; 
    } 
 
    /// <summary> 
    /// æ–°å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public virtual async Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input) 
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var exist = await wmsmaterialsRepository.NameExistAsync(input.MaterialCode); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]); 
        } 
 
        var maxSort = await wmsmaterialsRepository.GetMaxSortAsync(); 
        var sort = input.Sort ?? maxSort; 
 
        var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input); 
        insertObj.Sort = sort; 
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None); 
 
        await wmsmaterialsRepository.InsertAsync(insertObj); 
 
        if (input.Sort.HasValue && insertObj.Sort != maxSort) 
        { 
            await AdjustSortAsync(insertObj.Id, insertObj.Sort); 
        } 
 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(insertObj); 
    } 
 
    /// <summary> 
    /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public virtual async Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input) 
    { 
        await CheckCreateOrUpdateDtoAsync(input); 
 
        var updateObj = await wmsmaterialsRepository.GetAsync(id); 
        var exist = await wmsmaterialsRepository.NameExistAsync(input.MaterialCode, updateObj.Id); 
        if (exist) 
        { 
            throw new UserFriendlyException(L[CMSPluginDomainErrorCodes.NameAlreadyExists, input.MaterialCode]); 
        } 
 
        updateObj.SetConcurrencyStampIfNotNull(input.ConcurrencyStamp); 
        input.MapExtraPropertiesTo(updateObj, MappingPropertyDefinitionChecks.None); 
 
                updateObj.MaterialCode = input.MaterialCode;
        updateObj.MaterialName = input.MaterialName;
        updateObj.PurchaseType = input.PurchaseType;
        updateObj.MaterialType = input.MaterialType;
        updateObj.PrimaryUnit = input.PrimaryUnit;
        updateObj.Standard = input.Standard;
        updateObj.OuterDiameter = input.OuterDiameter;
        updateObj.WallThickness = input.WallThickness;
        updateObj.MaterialQuality = input.MaterialQuality;
        updateObj.Length = input.Length;
        updateObj.IsMainBranch = input.IsMainBranch;
        updateObj.Factory = input.Factory;
        updateObj.Certification = input.Certification;
        updateObj.RedundantField1 = input.RedundantField1;
        updateObj.RedundantField2 = input.RedundantField2;
        updateObj.RedundantField3 = input.RedundantField3;
        updateObj.Remark = input.Remark;
        updateObj.IsDisabled = input.IsDisabled;
 
 
        await wmsmaterialsRepository.UpdateAsync(updateObj); 
 
        return ObjectMapper.Map<WmsMaterial, WmsMaterialDto>(updateObj); 
    } 
 
    /// <summary> 
    /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task<List<WmsMaterialDto>> CloneAsync(IEnumerable<Guid> ids) 
    { 
        //var wmsmaterialss = new List<WmsMaterial>(); 
        //if (ids != null) 
        //{ 
        //    var sort = await wmsmaterialsRepository.GetMaxSortAsync(); 
        //    foreach (var id in ids) 
        //    { 
        //        var WmsMaterial = await wmsmaterialsRepository.FindAsync(id); 
        //        if (WmsMaterial != null) 
        //        { 
        //            var name = WmsMaterial.Name + WmsMaterialConsts.CloneTag; 
        //            var notExist = false; 
        //            while (!notExist) 
        //            { 
        //                var exist = await wmsmaterialsRepository.NameExistAsync(name); 
        //                if (exist || wmsmaterialss.Any(x => x.Name == name)) 
        //                { 
        //                    name += WmsMaterialConsts.CloneTag; 
        //                    continue; 
        //                } 
 
        //                notExist = true; 
        //            } 
 
        //            //WmsMaterial = await wmsmaterialsRepository.InsertAsync(WmsMaterial.Clone(GuidGenerator.Create(), name, sort++)); 
        //            wmsmaterialss.Add(WmsMaterial); 
        //        } 
        //    } 
        //} 
 
        //return ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(wmsmaterialss); 
        return new List<WmsMaterialDto>(); 
    } 
 
    /// <summary> 
    /// åˆ é™¤å•ä¸ªç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public virtual Task DeleteAsync(Guid id) 
    { 
        return wmsmaterialsRepository.DeleteAsync(id); 
    } 
 
    /// <summary> 
    /// åˆ é™¤å¤šä¸ªç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="ids"></param> 
    /// <returns></returns> 
    public async Task DeleteManyAsync(IEnumerable<Guid> ids) 
    { 
        foreach (var id in ids) 
        { 
            await DeleteAsync(id); 
        } 
    } 
 
    /// <summary> 
    /// è°ƒæ•´æŽ’序物料基础信息表 
    /// </summary> 
    /// <param name="id"></param> 
    /// <param name="sort"></param> 
    /// <returns></returns> 
    public virtual async Task AdjustSortAsync(Guid id, int sort) 
    { 
        var list = await wmsmaterialsRepository.GetListAsync(null, nameof(WmsMaterial.Sort)); 
        if (list != null && list.Any()) 
        { 
            var initSort = 1; 
            list.ForEach(x => x.AdjustSort(initSort++)); 
            var entity = list.FirstOrDefault(x => x.Id == id); 
            if (entity != null) 
            { 
                if (sort == 1) 
                { 
                    list.Where(x => x.Id != id).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1)); 
                } 
                else if (entity.Sort > sort) 
                { 
                    list.Where(x => x.Id != id && x.Sort >= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1)); 
                    list.Where(x => x.Id != id && x.Sort < sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1)); 
                } 
                else if (entity.Sort < sort) 
                { 
                    list.Where(x => x.Id != id && x.Sort > sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort + 1)); 
                    list.Where(x => x.Id != id && x.Sort <= sort).ToList()?.ForEach(x => x.AdjustSort(x.Sort - 1)); 
                } 
 
                entity.AdjustSort(sort); 
            } 
        } 
 
        await wmsmaterialsRepository.UpdateManyAsync(list); 
    } 
 
    /// <summary> 
    /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    /// <exception cref="UserFriendlyException"></exception> 
    public async Task ImportAsync(WmsMaterialsImportModel input) 
    { 
        Check.NotNull(input, nameof(input)); 
 
        var wmsmaterialsCreateDtos = new List<(int RowIndex, WmsMaterialCreateDto Item)>(); 
        var wmsmaterialsUpdateDtos = new List<(int RowIndex, Guid Id, WmsMaterialUpdateDto Item)>(); 
        var importItems = input.WmsMaterials; 
 
        if (importItems != null && importItems.Any()) 
        { 
            #region å¯¼å…¥æ ¡éªŒ 
 
            // åˆ¤æ–­åç§°æ˜¯å¦é‡å¤ï¼Œå¹¶è¾“出第几行重复 
            var duplicateWmsMaterials = importItems.GroupBy(x => x.MaterialCode).Where(x => x.Count() > 1).ToList(); 
            if (duplicateWmsMaterials?.Any() == true) 
            { 
                var duplicateWmsMaterialMsgs = duplicateWmsMaterials.Select(x => $"第 {string.Join(",", x.Select(x => x.RowIndex))} è¡Œï¼š{x.Key}  åç§°é‡å¤"); 
                var errorMsg = $"导入失败！配置， {string.Join(",", duplicateWmsMaterialMsgs)}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
 
            #endregion 
 
            foreach (var impItem in importItems) 
            { 
                if (impItem.MaterialCode.IsNullOrWhiteSpace() && impItem.MaterialName.IsNullOrWhiteSpace()) 
                { 
                    continue; 
                } 
 
                if (impItem.MaterialCode.IsNullOrWhiteSpace()) 
                { 
                    var errorMsg = $"导入失败！配置，第{impItem.RowIndex}行：WmsMaterial名称不能为空"; 
                    throw new UserFriendlyException(errorMsg); 
                } 
 
                var oldWmsMaterial = await wmsmaterialsRepository.FindByNameAsync(impItem.MaterialCode); 
                if (oldWmsMaterial != null) 
                { 
                    var wmsmaterialsUpdateDto = new WmsMaterialUpdateDto 
                    { 
                        MaterialCode = impItem.MaterialCode, 
                        MaterialName = impItem.MaterialName, 
                        PurchaseType = impItem.PurchaseType, 
                        MaterialType = impItem.MaterialType, 
                        PrimaryUnit = impItem.PrimaryUnit, 
                        Standard = impItem.Standard, 
                        OuterDiameter = impItem.OuterDiameter, 
                        WallThickness = impItem.WallThickness, 
                        MaterialQuality = impItem.MaterialQuality, 
                        Length = impItem.Length, 
                        IsMainBranch = impItem.IsMainBranch, 
                        Factory = impItem.Factory, 
                        Certification = impItem.Certification, 
                        Remark = impItem.Remark, 
                    }; 
 
                    wmsmaterialsUpdateDtos.Add((impItem.RowIndex, oldWmsMaterial.Id, wmsmaterialsUpdateDto)); 
                } 
                else 
                { 
                    var wmsmaterialsCreateDto = new WmsMaterialCreateDto 
                    { 
                        MaterialCode = impItem.MaterialCode, 
                        MaterialName = impItem.MaterialName, 
                        PurchaseType = impItem.PurchaseType, 
                        MaterialType = impItem.MaterialType, 
                        PrimaryUnit = impItem.PrimaryUnit, 
                        Standard = impItem.Standard, 
                        OuterDiameter = impItem.OuterDiameter, 
                        WallThickness = impItem.WallThickness, 
                        MaterialQuality = impItem.MaterialQuality, 
                        Length = impItem.Length, 
                        IsMainBranch = impItem.IsMainBranch, 
                        Factory = impItem.Factory, 
                        Certification = impItem.Certification, 
                        Remark = impItem.Remark, 
                    }; 
 
                    wmsmaterialsCreateDtos.Add((impItem.RowIndex, wmsmaterialsCreateDto)); 
                } 
            } 
        } 
 
        // æ–°å¢ž 
        foreach (var wmsmaterialsDto in wmsmaterialsCreateDtos) 
        { 
            try 
            { 
                await CreateAsync(wmsmaterialsDto.Item); 
            } 
            catch (Exception e) 
            { 
                var errorMsg = $"导入失败！配置，第{wmsmaterialsDto.RowIndex}行：{e.Message}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
        } 
 
        // æ›´æ–° 
        foreach (var wmsmaterialsDto in wmsmaterialsUpdateDtos) 
        { 
            try 
            { 
                await UpdateAsync(wmsmaterialsDto.Id, wmsmaterialsDto.Item); 
            } 
            catch (Exception e) 
            { 
                var errorMsg = $"导入失败！配置，第{wmsmaterialsDto.RowIndex}行：{e.Message}，终止导入"; 
                throw new UserFriendlyException(errorMsg); 
            } 
        } 
    } 
 
    /// <summary> 
    /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    public async Task<(Dictionary<string, object> Sheets, string FileName)> ExportAsync(GetWmsMaterialInput input) 
    { 
        Check.NotNull(input, nameof(input)); 
 
        if (input.Sorting.IsNullOrWhiteSpace()) 
        { 
            input.Sorting = nameof(WmsMaterial.Sort); 
        } 
 
        #region åŠ¨æ€æž„造查询条件  
 
        //动态构造查询条件  
        var whereConditions = DynamicGetQueryParams(input); 
 
        #endregion 
 
 
        var list = await wmsmaterialsRepository.GetListAsync(whereConditions, input.Sorting, input.MaxResultCount, input.SkipCount, includeDetails: true); 
        var result = ObjectMapper.Map<List<WmsMaterial>, List<WmsMaterialDto>>(list); 
 
        var sheets = new Dictionary<string, object> 
        { 
            ["配置"] = ExportHelper.ConvertListToExportData(result), 
        }; 
 
        var fileName = result.Count > 1 ? "WmsMaterial列表" : result.Count == 1 ? result[0]?.MaterialCode : "WmsMaterial模版"; 
        return (sheets, fileName); 
    } 
 
    /// <summary> 
    /// æ ¡éªŒç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ï¼Œå½“新建或更新时 
    /// </summary> 
    /// <param name="input"></param> 
    /// <returns></returns> 
    protected Task CheckCreateOrUpdateDtoAsync(WmsMaterialCreateOrUpdateDtoBase input) 
    { 
        Check.NotNull(input, nameof(input)); 
                Check.NotNullOrWhiteSpace(input.MaterialCode, "物料编码（唯一标识）", 64);
        Check.NotNullOrWhiteSpace(input.MaterialName, "物料名称", 128);
        Check.NotNull(input.PurchaseType, "采购类型（枚举值）");
        Check.NotNull(input.MaterialType, "物料类型（枚举值）");
        Check.NotNull(input.OuterDiameter, "外径（单位：mm）");
        Check.NotNull(input.WallThickness, "壁厚（单位：mm）");
        Check.NotNull(input.Length, "长度（单位：m）");
        Check.NotNull(input.IsMainBranch, "是否为主支管");
 
        return Task.CompletedTask; 
    } 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/IWmsMaterialRepository.cs

@@ -1,53 +1,53 @@
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;
using Volo.Abp.Domain.Repositories;

namespace CMS.Plugin.HIAWms.Domain.WmsMaterial;

/// <summary>
/// ç‰©æ–™åŸºç¡€æ•°æ®ä»“储
/// </summary>
public interface IWmsMaterialRepository : IBasicRepository<WmsMaterial, Guid>
{
    /// <summary>
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾ç‰©æ–™åŸºç¡€æ•°æ®
    /// </summary>
    /// <param name="name"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default);

    /// <summary>
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨ç‰©æ–™åŸºç¡€æ•°æ®
    /// </summary>
    /// <param name="name"></param>
    /// <param name="id"></param>
    /// <returns></returns>
    Task<bool> NameExistAsync(string name, Guid? id = null);

    /// <summary>
    /// èŽ·å–最大排序物料基础数据
    /// </summary>
    /// <returns></returns>
    Task<int> GetMaxSortAsync();

    /// <summary>
    /// èŽ·å–分页列表物料基础数据
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="sorting"></param>
    /// <param name="maxResultCount"></param>
    /// <param name="skipCount"></param>
    /// <param name="includeDetails"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default);

    /// <summary>
    /// èŽ·å–总数物料基础数据
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default);
}
using CmsQueryExtensions.Extension; 
using System.Linq.Expressions; 
using Volo.Abp.Domain.Repositories; 
 
namespace CMS.Plugin.HIAWms.Domain.WmsMaterial; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ä»“储 
/// </summary> 
public interface IWmsMaterialRepository : IBasicRepository<WmsMaterial, Guid> 
{ 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    Task<bool> NameExistAsync(string name, Guid? id = null); 
 
    /// <summary> 
    /// èŽ·å–最大排序物料基础信息表 
    /// </summary> 
    /// <returns></returns> 
    Task<int> GetMaxSortAsync(); 
 
    /// <summary> 
    /// èŽ·å–分页列表物料基础信息表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
    /// <param name="maxResultCount"></param> 
    /// <param name="skipCount"></param> 
    /// <param name="includeDetails"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default); 
 
    /// <summary> 
    /// èŽ·å–总数物料基础信息表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default); 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Repositories/EfCoreWmsMaterialRepository.cs

@@ -1,113 +1,113 @@
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions;
using CmsQueryExtensions.Extension;
using Microsoft.EntityFrameworkCore;
using System.Linq.Dynamic.Core;
using System.Linq.Expressions;
using Volo.Abp.Domain.Repositories.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore;


namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories;

/// <summary>
/// ç‰©æ–™åŸºç¡€æ•°æ®ä»“储实现
/// </summary>
public class EfCoreWmsMaterialRepository : EfCoreRepository<ICMSPluginDbContext, WmsMaterial, Guid>, IWmsMaterialRepository
{
    /// <summary>
    /// Initializes a new instance of the <see cref="EfCoreWmsMaterialRepository"/> class.
    /// </summary>
    /// <param name="dbContextProvider">The database context provider.</param>
    public EfCoreWmsMaterialRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider)
        : base(dbContextProvider)
    {
    }

    /// <summary>
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾ç‰©æ–™åŸºç¡€æ•°æ®
    /// </summary>
    /// <param name="name"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public virtual async Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default)
    {
        return await (await GetDbSetAsync())
            .IncludeDetails()
            .Where(x => !x.IsDeleted)
            .OrderBy(t => t.Sort)
            .FirstOrDefaultAsync(t => t.MaterialCode == name, GetCancellationToken(cancellationToken));
    }

    /// <summary>
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨ç‰©æ–™åŸºç¡€æ•°æ®
    /// </summary>
    /// <param name="materialCode"></param>
    /// <param name="id"></param>
    /// <returns></returns>
    public async Task<bool> NameExistAsync(string materialCode, Guid? id = null)
    {
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialCode == materialCode);
    }

    /// <summary>
    /// èŽ·å–最大排序物料基础数据
    /// </summary>
    /// <returns></returns>
    public async Task<int> GetMaxSortAsync()
    {
        var hasAny = await (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).AnyAsync();
        if (!hasAny)
        {
            return 1;
        }

        var sort = await (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort);
        return sort + 1;
    }

    /// <summary>
    /// èŽ·å–分页列表物料基础数据
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="sorting"></param>
    /// <param name="maxResultCount"></param>
    /// <param name="skipCount"></param>
    /// <param name="includeDetails"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default)
    {
        return await (await GetDbSetAsync())
            .IncludeDetails(includeDetails)
            .WhereIf(whereConditions != null, whereConditions.data)
            .Where(x => !x.IsDeleted)
            .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting)
            .PageBy(skipCount, maxResultCount)
            .ToListAsync(GetCancellationToken(cancellationToken));
    }

    /// <summary>
    /// èŽ·å–总数物料基础数据
    /// </summary>
    /// <param name="whereConditions"></param>
    /// <param name="cancellationToken"></param>
    /// <returns></returns>
    public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default)
    {
        return await (await GetQueryableAsync())
            .WhereIf(whereConditions != null, whereConditions.data)
            .Where(x => !x.IsDeleted)
            .CountAsync(cancellationToken: GetCancellationToken(cancellationToken));
    }


    /// <inheritdoc />
    public override async Task<IQueryable<WmsMaterial>> WithDetailsAsync()
    {
        return (await GetQueryableAsync())
            .Where(x => !x.IsDeleted).IncludeDetails();
    }
}
using CMS.Plugin.HIAWms.Domain.WmsMaterial; 
using CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions; 
using CmsQueryExtensions.Extension; 
using Microsoft.EntityFrameworkCore; 
using System.Linq.Dynamic.Core; 
using System.Linq.Expressions; 
using Volo.Abp.Domain.Repositories.EntityFrameworkCore; 
using Volo.Abp.EntityFrameworkCore; 
 
 
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Repositories; 
 
/// <summary> 
/// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ä»“储实现 
/// </summary> 
public class EfCoreWmsMaterialRepository : EfCoreRepository<ICMSPluginDbContext, WmsMaterial, Guid>, IWmsMaterialRepository 
{ 
    /// <summary> 
    /// Initializes a new instance of the <see cref="EfCoreWmsMaterialRepository"/> class. 
    /// </summary> 
    /// <param name="dbContextProvider">The database context provider.</param> 
    public EfCoreWmsMaterialRepository(IDbContextProvider<ICMSPluginDbContext> dbContextProvider) 
        : base(dbContextProvider) 
    { 
    } 
 
    /// <summary> 
    /// æŒ‰ç…§åç§°æŸ¥æ‰¾ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="name"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public virtual async Task<WmsMaterial> FindByNameAsync(string name, CancellationToken cancellationToken = default) 
    { 
        return await (await GetDbSetAsync()) 
            .IncludeDetails() 
            .Where(x => !x.IsDeleted) 
            .OrderBy(t => t.Sort) 
            .FirstOrDefaultAsync(t => t.MaterialCode == name, GetCancellationToken(cancellationToken)); 
    } 
 
    /// <summary> 
    /// éªŒè¯åç§°æ˜¯å¦å­˜åœ¨ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
    /// </summary> 
    /// <param name="materialCode"></param> 
    /// <param name="id"></param> 
    /// <returns></returns> 
    public async Task<bool> NameExistAsync(string materialCode, Guid? id = null) 
    { 
        return await (await GetDbSetAsync()).WhereIf(id.HasValue, p => p.Id != id).Where(x => !x.IsDeleted).AnyAsync(x => x.MaterialCode == materialCode); 
    } 
 
    /// <summary> 
    /// èŽ·å–最大排序物料基础信息表 
    /// </summary> 
    /// <returns></returns> 
    public async Task<int> GetMaxSortAsync() 
    { 
        var hasAny = await (await GetQueryableAsync()) 
            .Where(x => !x.IsDeleted).AnyAsync(); 
        if (!hasAny) 
        { 
            return 1; 
        } 
 
        var sort = await (await GetQueryableAsync()) 
            .Where(x => !x.IsDeleted).MaxAsync(x => x.Sort); 
        return sort + 1; 
    } 
 
    /// <summary> 
    /// èŽ·å–分页列表物料基础信息表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="sorting"></param> 
    /// <param name="maxResultCount"></param> 
    /// <param name="skipCount"></param> 
    /// <param name="includeDetails"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public async Task<List<WmsMaterial>> GetListAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, string sorting = null, int maxResultCount = int.MaxValue, int skipCount = 0, bool includeDetails = false, CancellationToken cancellationToken = default) 
    { 
        return await (await GetDbSetAsync()) 
            .IncludeDetails(includeDetails) 
            .WhereIf(whereConditions != null, whereConditions.data) 
            .Where(x => !x.IsDeleted) 
            .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting) 
            .PageBy(skipCount, maxResultCount) 
            .ToListAsync(GetCancellationToken(cancellationToken)); 
    } 
 
    /// <summary> 
    /// èŽ·å–总数物料基础信息表 
    /// </summary> 
    /// <param name="whereConditions"></param> 
    /// <param name="cancellationToken"></param> 
    /// <returns></returns> 
    public async Task<long> GetCountAsync(FunReturnResultModel<Expression<Func<WmsMaterial, bool>>> whereConditions, CancellationToken cancellationToken = default) 
    { 
        return await (await GetQueryableAsync()) 
            .WhereIf(whereConditions != null, whereConditions.data) 
            .Where(x => !x.IsDeleted) 
            .CountAsync(cancellationToken: GetCancellationToken(cancellationToken)); 
    } 
 
 
    /// <inheritdoc /> 
    public override async Task<IQueryable<WmsMaterial>> WithDetailsAsync() 
    { 
        return (await GetQueryableAsync()) 
            .Where(x => !x.IsDeleted).IncludeDetails(); 
    } 
} 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms/Controller/WmsMaterialController.cs

@@ -1,188 +1,188 @@
using Ao.Lang;
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using MiniExcelLibs;
using System.Reflection;
using Volo.Abp;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Controller
{
    /// <summary>
    /// ç‰©æ–™åŸºç¡€ä¿¡æ¯æœåŠ¡
    /// </summary>
    [ApiController]
    [TypeFilter(typeof(CMSLanguageFilter))]
    [TypeFilter(typeof(CMSUowActionFilter))]
    [TypeFilter(typeof(CMSAuditActionFilter))]
    [TypeFilter(typeof(CMSExceptionFilter))]
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")]
    public class WmsMaterialController : ControllerBase
    {
        private readonly IWmsMaterialAppService _wmsmaterialAppService;

        /// <summary>
        /// Initializes a new instance of the <see cref="WmsMaterialController"/> class.
        /// </summary>
        /// <param name="wmsmaterialAppService">The wmsmaterial application service.</param>
        public WmsMaterialController(IWmsMaterialAppService wmsmaterialAppService)
        {
            _wmsmaterialAppService = wmsmaterialAppService;
        }

        /// <summary>
        /// èŽ·å–物料基础信息
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        [HttpGet]
        [Route("{id}")]
        public virtual Task<WmsMaterialDto> GetAsync(Guid id)
        {
            return _wmsmaterialAppService.GetAsync(id);
        }

        /// <summary>
        /// åˆ†é¡µèŽ·å–物料基础信息的列表.
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        [HttpGet]
        [Route("Page")]
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input)
        {
            return _wmsmaterialAppService.GetListAsync(input);
        }

        /// <summary>
        /// åˆ›å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPost]
        public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input)
        {
            return _wmsmaterialAppService.CreateAsync(input);
        }

        /// <summary>
        /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <param name="input">输入.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPut]
        [Route("{id}")]
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input)
        {
            return _wmsmaterialAppService.UpdateAsync(id, input);
        }

        /// <summary>
        /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <param name="ids">Id集合.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpPost]
        [Route("Clone")]
        public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsmaterialAppService.CloneAsync(ids);
        }

        /// <summary>
        /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpDelete]
        [Route("{id}")]
        public virtual Task DeleteAsync(Guid id)
        {
            return _wmsmaterialAppService.DeleteAsync(id);
        }

        /// <summary>
        /// æ‰¹é‡åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <param name="ids">The ids.</param>
        /// <returns></returns>
        //[Authorize]
        [HttpDelete]
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids)
        {
            return _wmsmaterialAppService.DeleteManyAsync(ids);
        }

        /// <summary>
        /// è°ƒæ•´æŽ’序物料基础信息
        /// </summary>
        /// <param name="id">标识符.</param>
        /// <returns></returns>
        [HttpPut]
        [Route("{id}/AdjustSort/{sort}")]
        public virtual Task AdjustSortAsync(Guid id, int sort)
        {
            return _wmsmaterialAppService.AdjustSortAsync(id, sort);
        }

        /// <summary>
        /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [Authorize]
        [HttpPost]
        [Route("Import")]
        public virtual async Task<IActionResult> ImportAsync(IFormFile file)
        {
            using var stream = new MemoryStream();
            await file.CopyToAsync(stream);
            stream.Seek(0L, SeekOrigin.Begin);

            var sheetNames = stream.GetSheetNames();
            var wmsmaterialRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new();

            if (!wmsmaterialRows.Any())
            {
                throw new UserFriendlyException("请检查导入的表格");
            }

            await _wmsmaterialAppService.ImportAsync(new WmsMaterialsImportModel
            {
                WmsMaterials = wmsmaterialRows,
            });

            return Ok();
        }

        /// <summary>
        /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯
        /// </summary>
        /// <returns></returns>
        [HttpGet]
        [Route("Export")]
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input)
        {
            input.MaxResultCount = int.MaxValue;
            var exportData = await _wmsmaterialAppService.ExportAsync(input);
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial导出模板.xlsx");
            if (!System.IO.File.Exists(templatePath))
            {
                templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsMaterial导出模板.xlsx");
            }

            var memoryStream = new MemoryStream();
            await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets);
            memoryStream.Seek(0L, SeekOrigin.Begin);
            return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" };
        }
    }
}
using Ao.Lang; 
using CMS.Extensions.Abp.AspNetCore.Mvc.Filters; 
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterial; 
using CMS.Plugin.HIAWms.Application.Contracts.Services; 
using Microsoft.AspNetCore.Authorization; 
using Microsoft.AspNetCore.Http; 
using Microsoft.AspNetCore.Mvc; 
using MiniExcelLibs; 
using System.Reflection; 
using Volo.Abp; 
using Volo.Abp.Application.Dtos; 
 
namespace CMS.Plugin.HIAWms.Controller 
{ 
    /// <summary> 
    /// ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨æœåŠ¡ 
    /// </summary> 
    [ApiController] 
    [TypeFilter(typeof(CMSLanguageFilter))] 
    [TypeFilter(typeof(CMSUowActionFilter))] 
    [TypeFilter(typeof(CMSAuditActionFilter))] 
    [TypeFilter(typeof(CMSExceptionFilter))] 
    [Route("api/v{version:apiVersion}/HIAWms/[controller]")] 
    public class WmsMaterialController : ControllerBase 
    { 
        private readonly IWmsMaterialAppService _wmsmaterialsAppService; 
 
        /// <summary> 
        /// Initializes a new instance of the <see cref="WmsMaterialController"/> class. 
        /// </summary> 
        /// <param name="wmsmaterialsAppService">The wmsmaterials application service.</param> 
        public WmsMaterialController(IWmsMaterialAppService wmsmaterialsAppService) 
        { 
            _wmsmaterialsAppService = wmsmaterialsAppService; 
        } 
 
        /// <summary> 
        /// èŽ·å–物料基础信息表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> GetAsync(Guid id) 
        { 
            return _wmsmaterialsAppService.GetAsync(id); 
        } 
 
        /// <summary> 
        /// åˆ†é¡µèŽ·å–物料基础信息表的列表. 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("Page")] 
        public virtual Task<PagedResultDto<WmsMaterialDto>> GetListAsync([FromQuery] GetWmsMaterialInput input) 
        { 
            return _wmsmaterialsAppService.GetListAsync(input); 
        } 
 
        /// <summary> 
        /// åˆ›å»ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPost] 
        public virtual Task<WmsMaterialDto> CreateAsync(WmsMaterialCreateDto input) 
        { 
            return _wmsmaterialsAppService.CreateAsync(input); 
        } 
 
        /// <summary> 
        /// æ›´æ–°ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <param name="input">输入.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPut] 
        [Route("{id}")] 
        public virtual Task<WmsMaterialDto> UpdateAsync(Guid id, WmsMaterialUpdateDto input) 
        { 
            return _wmsmaterialsAppService.UpdateAsync(id, input); 
        } 
 
        /// <summary> 
        /// å…‹éš†ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="ids">Id集合.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpPost] 
        [Route("Clone")] 
        public virtual Task<List<WmsMaterialDto>> CloneAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsmaterialsAppService.CloneAsync(ids); 
        } 
 
        /// <summary> 
        /// åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpDelete] 
        [Route("{id}")] 
        public virtual Task DeleteAsync(Guid id) 
        { 
            return _wmsmaterialsAppService.DeleteAsync(id); 
        } 
 
        /// <summary> 
        /// æ‰¹é‡åˆ é™¤ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <param name="ids">The ids.</param> 
        /// <returns></returns> 
        //[Authorize] 
        [HttpDelete] 
        public virtual Task DeleteAsync([FromBody] IEnumerable<Guid> ids) 
        { 
            return _wmsmaterialsAppService.DeleteManyAsync(ids); 
        } 
 
        /// <summary> 
        /// è°ƒæ•´æŽ’序物料基础信息表 
        /// </summary> 
        /// <param name="id">标识符.</param> 
        /// <returns></returns> 
        [HttpPut] 
        [Route("{id}/AdjustSort/{sort}")] 
        public virtual Task AdjustSortAsync(Guid id, int sort) 
        { 
            return _wmsmaterialsAppService.AdjustSortAsync(id, sort); 
        } 
 
        /// <summary> 
        /// å¯¼å…¥ç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <returns></returns> 
        [Authorize] 
        [HttpPost] 
        [Route("Import")] 
        public virtual async Task<IActionResult> ImportAsync(IFormFile file) 
        { 
            using var stream = new MemoryStream(); 
            await file.CopyToAsync(stream); 
            stream.Seek(0L, SeekOrigin.Begin); 
 
            var sheetNames = stream.GetSheetNames(); 
            var wmsmaterialsRows = sheetNames.Contains("配置") ? MiniExcel.Query<WmsMaterialsImportModel.WmsMaterialImportModel>(stream, sheetName: "配置").ToList() : new(); 
 
            if (!wmsmaterialsRows.Any()) 
            { 
                throw new UserFriendlyException("请检查导入的表格"); 
            } 
 
            await _wmsmaterialsAppService.ImportAsync(new WmsMaterialsImportModel 
            { 
                WmsMaterials = wmsmaterialsRows, 
            }); 
 
            return Ok(); 
        } 
 
        /// <summary> 
        /// å¯¼å‡ºç‰©æ–™åŸºç¡€ä¿¡æ¯è¡¨ 
        /// </summary> 
        /// <returns></returns> 
        [HttpGet] 
        [Route("Export")] 
        public virtual async Task<IActionResult> ExportAsync([FromQuery] GetWmsMaterialInput input) 
        { 
            input.MaxResultCount = int.MaxValue; 
            var exportData = await _wmsmaterialsAppService.ExportAsync(input); 
            var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Resources/Templates/WmsMaterial导出模板.xlsx"); 
            if (!System.IO.File.Exists(templatePath)) 
            { 
                templatePath = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) ?? string.Empty, $"Resources/Templates/WmsMaterial导出模板.xlsx"); 
            } 
 
            var memoryStream = new MemoryStream(); 
            await memoryStream.SaveAsByTemplateAsync(templatePath, exportData.Sheets); 
            memoryStream.Seek(0L, SeekOrigin.Begin); 
            return new FileStreamResult(memoryStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") { FileDownloadName = $"{exportData.FileName}_{DateTime.Now:yyyyMMddhhmmss}.xlsx" }; 
        } 
    } 
}