出入库单据

zs

2025-05-07 34fe1d290b38ced566c16ae28d44d48efb7d7747

出入库单据

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj

@@ -17,12 +17,10 @@

    <ItemGroup>
        <EmbeddedResource Include="Localization\HIAWms\*.json" />
        <Compile Remove="Util\**" />
        <Content Remove="Localization\HIAWms\*.json" />
    </ItemGroup>

    <ItemGroup>
      <Compile Remove="Util\EnumHelper.cs" />
      <Compile Remove="Util\ExportHelper.cs" />
        <EmbeddedResource Remove="Util\**" />
        <None Remove="Util\**" />
    </ItemGroup>

    <ItemGroup>

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
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 OrderStatusEnum
    {
        /// <summary>
        /// æœªå¼€å§‹
        /// </summary>
        [Description("未开始")]
        NoStart = 1,

        /// <summary>
        /// æ‰§è¡Œä¸­
        /// </summary>
        [Description("执行中")]
        Executing = 2,

        /// <summary>
        /// å·²å®Œæˆ
        /// </summary>
        [Description("已完成")]
        Finish = 3
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,40 @@
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>
    public enum OrderTypeEnum
    {
        /// <summary>
        /// ç”Ÿäº§å«æ–™
        /// </summary>
        [Description("自动出库")]
        PRODUCTCALL = 1,

        /// <summary>
        /// äººå·¥å‡ºåº“
        /// </summary>
        [Description("人工出库")]
        PERSONOT = 2,

        /// <summary>
        /// äººå·¥å…¥åº“
        /// </summary>
        [Description("人工入库")]
        PERSONIN = 4,

        /// <summary>
        /// è‡ªåˆ¶ä»¶å…¥åº“
        /// </summary>
        [Description("自动入库")]
        SelfMadeParts = 5,

    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj

@@ -19,12 +19,6 @@
    </ItemGroup>

    <ItemGroup>
      <Folder Include="WmsInOutStockOrders\" />
      <Folder Include="WmsInOutStockOrderDetails\" />
      <Folder Include="WmsMaterialContainers\" />
    </ItemGroup>

    <ItemGroup>
      <Reference Include="CmsQueryExtensions">
        <HintPath>..\..\..\..\CommonDLL\CmsQueryExtensions.dll</HintPath>
      </Reference>

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs

ÎļþÒÑɾ³ý

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutStockOrder.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,113 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.OrderManagement.Abstractions.Enums;
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;
using Volo.Abp.Domain.Entities.Auditing;

namespace CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder
{
    /// <summary>
    /// å‡ºå…¥åº“单据
    /// </summary>
    public class WmsInOutStockOrder : FullAuditedAggregateRoot<Guid>
    {
        /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        public string OrderNo { get; set; }

        /// <summary>
        /// å•æ®çŠ¶æ€
        /// </summary>
        public OrderStatusEnum OrderStatus { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string? MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }

        /// <summary>
        /// åž‹å·
        /// </summary>
        public string? MaterialModel { get; set; }

        /// <summary>
        /// æ‰¹æ¬¡å·.
        /// </summary>
        public string MaterialBatch { get; set; }

        /// <summary>
        /// å•æ®ç±»åž‹
        /// </summary>
        public OrderTypeEnum OrderType { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public StockTypeEnum StockType { get; set; }

        /// <summary>
        /// å•æ®æ•°é‡
        /// </summary>
        public int MaterialNumber { get; set; }

        /// <summary>
        /// ä¸‹å‘数量
        /// </summary>
        public int DistributeNumber { get; set; }

        /// <summary>
        /// å®Œæˆæ•°é‡
        /// </summary>
        public int CompleteNumber { get; set; }

        /// <summary>
        /// ä¼˜å…ˆçº§
        /// </summary>
        public int Priority { get; set; }

        /// <summary>
        /// å…³è”计划编号
        /// </summary>
        public string? PlanNo { get; set; }

        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        public DateTime? OperateTime { get; set; }

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

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

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

        /// <summary>
        /// Adjusts the sort.
        /// </summary>
        /// <param name="sort">The sort.</param>
        public void AdjustSort(int sort)
        {
            Sort = sort;
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
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.WmsInOutStockOrderDetail
{
    /// <summary>
    /// å‡ºå…¥åº“单据详情
    /// </summary>
    public class WmsInOutStockOrderDetail
    {
        /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        public string OrderNo { get; set; }

        /// <summary>
        /// å•æ®ç±»åž‹
        /// </summary>
        public OrderTypeEnum OrderType { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string? MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™å”¯ä¸€ç 
        /// </summary>
        public string MaterialId { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        public string? ContainerNo { get; set; }

        /// <summary>
        /// æœºåž‹
        /// </summary>
        public string? MaterialModel { get; set; }

        /// <summary>
        /// ç‰©æ–™æ‰¹æ¬¡
        /// </summary>
        public int? MaterialBatch { get; set; }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrder.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,137 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder;
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
{
    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<WmsInOutStockOrder> IncludeDetails(this IQueryable<WmsInOutStockOrder> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }

            return queryable;
        }

        /// <summary>
        ///  Configures the WmsInOutStockOrder.
        /// </summary>
        /// <param name="builder"></param>
        public static void ConfigureWmsInOutStockOrder(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));

            builder.Entity<WmsInOutStockOrder>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "WmsInOutStockOrder").ToLower(),
                         CMSPluginDbProperties.DbSchema)
                 .HasComment("出入库单据表");

                // ä¸»é”®é…ç½®
                b.HasKey(x => x.Id);

                // å­—段配置
                b.Property(x => x.OrderNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("单据编号");

                b.Property(x => x.OrderStatus)
                    .IsRequired()
                    .HasComment("单据状态");

                b.Property(x => x.OrderType)
                    .IsRequired()
                    .HasComment("单据类型");

                b.Property(x => x.StockType)
                    .IsRequired()
                    .HasComment("操作类型（枚举值）");

                b.Property(x => x.MaterialName)
                    .HasMaxLength(100)
                    .HasComment("物料名称");

                b.Property(x => x.MaterialNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("物料件号");

                b.Property(x => x.MaterialModel)
                    .HasMaxLength(50)
                    .HasComment("型号");

                b.Property(x => x.MaterialBatch)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("批次号");

                b.Property(x => x.MaterialNumber)
                    .IsRequired()
                    .HasComment("单据数量");

                b.Property(x => x.DistributeNumber)
                    .IsRequired()
                    .HasDefaultValue(0)
                    .HasComment("下发数量");

                b.Property(x => x.CompleteNumber)
                    .IsRequired()
                    .HasDefaultValue(0)
                    .HasComment("完成数量");

                b.Property(x => x.Priority)
                    .IsRequired()
                    .HasDefaultValue(1)
                    .HasComment("优先级");

                b.Property(x => x.PlanNo)
                    .HasMaxLength(50)
                    .HasComment("关联计划编号");

                b.Property(x => x.OperateTime)
                    .HasComment("操作时间");

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

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

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

                // ç´¢å¼•é…ç½®
                b.HasIndex(x => x.OrderNo).IsUnique();
                b.HasIndex(x => x.MaterialNo);
                b.HasIndex(x => x.MaterialBatch);
                b.HasIndex(x => x.PlanNo);
                b.HasIndex(x => x.OperateTime);

                // è½¯åˆ é™¤è¿‡æ»¤å™¨ï¼ˆABP框架默认支持）
                b.ConfigureByConvention();
                b.ApplyObjectExtensionMappings();
            });
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,98 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder;
using CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail;
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
{
    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<WmsInOutStockOrderDetail> IncludeDetails(this IQueryable<WmsInOutStockOrderDetail> queryable, bool include = true)
        {
            if (!include)
            {
                return queryable;
            }

            return queryable;
        }

        /// <summary>
        /// Configure  WmsInOutStockOrderDetail
        /// </summary>
        /// <param name="builder"></param>
        public static void ConfigureWmsInOutStockOrderDetail(this ModelBuilder builder)
        {
            Check.NotNull(builder, nameof(builder));

            builder.Entity<WmsInOutStockOrderDetail>(b =>
            {
                b.ToTable((CMSPluginDbProperties.DbTablePrefix + "WmsInOutStockOrderDetail").ToLower(),
                         CMSPluginDbProperties.DbSchema)
                 .HasComment("出入库单据明细表");

                // å¤åˆä¸»é”®é…ç½®ï¼ˆæ ¹æ®ä¸šåŠ¡éœ€æ±‚调整）
                b.HasKey(x => new { x.OrderNo, x.MaterialId });

                // å­—段配置
                b.Property(x => x.OrderNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("单据编号");

                b.Property(x => x.OrderType)
                    .IsRequired()
                    .HasComment("单据类型（枚举值）");

                b.Property(x => x.MaterialNo)
                    .HasMaxLength(50)
                    .IsRequired()
                    .HasComment("物料件号");

                b.Property(x => x.MaterialName)
                    .HasMaxLength(100)
                    .HasComment("物料名称");

                b.Property(x => x.MaterialId)
                    .HasMaxLength(64)
                    .IsRequired()
                    .HasComment("物料唯一码");

                b.Property(x => x.ContainerNo)
                    .HasMaxLength(50)
                    .HasComment("容器编号");

                b.Property(x => x.MaterialModel)
                    .HasMaxLength(50)
                    .HasComment("机型");

                b.Property(x => x.MaterialBatch)
                    .HasComment("物料批次");

                // ç´¢å¼•é…ç½®ï¼ˆæ ¹æ®æŸ¥è¯¢éœ€æ±‚优化）
                b.HasIndex(x => x.OrderNo); // å•æ®æŸ¥è¯¢
                b.HasIndex(x => x.MaterialNo); // ç‰©æ–™æŸ¥è¯¢
                b.HasIndex(x => x.MaterialId); // å”¯ä¸€ç æŸ¥è¯¢
                b.HasIndex(x => x.ContainerNo); // å®¹å™¨æŸ¥è¯¢
                b.HasIndex(x => new { x.OrderNo, x.OrderType }); // è”合查询

                // ABP框架配置
                b.ConfigureByConvention();
                b.ApplyObjectExtensionMappings();
            });
        }
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs

@@ -43,6 +43,8 @@
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();
        builder.ConfigureWmsMaterialContainer();
        builder.ConfigureWmsInOutStockOrder();
        builder.ConfigureWmsInOutStockOrderDetail();

        /* Configure your own tables/entities inside here */


 HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs

@@ -42,6 +42,10 @@
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();
        builder.ConfigureWmsMaterialContainer();
        builder.ConfigureWmsInOutStockOrder();
        builder.ConfigureWmsInOutStockOrderDetail();

        /* Configure your own tables/entities inside here */

        //builder.Entity<YourEntity>(b =>

 HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs

@@ -42,6 +42,9 @@
        builder.ConfigureWmsInOutStockRecord();
        builder.ConfigureWmsContainerPlace();
        builder.ConfigureWmsTask();
        builder.ConfigureWmsMaterialContainer();
        builder.ConfigureWmsInOutStockOrder();
        builder.ConfigureWmsInOutStockOrderDetail();

        /* Configure your own tables/entities inside here */