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

zs

2025-05-08 3d3d4409d0c3cccef1321ff9cc06bf60aa7a6655

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

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

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

@@ -112,6 +112,8 @@
        var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input); 
        insertObj.Sort = sort; 
        input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None); 

    
 
        await wmsmaterialsRepository.InsertAsync(insertObj); 
 

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,80 @@
//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
//{
//    public static class EntityTypeBuilderExtensions
//    {
//        public static void xx<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("是否禁用");
//        }
//    }
//}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
//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; }


//}

///// <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 int Sort { get; set; }

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

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


//    protected MyFullAuditedAggregateRoot()
//    {

//    }

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

//    }
//}

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

@@ -1,5 +1,6 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
using CmsQueryExtensions.Extension;
using MathNet.Numerics;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
@@ -9,7 +10,7 @@
    /// <summary>
    /// WmsMaterial
    /// </summary>
    public class WmsMaterial : FullAuditedAggregateRoot<Guid>
    public class WmsMaterial : MyFullAuditedAggregateRoot<Guid>
    {
        /// <summary>
        /// ç‰©æ–™ç¼–码（唯一标识）
@@ -91,20 +92,6 @@
        /// </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,6 +1,7 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
using CmsQueryExtensions.Extension;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -138,6 +139,70 @@
            b.HasIndex(x => x.PurchaseType);           // é‡‡è´­ç±»åž‹ç´¢å¼•ï¼ˆå¦‚需查询过滤）
            b.HasIndex(x => x.MaterialType);           // ç‰©æ–™ç±»åž‹ç´¢å¼•ï¼ˆå¦‚需查询过滤）

            //配置通用字段
            b.ConfigureMyCmsEntity();


            //            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.ApplyObjectExtensionMappings();
        });
    }

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj

@@ -23,4 +23,8 @@
    <ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
  </ItemGroup>

  <ItemGroup>
    <Folder Include="Migrations\" />
  </ItemGroup>

</Project>

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.Designer.cs

ÎļþÒÑɾ³ý

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.cs

ÎļþÒÑɾ³ý

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs

