222

schangxiang@126.com

2025-05-08 645784f3c94c9bbf0ba71cda119cd0abc6ae3709

222

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

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

ÎļþÒÑɾ³ý

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,104 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace CMS.Plugin.HIAWms.Domain.Extension
{
    /// <summary>
    /// ç”¨äºŽæ‰©å±• EntityTypeBuilder çš„静态类，提供针对继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型的配置扩展方法
    /// </summary>
    public static class EntityTypeBuilderExtensions
    {
        /// <summary>
        /// é’ˆå¯¹ç»§æ‰¿è‡ª MyFullAuditedAggregateRoot<Guid> çš„实体类型，配置其公共属性
        /// </summary>
        /// <typeparam name="TEntity">继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型</typeparam>
        /// <param name="b">EntityTypeBuilder<TEntity> å®žä¾‹ï¼Œç”¨äºŽé…ç½®å®žä½“的属性</param>
        public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
        {
            b.Property(x => x.CreatorId)
             .HasMaxLength(36)
             .IsRequired(false)
             .HasComment("创建人ID");

            b.Property(x => x.CreatorName)
                .HasMaxLength(64)
                .IsRequired(false)
                .HasComment("创建人");

            b.Property(x => x.CreationTime)
                .IsRequired()
                .HasComment("创建时间");

            b.Property(x => x.LastModifierName)
                .HasMaxLength(64)
                .IsRequired(false)
                .HasComment("修改人");

            b.Property(x => x.LastModifierId)
                .HasMaxLength(36)
                .IsRequired(false)
                .HasComment("修改人ID");

            b.Property(x => x.LastModificationTime)
                .IsRequired(false)
                .HasComment("修改时间");

            b.Property(x => x.IsDeleted)
                .IsRequired()
                .HasComment("是否删除");

            b.Property(x => x.DeleterId)
                .HasMaxLength(36)
                .IsRequired(false)
                .HasComment("删除人ID");

            b.Property(x => x.DeletionTime)
                .IsRequired(false)
                .HasComment("删除时间");

            b.Property(x => x.ExtraProperties)
                .IsRequired(false)
                .HasComment("扩展属性");

            b.Property(x => x.ConcurrencyStamp)
                .IsRequired(false)
                .HasMaxLength(40)
                .HasComment("并发戳");

            b.Property(x => x.Sort)
                .HasDefaultValue(0)
                .HasComment("排序");

            b.Property(x => x.Remark)
                .HasMaxLength(500)
                .IsRequired(false)
                .HasComment("备注");

            b.Property(x => x.IsDisabled)
                .IsRequired(false)
                .HasDefaultValue(false)
                .HasComment("是否禁用");

            b.Property(x => x.ExtraField1)
              .HasMaxLength(256)
              .IsRequired(false)
              .HasComment("扩展字段1");

            b.Property(x => x.ExtraField2)
               .HasMaxLength(256)
               .IsRequired(false)
               .HasComment("扩展字段2");

            b.Property(x => x.ExtraField3)
             .HasMaxLength(256)
             .IsRequired(false)
             .HasComment("扩展字段3");

        }
    }
}

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

@@ -1,84 +1,115 @@
//using System;
//using Volo.Abp.Auditing;
//using Volo.Abp.Domain.Entities.Auditing;
using System;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities.Auditing;

//namespace CMS.Plugin.HIAWms.Domain;

///// <summary>
///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots.
///// </summary>
//[Serializable]
//public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
//{
//    /// <summary>
//    /// åˆ›å»ºäºº
//    /// </summary>
//    public virtual string? CreatorName { get; set; }

//    /// <summary>
//    /// ä¿®æ”¹äºº
//    /// </summary>
//    public virtual string? LastModifierName { get; set; }

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

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

//    /// <summary>
//    /// æ˜¯å¦ç¦ç”¨
//    /// </summary>
//    public virtual bool? IsDisabled { get; set; }
namespace CMS.Plugin.HIAWms.Domain;


