zs
2025-05-06 2d4577f9997ce981ebd548ff6986f6839ba14429
添加基础表
已添加5个文件
已修改5个文件
342 ■■■■■ 文件已修改
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CMS.Plugin.HIAWms.Domain.Shared.Enums
{
    /// <summary>
    /// åº“存类型
    /// </summary>
    [Description("库存类型")]
    public enum StockTypeEnum
    {
        /// <summary>
        /// å…¥åº“
        /// </summary>
        [Description("入库")]
        InBound = 1,
        /// <summary>
        /// å‡ºåº“
        /// </summary>
        [Description("出库")]
        OutBound = 2,
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj
@@ -18,4 +18,11 @@
        <ProjectReference Include="..\CMS.Plugin.HIAWms.Domain.Shared\CMS.Plugin.HIAWms.Domain.Shared.csproj" />
    </ItemGroup>
    <ItemGroup>
      <Folder Include="WmsInOutStockOrders\" />
      <Folder Include="WmsInOutStockOrderDetails\" />
      <Folder Include="WmsTasks\" />
      <Folder Include="WmsMaterialContainers\" />
    </ItemGroup>
</Project>
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
using Microsoft.EntityFrameworkCore.Metadata.Internal;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CMS.Plugin.HIAWms.Domain.WmsContainerPlaces
{
    /// <summary>
    /// åº“位容器关系
    /// </summary>
    public class WmsContainerPlace
    {
        /// <summary>
        /// åº“位编码
        /// </summary>
        public string PlaceNo { get; set; }
        /// <summary>
        /// æ‰˜ç›˜ç¼–号
        /// </summary>
        public string ContainerNo { get; set; }
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,77 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords
{
    /// <summary>
    /// å‡ºå…¥åº“记录.
    /// </summary>
    public class WmsInOutStockRecord
    {
        /// <summary>
        /// å•据编号
        /// </summary>
        public string OrderNo { get; set; }
        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string? MaterialName { get; set; }
        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }
        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public StockTypeEnum StockType { get; set; }
        /// <summary>
        /// å®¹å™¨ç¼–号.
        /// </summary>
        public string? ContainerNo { get; set; }
        /// <summary>
        /// åž‹å·
        /// </summary>
        public string? MaterialModel { get; set; }
        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        public DateTime? OperateTime { get; set; }
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string? Remark { get; set; }
        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public string MaterialId { get; set; }
        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public string TaskNo { get; set; }
        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        public string? SourcePlace { get; set; }
        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string? ToPlace { get; set; }
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,72 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
{
    /// <summary>
    ///  EfCore扩展
    /// </summary>
    public static partial class CMSPluginEfCoreExtensions
    {
        /// <summary>
        /// Includes the details.
        /// </summary>
        /// <param name="queryable">The queryable.</param>
        /// <param name="include">if set to <c>true</c> [include].</param>
        /// <returns></returns>
        public static IQueryable<WmsContainerPlace> IncludeDetails(this IQueryable<WmsContainerPlace> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }
            return queryable;
        }
        /// <summary>
        /// Configures the WMS container place relationship.
        /// </summary>
        /// <param name="builder">The builder.</param>
        public static void ConfigureWmsContainerPlace(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));
            builder.Entity<WmsContainerPlace>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsContainerPlaces").ToLower(), CMSPluginDbProperties.DbSchema)
                    .HasComment("容器库位关系表");
                b.ConfigureByConvention();
                // Properties
                b.Property(x => x.PlaceNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("库位编码");
                b.Property(x => x.ContainerNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("托盘编号");
                // Composite primary key
                b.HasKey(x => new { x.PlaceNo, x.ContainerNo });
                // Indexes
                b.HasIndex(x => x.PlaceNo);
                b.HasIndex(x => x.ContainerNo);
                b.ApplyObjectExtensionMappings();
            });
        }
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,123 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsContainerPlaces;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockRecords;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions
{
    /// <summary>
    ///  EfCore扩展
    /// </summary>
    public static partial class CMSPluginEfCoreExtensions
    {
        /// <summary>
        /// Includes the details.
        /// </summary>
        /// <param name="queryable">The queryable.</param>
        /// <param name="include">if set to <c>true</c> [include].</param>
        /// <returns></returns>
        public static IQueryable<WmsInOutStockRecord> IncludeDetails(this IQueryable<WmsInOutStockRecord> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }
            return queryable;
        }
        /// <summary>
        /// Configures the wmsmaterial.
        /// </summary>
        /// <param name="builder"></param>
        public static void ConfigureWmsInOutStockRecord(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));
            builder.Entity<WmsInOutStockRecord>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsInOutStockRecords").ToLower(), CMSPluginDbProperties.DbSchema)
                    .HasComment("出入库记录表");
                b.ConfigureByConvention();
                // Properties
                b.Property(x => x.OrderNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("单据编号");
                b.Property(x => x.MaterialName)
                    .HasMaxLength(100)
                    .IsRequired(false)
                    .HasComment("物料名称");
                b.Property(x => x.MaterialNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("物料件号");
                b.Property(x => x.StockType)
                    .IsRequired()
                    .HasComment("操作类型");
                b.Property(x => x.ContainerNo)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("容器编号");
                b.Property(x => x.MaterialModel)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("机型");
                b.Property(x => x.OperateTime)
                    .IsRequired(false)
                    .HasComment("操作时间");
                b.Property(x => x.Remark)
                    .HasMaxLength(500)
                    .IsRequired(false)
                    .HasComment("备注");
                b.Property(x => x.MaterialId)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("物料ID");
                b.Property(x => x.TaskNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("任务号");
                b.Property(x => x.SourcePlace)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("起始库位");
                b.Property(x => x.ToPlace)
                    .HasMaxLength(50)
                    .IsRequired(false)
                    .HasComment("目标库位");
                // Indexes
                b.HasIndex(x => x.OrderNo);
                b.HasIndex(x => x.MaterialNo);
                b.HasIndex(x => x.MaterialId);
                b.HasIndex(x => x.TaskNo);
                b.HasIndex(x => x.StockType);
                b.HasIndex(x => x.ContainerNo);
                b.HasIndex(x => x.OperateTime);
                b.ApplyObjectExtensionMappings();
            });
        }
    }
}
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
@@ -39,6 +39,8 @@
        builder.ConfigureWmsMaterial();
        builder.ConfigureWmsMaterialStock();
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        /* Configure your own tables/entities inside here */
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
@@ -1,5 +1,5 @@
cd ../
dotnet ef migrations add InitialCreate6 -c CMSPluginDbContext -o Migrations
dotnet ef migrations add InitialCreate7 -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
HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs
@@ -39,6 +39,8 @@
        builder.ConfigureWmsMaterial();
        builder.ConfigureWmsMaterialStock();
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        /* Configure your own tables/entities inside here */
        //builder.Entity<YourEntity>(b =>
HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs
@@ -39,6 +39,8 @@
        builder.ConfigureWmsMaterial();
        builder.ConfigureWmsMaterialStock();
        builder.ConfigureWmsMaterialInfo();
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        /* Configure your own tables/entities inside here */