ÎļþÃû´Ó Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.Designer.cs ÐÞ¸Ä
@@ -12,8 +12,8 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    [DbContext(typeof(CMSPluginDbContext))]
    [Migration("20250430035549_InitialCreate1")]
    partial class InitialCreate1
    [Migration("20250508090853_InitialCreate4")]
    partial class InitialCreate4
    {
        protected override void BuildTargetModel(ModelBuilder modelBuilder)
        {
@@ -286,22 +286,22 @@
                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("Certification")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("证书编号");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("容器编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
@@ -323,6 +323,171 @@
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MaterialId")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料ID");

                    b.Property<string>("MaterialModel")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("机型");

                    b.Property<string>("MaterialName")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("物料名称");

                    b.Property<string>("MaterialNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料件号");

                    b.Property<DateTime?>("OperateTime")
                        .HasColumnType("datetime(6)")
                        .HasComment("操作时间");

                    b.Property<string>("OrderNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("单据编号");

                    b.Property<string>("Remark")
                        .HasMaxLength(500)
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("StockType")
                        .HasColumnType("int")
                        .HasComment("操作类型");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("MaterialId");

                    b.HasIndex("MaterialNo");

                    b.HasIndex("OperateTime");

                    b.HasIndex("OrderNo");

                    b.HasIndex("StockType");

                    b.HasIndex("TaskNo");

                    b.ToTable("scms_wmsinoutstockrecords", (string)null);

                    b.HasComment("出入库记录表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterial.WmsMaterial", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("Certification")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("证书编号");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp")
                        .HasComment("并发戳");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime")
                        .HasComment("创建时间");

                    b.Property<Guid?>("CreatorId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId")
                        .HasComment("创建人ID");

                    b.Property<string>("CreatorName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("创建人");

                    b.Property<Guid?>("DeleterId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId")
                        .HasComment("删除人ID");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime")
                        .HasComment("删除时间");

                    b.Property<string>("ExtraField1")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段1");

                    b.Property<string>("ExtraField2")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段2");

                    b.Property<string>("ExtraField3")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段3");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties")
                        .HasComment("扩展属性");

                    b.Property<string>("Factory")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
@@ -332,7 +497,8 @@
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");
                        .HasColumnName("IsDeleted")
                        .HasComment("是否删除");

                    b.Property<bool?>("IsDisabled")
                        .ValueGeneratedOnAdd()
@@ -348,11 +514,19 @@

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");
                        .HasColumnName("LastModificationTime")
                        .HasComment("修改时间");

                    b.Property<Guid?>("LastModifierId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");
                        .HasColumnName("LastModifierId")
                        .HasComment("修改人ID");

                    b.Property<string>("LastModifierName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("修改人");

                    b.Property<decimal>("Length")
                        .HasColumnType("decimal(18,2)")
@@ -669,6 +843,169 @@

                    b.HasComment("仓库信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int?>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("DodeviceId")
                        .HasColumnType("int")
                        .HasComment("堆垛机ID");

                    b.Property<int>("Dodevicetype")
                        .HasColumnType("int")
                        .HasComment("设备类型");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int?>("IsNextTask")
                        .HasColumnType("int")
                        .HasComment("下个任务是否生成成功");

                    b.Property<bool>("IsRead")
                        .HasColumnType("tinyint(1)")
                        .HasComment("WCS是否可以读取");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MutableParam1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量1");

                    b.Property<string>("MutableParam2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量2");

                    b.Property<string>("MutableParam3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量3");

                    b.Property<int?>("SonTaskType")
                        .HasColumnType("int")
                        .HasComment("子任务类型");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourceOrderNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("来源单据号");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("TaskDodeviceStatus")
                        .HasColumnType("int")
                        .HasComment("设备任务状态");

                    b.Property<int>("TaskLevel")
                        .HasColumnType("int")
                        .HasComment("任务等级");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<int>("TaskStatus")
                        .HasColumnType("int")
                        .HasComment("任务状态");

                    b.Property<int>("TaskType")
                        .HasColumnType("int")
                        .HasComment("任务类型");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("DodeviceId");

                    b.HasIndex("IsRead");

                    b.HasIndex("Sort");

                    b.HasIndex("SourceOrderNo");

                    b.HasIndex("SourcePlace");

                    b.HasIndex("TaskNo")
                        .IsUnique();

                    b.HasIndex("TaskStatus");

                    b.HasIndex("TaskType");

                    b.HasIndex("ToPlace");

                    b.ToTable("scms_wmstasks", (string)null);

                    b.HasComment("任务表");
                });
#pragma warning restore 612, 618
        }
    }

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs

ÎļþÃû´Ó Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.cs ÐÞ¸Ä
@@ -5,7 +5,7 @@

namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
    public partial class InitialCreate : Migration
    public partial class InitialCreate4 : Migration
    {
        protected override void Up(MigrationBuilder migrationBuilder)
        {
@@ -106,6 +106,54 @@
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateTable(
                name: "scms_wmsinoutstockrecords",
                columns: table => new
                {
                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                    OrderNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "单据编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialName = table.Column<string>(type: "varchar(100)", maxLength: 100, nullable: true, comment: "物料名称")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物料件号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    StockType = table.Column<int>(type: "int", nullable: false, comment: "操作类型"),
                    ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "容器编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialModel = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "机型")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    OperateTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "操作时间"),
                    Remark = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true, comment: "备注")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MaterialId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "物料ID")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    TaskNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "任务号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    SourcePlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "起始库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "目标库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false, comment: "排序"),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "是否禁用"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
                    DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true)
                },
                constraints: table =>
                {
                    table.PrimaryKey("PK_scms_wmsinoutstockrecords", x => x.Id);
                },
                comment: "出入库记录表")
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateTable(
                name: "scms_wmsmaterials",
                columns: table => new
                {
@@ -125,7 +173,7 @@
                    MaterialQuality = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "材质（如：304不锈钢）")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Length = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "长度（单位：m）"),
                    IsMainBranch = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false, comment: "是否为主支管"),
                    IsMainBranch = table.Column<int>(type: "int", nullable: false, defaultValue: 2, comment: "是否为主支管"),
                    Factory = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "生产工厂")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Certification = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true, comment: "证书编号")