//}
/// <summary>
/// å®žä½“类基类
/// </summary>
[Serializable]
public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
{
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public virtual string? CreatorName { get; set; }

///// <summary>
///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots.
///// </summary>
///// <typeparam name="TKey">Type of the primary key of the entity</typeparam>
//[Serializable]
//public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
//{
//    /// <summary>
//    /// åˆ›å»ºäºº
//    /// </summary>
//    public virtual string? CreatorName { get; set; }
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public virtual string? LastModifierName { get; set; }

//    /// <summary>
//    /// ä¿®æ”¹äºº
//    /// </summary>
//    public virtual string? LastModifierName { get; set; }
    /// <summary>
    /// æŽ’序
    /// </summary>
    public virtual int Sort { get; set; }

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

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

//    /// <summary>
//    /// æ˜¯å¦ç¦ç”¨
//    /// </summary>
//    public virtual bool? IsDisabled { get; set; }
    /// <summary>
    /// æ‰©å±•å­—段1
    /// </summary>
    public virtual string? ExtraField1 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段2
    /// </summary>
    public virtual string? ExtraField2 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段3
    /// </summary>
    public virtual string? ExtraField3 { get; set; }


//    protected MyFullAuditedAggregateRoot()
//    {
}

//    }
/// <summary>
/// å®žä½“类基类
/// </summary>
/// <typeparam name="TKey"></typeparam>
[Serializable]
public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
{
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public virtual string? CreatorName { get; set; }

//    protected MyFullAuditedAggregateRoot(TKey id)
//    : base(id)
//    {
    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public virtual string? LastModifierName { get; set; }

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

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

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


    /// <summary>
    /// æ‰©å±•å­—段1
    /// </summary>
    public virtual string? ExtraField1 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段2
    /// </summary>
    public virtual string? ExtraField2 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段3
    /// </summary>
    public virtual string? ExtraField3 { get; set; }

    protected MyFullAuditedAggregateRoot()
    {

    }

    protected MyFullAuditedAggregateRoot(TKey id)
    : base(id)
    {

    }
}

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

@@ -92,6 +92,20 @@
        /// </summary>
        public string RedundantField3 { get; set; }

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

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

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

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

@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.Extension;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
using CmsQueryExtensions.Extension;

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

@@ -84,7 +84,7 @@
            .IncludeDetails(includeDetails) 
            .WhereIf(whereConditions != null, whereConditions.data) 
            .Where(x => !x.IsDeleted) 
            .OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting) 
            //.OrderBy(sorting.IsNullOrEmpty() ? nameof(WmsMaterial.Sort) : sorting) 
            .PageBy(skipCount, maxResultCount) 
            .ToListAsync(GetCancellationToken(cancellationToken)); 
    } 

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs

@@ -1,99 +1,99 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
//using Microsoft.EntityFrameworkCore;
//using Microsoft.EntityFrameworkCore.Metadata.Builders;

