From 431f5423a6b4abafab0e3a8b6e7ac0f3429b5765 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 06 5月 2025 13:41:59 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs | 77 ++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs | 28 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs | 72 ++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs | 27 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs | 123 ++++++++++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj | 7 +
10 files changed, 341 insertions(+), 1 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs
new file mode 100644
index 0000000..a7d0926
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/StockTypeEnum.cs
@@ -0,0 +1,28 @@
+锘縰sing 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,
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj
index 0dd4b92..9e24121 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj
+++ b/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>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
new file mode 100644
index 0000000..750873e
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsContainerPlaces/WmsContainerPlace.cs
@@ -0,0 +1,27 @@
+锘縰sing 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; }
+ }
+
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs
new file mode 100644
index 0000000..0f60f13
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockRecords/WmsInOutStockRecord.cs
@@ -0,0 +1,77 @@
+锘縰sing 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; }
+
+
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs
new file mode 100644
index 0000000..9c35d43
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsIContainerPlace.cs
@@ -0,0 +1,72 @@
+锘縰sing 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();
+ });
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs
new file mode 100644
index 0000000..8246d03
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockRecord.cs
@@ -0,0 +1,123 @@
+锘縰sing 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();
+ });
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
index 204efe4..4db13d6 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
+++ b/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 */
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
index 203c76f..6183cc5 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat
+++ b/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
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs
index dac2f4d..3db07cd 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs
+++ b/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 =>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs
index 74d194a..202a73f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs
+++ 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 */
--
Gitblit v1.9.3