@@ -136,21 +184,31 @@
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    RedundantField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "冗余字段3 - é¢„留扩展用途")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true, comment: "扩展属性")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true, comment: "并发戳")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "创建时间"),
                    CreatorId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "创建人ID", collation: "ascii_general_ci"),
                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "修改时间"),
                    LastModifierId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "修改人ID", collation: "ascii_general_ci"),
                    IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false, comment: "是否删除"),
                    DeleterId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "删除人ID", collation: "ascii_general_ci"),
                    DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "删除时间"),
                    CreatorName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "创建人")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    LastModifierName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "修改人")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "排序"),
                    Remark = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true, comment: "备注")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "是否禁用"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                    ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "扩展字段1")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
                    ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "扩展字段2")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
                    DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true)
                    ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "扩展字段3")
                        .Annotation("MySql:CharSet", "utf8mb4")
                },
                constraints: table =>
                {
@@ -243,6 +301,58 @@
                comment: "仓库信息表")
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateTable(
                name: "scms_wmstasks",
                columns: table => new
                {
                    Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                    TaskNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "任务号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    TaskType = table.Column<int>(type: "int", nullable: false, comment: "任务类型"),
                    TaskLevel = table.Column<int>(type: "int", nullable: false, comment: "任务等级"),
                    TaskStatus = table.Column<int>(type: "int", nullable: false, comment: "任务状态"),
                    ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "托盘编号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    SourcePlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "起始库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "目标库位")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Aisle = table.Column<int>(type: "int", nullable: true, comment: "巷道"),
                    DodeviceId = table.Column<int>(type: "int", nullable: true, comment: "堆垛机ID"),
                    Dodevicetype = table.Column<int>(type: "int", nullable: false, comment: "设备类型"),
                    TaskDodeviceStatus = table.Column<int>(type: "int", nullable: false, comment: "设备任务状态"),
                    IsRead = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "WCS是否可以读取"),
                    SonTaskType = table.Column<int>(type: "int", nullable: true, comment: "子任务类型"),
                    SourceOrderNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "来源单据号")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    IsNextTask = table.Column<int>(type: "int", nullable: true, comment: "下个任务是否生成成功"),
                    MutableParam1 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量1")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MutableParam2 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量2")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    MutableParam3 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "可变变量3")
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    Sort = table.Column<int>(type: "int", nullable: false, comment: "排序"),
                    IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, comment: "是否禁用"),
                    ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
                        .Annotation("MySql:CharSet", "utf8mb4"),
                    CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
                    CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
                    LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
                    DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
                    DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true)
                },
                constraints: table =>
                {
                    table.PrimaryKey("PK_scms_wmstasks", x => x.Id);
                },
                comment: "任务表")
                .Annotation("MySql:CharSet", "utf8mb4");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsareas_AreaName",
                table: "scms_wmsareas",
@@ -263,6 +373,41 @@
                name: "IX_scms_wmscontainers_ContainerType",
                table: "scms_wmscontainers",
                column: "ContainerType");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_ContainerNo",
                table: "scms_wmsinoutstockrecords",
                column: "ContainerNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_MaterialId",
                table: "scms_wmsinoutstockrecords",
                column: "MaterialId");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_MaterialNo",
                table: "scms_wmsinoutstockrecords",
                column: "MaterialNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_OperateTime",
                table: "scms_wmsinoutstockrecords",
                column: "OperateTime");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_OrderNo",
                table: "scms_wmsinoutstockrecords",
                column: "OrderNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_StockType",
                table: "scms_wmsinoutstockrecords",
                column: "StockType");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsinoutstockrecords_TaskNo",
                table: "scms_wmsinoutstockrecords",
                column: "TaskNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmsmaterials_MaterialCode",
@@ -310,6 +455,57 @@
                name: "IX_scms_wmsstores_StoreName",
                table: "scms_wmsstores",
                column: "StoreName");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_ContainerNo",
                table: "scms_wmstasks",
                column: "ContainerNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_DodeviceId",
                table: "scms_wmstasks",
                column: "DodeviceId");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_IsRead",
                table: "scms_wmstasks",
                column: "IsRead");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_Sort",
                table: "scms_wmstasks",
                column: "Sort");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_SourceOrderNo",
                table: "scms_wmstasks",
                column: "SourceOrderNo");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_SourcePlace",
                table: "scms_wmstasks",
                column: "SourcePlace");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskNo",
                table: "scms_wmstasks",
                column: "TaskNo",
                unique: true);

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskStatus",
                table: "scms_wmstasks",
                column: "TaskStatus");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_TaskType",
                table: "scms_wmstasks",
                column: "TaskType");

            migrationBuilder.CreateIndex(
                name: "IX_scms_wmstasks_ToPlace",
                table: "scms_wmstasks",
                column: "ToPlace");
        }

        protected override void Down(MigrationBuilder migrationBuilder)