namespace CmsQueryExtensions.Extension
{
    /// <summary>
    /// ç”¨äºŽæ‰©å±• EntityTypeBuilder çš„静态类，提供针对继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型的配置扩展方法
    /// </summary>
    public static class EntityTypeBuilderExtensions
    {
        /// <summary>
        /// é’ˆå¯¹ç»§æ‰¿è‡ª MyFullAuditedAggregateRoot<Guid> çš„实体类型，配置其公共属性
        /// </summary>
        /// <typeparam name="TEntity">继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型</typeparam>
        /// <param name="b">EntityTypeBuilder<TEntity> å®žä¾‹ï¼Œç”¨äºŽé…ç½®å®žä½“的属性</param>
        public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
        {
            b.Property(x => x.CreatorId)
             .HasMaxLength(36)
             .IsRequired(false)
             .HasComment("创建人ID");
//namespace CmsQueryExtensions.Extension
//{
//    /// <summary>
//    /// ç”¨äºŽæ‰©å±• EntityTypeBuilder çš„静态类，提供针对继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型的配置扩展方法
//    /// </summary>
//    public static class EntityTypeBuilderExtensions
//    {
//        /// <summary>
//        /// é’ˆå¯¹ç»§æ‰¿è‡ª MyFullAuditedAggregateRoot<Guid> çš„实体类型，配置其公共属性
//        /// </summary>
//        /// <typeparam name="TEntity">继承自 MyFullAuditedAggregateRoot<Guid> çš„实体类型</typeparam>
//        /// <param name="b">EntityTypeBuilder<TEntity> å®žä¾‹ï¼Œç”¨äºŽé…ç½®å®žä½“的属性</param>
//        public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
//        {
//            b.Property(x => x.CreatorId)
//             .HasMaxLength(36)
//             .IsRequired(false)
//             .HasComment("创建人ID");

            b.Property(x => x.CreatorName)
                .HasMaxLength(64)
                .IsRequired(false)
                .HasComment("创建人");
//            b.Property(x => x.CreatorName)
//                .HasMaxLength(64)
//                .IsRequired(false)
//                .HasComment("创建人");

            b.Property(x => x.CreationTime)
                .IsRequired()
                .HasComment("创建时间");
//            b.Property(x => x.CreationTime)
//                .IsRequired()
//                .HasComment("创建时间");

            b.Property(x => x.LastModifierName)
                .HasMaxLength(64)
                .IsRequired(false)
                .HasComment("修改人");
//            b.Property(x => x.LastModifierName)
//                .HasMaxLength(64)
//                .IsRequired(false)
//                .HasComment("修改人");

            b.Property(x => x.LastModifierId)
                .HasMaxLength(36)
                .IsRequired(false)
                .HasComment("修改人ID");
//            b.Property(x => x.LastModifierId)
//                .HasMaxLength(36)
//                .IsRequired(false)
//                .HasComment("修改人ID");

            b.Property(x => x.LastModificationTime)
                .IsRequired(false)
                .HasComment("修改时间");
//            b.Property(x => x.LastModificationTime)
//                .IsRequired(false)
//                .HasComment("修改时间");

            b.Property(x => x.IsDeleted)
                .IsRequired()
                .HasComment("是否删除");
//            b.Property(x => x.IsDeleted)
//                .IsRequired()
//                .HasComment("是否删除");

            b.Property(x => x.DeleterId)
                .HasMaxLength(36)
                .IsRequired(false)
                .HasComment("删除人ID");
//            b.Property(x => x.DeleterId)
//                .HasMaxLength(36)
//                .IsRequired(false)
//                .HasComment("删除人ID");

            b.Property(x => x.DeletionTime)
                .IsRequired(false)
                .HasComment("删除时间");
//            b.Property(x => x.DeletionTime)
//                .IsRequired(false)
//                .HasComment("删除时间");

            b.Property(x => x.ExtraProperties)
                .IsRequired(false)
                .HasComment("扩展属性");
//            b.Property(x => x.ExtraProperties)
//                .IsRequired(false)
//                .HasComment("扩展属性");

            b.Property(x => x.ConcurrencyStamp)
                .IsRequired(false)
                .HasMaxLength(40)
                .HasComment("并发戳");
//            b.Property(x => x.ConcurrencyStamp)
//                .IsRequired(false)
//                .HasMaxLength(40)
//                .HasComment("并发戳");

            b.Property(x => x.Sort)
                .HasDefaultValue(0)
                .HasComment("排序");
//            b.Property(x => x.Sort)
//                .HasDefaultValue(0)
//                .HasComment("排序");

            b.Property(x => x.Remark)
                .HasMaxLength(500)
                .IsRequired(false)
                .HasComment("备注");
//            b.Property(x => x.Remark)
//                .HasMaxLength(500)
//                .IsRequired(false)
//                .HasComment("备注");

            b.Property(x => x.IsDisabled)
                .IsRequired(false)
                .HasDefaultValue(false)
                .HasComment("是否禁用");
//            b.Property(x => x.IsDisabled)
//                .IsRequired(false)
//                .HasDefaultValue(false)
//                .HasComment("是否禁用");

            b.Property(x => x.ExtraField1)
              .HasMaxLength(256)
              .IsRequired(false)
              .HasComment("扩展字段1");
//            b.Property(x => x.ExtraField1)
//              .HasMaxLength(256)
//              .IsRequired(false)
//              .HasComment("扩展字段1");

            b.Property(x => x.ExtraField2)
               .HasMaxLength(256)
               .IsRequired(false)
               .HasComment("扩展字段2");
//            b.Property(x => x.ExtraField2)
//               .HasMaxLength(256)
//               .IsRequired(false)
//               .HasComment("扩展字段2");

            b.Property(x => x.ExtraField3)
             .HasMaxLength(256)
             .IsRequired(false)
             .HasComment("扩展字段3");
//            b.Property(x => x.ExtraField3)
//             .HasMaxLength(256)
//             .IsRequired(false)
//             .HasComment("扩展字段3");

        }
    }
}
//        }
//    }
//}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs

@@ -1,114 +1,114 @@
using System;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities.Auditing;
//using System;
//using Volo.Abp.Auditing;
//using Volo.Abp.Domain.Entities.Auditing;

namespace CmsQueryExtensions.Extension;
//namespace CmsQueryExtensions.Extension;
//CMS无法加载该文件，应该是CMS不会找这个dll内容吧
///// <summary>
///// å®žä½“类基类
///// </summary>
//[Serializable]
//public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
//{
//    /// <summary>
//    /// åˆ›å»ºäºº
//    /// </summary>
//    public virtual string? CreatorName { get; set; }

/// <summary>
/// å®žä½“类基类
/// </summary>
[Serializable]
public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
{
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public virtual string? CreatorName { get; set; }
//    /// <summary>
//    /// ä¿®æ”¹äºº
//    /// </summary>
//    public virtual string? LastModifierName { get; set; }

    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public virtual string? LastModifierName { get; set; }
//    /// <summary>
//    /// æŽ’序
//    /// </summary>
//    public virtual int Sort { get; set; }

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

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

    /// <summary>
    /// æ˜¯å¦ç¦ç”¨
    /// </summary>
    public virtual bool? IsDisabled { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段1
//    /// </summary>
//    public virtual string? ExtraField1 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段1
    /// </summary>
    public virtual string? ExtraField1 { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段2
//    /// </summary>
//    public virtual string? ExtraField2 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段2
    /// </summary>
    public virtual string? ExtraField2 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段3
    /// </summary>
    public virtual string? ExtraField3 { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段3
//    /// </summary>
//    public virtual string? ExtraField3 { get; set; }


}
//}

/// <summary>
/// å®žä½“类基类
/// </summary>
/// <typeparam name="TKey"></typeparam>
[Serializable]
public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
{
    /// <summary>
    /// åˆ›å»ºäºº
    /// </summary>
    public virtual string? CreatorName { get; set; }
///// <summary>
///// å®žä½“类基类
///// </summary>
///// <typeparam name="TKey"></typeparam>
//[Serializable]
//public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
//{
//    /// <summary>
//    /// åˆ›å»ºäºº
//    /// </summary>
//    public virtual string? CreatorName { get; set; }

    /// <summary>
    /// ä¿®æ”¹äºº
    /// </summary>
    public virtual string? LastModifierName { get; set; }
//    /// <summary>
//    /// ä¿®æ”¹äºº
//    /// </summary>
//    public virtual string? LastModifierName { get; set; }

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

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

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


    /// <summary>
    /// æ‰©å±•å­—段1
    /// </summary>
    public virtual string? ExtraField1 { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段1
//    /// </summary>
//    public virtual string? ExtraField1 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段2
    /// </summary>
    public virtual string? ExtraField2 { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段2
//    /// </summary>
//    public virtual string? ExtraField2 { get; set; }

    /// <summary>
    /// æ‰©å±•å­—段3
    /// </summary>
    public virtual string? ExtraField3 { get; set; }
//    /// <summary>
//    /// æ‰©å±•å­—段3
//    /// </summary>
//    public virtual string? ExtraField3 { get; set; }

    protected MyFullAuditedAggregateRoot()
    {
//    protected MyFullAuditedAggregateRoot()
//    {

    }
//    }

    protected MyFullAuditedAggregateRoot(TKey id)
    : base(id)
    {
//    protected MyFullAuditedAggregateRoot(TKey id)
//    : base(id)
//    {

    }
}
//    }
//}