@@ -321,6 +517,9 @@
                name: "scms_wmscontainers");

            migrationBuilder.DropTable(
                name: "scms_wmsinoutstockrecords");

            migrationBuilder.DropTable(
                name: "scms_wmsmaterials");

            migrationBuilder.DropTable(
@@ -328,6 +527,9 @@

            migrationBuilder.DropTable(
                name: "scms_wmsstores");

            migrationBuilder.DropTable(
                name: "scms_wmstasks");
        }
    }
}

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

@@ -284,22 +284,22 @@
                    b.HasComment("托盘信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("Certification")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("证书编号");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("容器编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
@@ -321,6 +321,171 @@
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MaterialId")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料ID");

                    b.Property<string>("MaterialModel")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("机型");

                    b.Property<string>("MaterialName")
                        .HasMaxLength(100)
                        .HasColumnType("varchar(100)")
                        .HasComment("物料名称");

                    b.Property<string>("MaterialNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("物料件号");

                    b.Property<DateTime?>("OperateTime")
                        .HasColumnType("datetime(6)")
                        .HasComment("操作时间");

                    b.Property<string>("OrderNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("单据编号");

                    b.Property<string>("Remark")
                        .HasMaxLength(500)
                        .HasColumnType("varchar(500)")
                        .HasComment("备注");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("StockType")
                        .HasColumnType("int")
                        .HasComment("操作类型");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("MaterialId");

                    b.HasIndex("MaterialNo");

                    b.HasIndex("OperateTime");

                    b.HasIndex("OrderNo");

                    b.HasIndex("StockType");

                    b.HasIndex("TaskNo");

                    b.ToTable("scms_wmsinoutstockrecords", (string)null);

                    b.HasComment("出入库记录表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterial.WmsMaterial", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<string>("Certification")
                        .HasMaxLength(128)
                        .HasColumnType("varchar(128)")
                        .HasComment("证书编号");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp")
                        .HasComment("并发戳");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime")
                        .HasComment("创建时间");

                    b.Property<Guid?>("CreatorId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId")
                        .HasComment("创建人ID");

                    b.Property<string>("CreatorName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("创建人");

                    b.Property<Guid?>("DeleterId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId")
                        .HasComment("删除人ID");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime")
                        .HasComment("删除时间");

                    b.Property<string>("ExtraField1")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段1");

                    b.Property<string>("ExtraField2")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段2");

                    b.Property<string>("ExtraField3")
                        .HasMaxLength(256)
                        .HasColumnType("varchar(256)")
                        .HasComment("扩展字段3");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties")
                        .HasComment("扩展属性");

                    b.Property<string>("Factory")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
@@ -330,7 +495,8 @@
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");
                        .HasColumnName("IsDeleted")
                        .HasComment("是否删除");

                    b.Property<bool?>("IsDisabled")
                        .ValueGeneratedOnAdd()
@@ -346,11 +512,19 @@

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");
                        .HasColumnName("LastModificationTime")
                        .HasComment("修改时间");

                    b.Property<Guid?>("LastModifierId")
                        .HasMaxLength(36)
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");
                        .HasColumnName("LastModifierId")
                        .HasComment("修改人ID");

                    b.Property<string>("LastModifierName")
                        .HasMaxLength(64)
                        .HasColumnType("varchar(64)")
                        .HasComment("修改人");

                    b.Property<decimal>("Length")
                        .HasColumnType("decimal(18,2)")
@@ -667,6 +841,169 @@

                    b.HasComment("仓库信息表");
                });

            modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsTask.WmsTask", b =>
                {
                    b.Property<Guid>("Id")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("char(36)");

                    b.Property<int?>("Aisle")
                        .HasColumnType("int")
                        .HasComment("巷道");

                    b.Property<string>("ConcurrencyStamp")
                        .IsConcurrencyToken()
                        .HasMaxLength(40)
                        .HasColumnType("varchar(40)")
                        .HasColumnName("ConcurrencyStamp");

                    b.Property<string>("ContainerNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("托盘编号");

                    b.Property<DateTime>("CreationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("CreationTime");

                    b.Property<Guid?>("CreatorId")
                        .HasColumnType("char(36)")
                        .HasColumnName("CreatorId");

                    b.Property<Guid?>("DeleterId")
                        .HasColumnType("char(36)")
                        .HasColumnName("DeleterId");

                    b.Property<DateTime?>("DeletionTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("DeletionTime");

                    b.Property<int?>("DodeviceId")
                        .HasColumnType("int")
                        .HasComment("堆垛机ID");

                    b.Property<int>("Dodevicetype")
                        .HasColumnType("int")
                        .HasComment("设备类型");

                    b.Property<string>("ExtraProperties")
                        .HasColumnType("longtext")
                        .HasColumnName("ExtraProperties");

                    b.Property<bool>("IsDeleted")
                        .ValueGeneratedOnAdd()
                        .HasColumnType("tinyint(1)")
                        .HasDefaultValue(false)
                        .HasColumnName("IsDeleted");

                    b.Property<bool?>("IsDisabled")
                        .HasColumnType("tinyint(1)")
                        .HasComment("是否禁用");

                    b.Property<int?>("IsNextTask")
                        .HasColumnType("int")
                        .HasComment("下个任务是否生成成功");

                    b.Property<bool>("IsRead")
                        .HasColumnType("tinyint(1)")
                        .HasComment("WCS是否可以读取");

                    b.Property<DateTime?>("LastModificationTime")
                        .HasColumnType("datetime(6)")
                        .HasColumnName("LastModificationTime");

                    b.Property<Guid?>("LastModifierId")
                        .HasColumnType("char(36)")
                        .HasColumnName("LastModifierId");

                    b.Property<string>("MutableParam1")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量1");

                    b.Property<string>("MutableParam2")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量2");

                    b.Property<string>("MutableParam3")
                        .HasMaxLength(200)
                        .HasColumnType("varchar(200)")
                        .HasComment("可变变量3");

                    b.Property<int?>("SonTaskType")
                        .HasColumnType("int")
                        .HasComment("子任务类型");

                    b.Property<int>("Sort")
                        .HasColumnType("int")
                        .HasComment("排序");

                    b.Property<string>("SourceOrderNo")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("来源单据号");

                    b.Property<string>("SourcePlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("起始库位");

                    b.Property<int>("TaskDodeviceStatus")
                        .HasColumnType("int")
                        .HasComment("设备任务状态");

                    b.Property<int>("TaskLevel")
                        .HasColumnType("int")
                        .HasComment("任务等级");

                    b.Property<string>("TaskNo")
                        .IsRequired()
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("任务号");

                    b.Property<int>("TaskStatus")
                        .HasColumnType("int")
                        .HasComment("任务状态");

                    b.Property<int>("TaskType")
                        .HasColumnType("int")
                        .HasComment("任务类型");

                    b.Property<string>("ToPlace")
                        .HasMaxLength(50)
                        .HasColumnType("varchar(50)")
                        .HasComment("目标库位");

                    b.HasKey("Id");

                    b.HasIndex("ContainerNo");

                    b.HasIndex("DodeviceId");

                    b.HasIndex("IsRead");

                    b.HasIndex("Sort");

                    b.HasIndex("SourceOrderNo");

                    b.HasIndex("SourcePlace");

                    b.HasIndex("TaskNo")
                        .IsUnique();

                    b.HasIndex("TaskStatus");

                    b.HasIndex("TaskType");

                    b.HasIndex("ToPlace");

                    b.ToTable("scms_wmstasks", (string)null);

                    b.HasComment("任务表");
                });
#pragma warning restore 612, 618
        }
    }

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat

@@ -1,5 +1,5 @@
cd ../
dotnet ef migrations add InitialCreate1 -c CMSPluginDbContext -o Migrations
dotnet ef migrations add InitialCreate4 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update1 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update2 -c CMSPluginDbContext -o Migrations
::dotnet ef migrations add Update3 -c CMSPluginDbContext -o Migrations

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj

@@ -6,4 +6,10 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.16" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.16" />
    <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
  </ItemGroup>

</Project>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,99 @@
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");

            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רÓôúÂëÉú³ÉÆ÷/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,114 @@
using System;
using Volo.Abp.Auditing;
using Volo.Abp.Domain.Entities.Auditing;

namespace CmsQueryExtensions.Extension;

/// <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 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; }


}

/// <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 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)
    {

    }
}