From 34fe1d290b38ced566c16ae28d44d48efb7d7747 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 17:27:05 +0800
Subject: [PATCH] 出入库单据
---
/dev/null | 86 --------
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.cs | 57 +++++
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs | 98 +++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs | 3
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs | 40 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs | 34 +++
HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj | 6
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj | 8
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrder.cs | 137 +++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutStockOrder.cs | 113 +++++++++++
12 files changed, 491 insertions(+), 97 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj
index 584c1c8..1c0b03e 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj
+++ b/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>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs
new file mode 100644
index 0000000..c94acb8
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs
@@ -0,0 +1,34 @@
+锘縰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 OrderStatusEnum
+ {
+ /// <summary>
+ /// 鏈紑濮�
+ /// </summary>
+ [Description("鏈紑濮�")]
+ NoStart = 1,
+
+ /// <summary>
+ /// 鎵ц涓�
+ /// </summary>
+ [Description("鎵ц涓�")]
+ Executing = 2,
+
+ /// <summary>
+ /// 宸插畬鎴�
+ /// </summary>
+ [Description("宸插畬鎴�")]
+ Finish = 3
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs
new file mode 100644
index 0000000..3f78280
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs
@@ -0,0 +1,40 @@
+锘縰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>
+ public enum OrderTypeEnum
+ {
+ /// <summary>
+ /// 鐢熶骇鍙枡
+ /// </summary>
+ [Description("鑷姩鍑哄簱")]
+ PRODUCTCALL = 1,
+
+ /// <summary>
+ /// 浜哄伐鍑哄簱
+ /// </summary>
+ [Description("浜哄伐鍑哄簱")]
+ PERSONOT = 2,
+
+ /// <summary>
+ /// 浜哄伐鍏ュ簱
+ /// </summary>
+ [Description("浜哄伐鍏ュ簱")]
+ PERSONIN = 4,
+
+ /// <summary>
+ /// 鑷埗浠跺叆搴�
+ /// </summary>
+ [Description("鑷姩鍏ュ簱")]
+ SelfMadeParts = 5,
+
+ }
+}
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 fa7ee40..d6b4d7f 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
@@ -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>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs
deleted file mode 100644
index 50371c2..0000000
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutOrder.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-锘縰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.WmsInOutStockOrder
-{
- /// <summary>
- /// 鍑哄叆搴撳崟鎹�
- /// </summary>
- public class WmsInOutOrder
- {
- /// <summary>
- /// 鍗曟嵁缂栧彿
- /// </summary>
- public string OrderNo { get; set; }
-
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string? MaterialName { get; set; }
-
- /// <summary>
- /// 鐗╂枡浠跺彿
- /// </summary>
- public string MaterialNo { get; set; }
-
- /// <summary>
- /// 鍏宠仈璁″垝缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "PlanNo", ColumnDescription = "鍏宠仈璁″垝缂栧彿", Length = 32)]
- public string? PlanNo { get; set; }
-
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "StockType", ColumnDescription = "鎿嶄綔绫诲瀷")]
- //public OperationType StockType { get; set; }
- public StockType StockType { get; set; }
-
- /// <summary>
- /// 瀹瑰櫒缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ContainerNo", ColumnDescription = "瀹瑰櫒缂栧彿", Length = 32)]
- public string? ContainerNo { get; set; }
-
- /// <summary>
- /// 鏈哄瀷
- /// </summary>
- [SugarColumn(ColumnName = "MaterialModel", ColumnDescription = "鏈哄瀷", Length = 32)]
- public string? MaterialModel { get; set; }
-
- /// <summary>
- /// 涓嬪彂鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "DistributeNumber", ColumnDescription = "涓嬪彂鏁伴噺")]
- public int? DistributeNumber { get; set; }
-
- /// <summary>
- /// 瀹屾垚鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CompleteNumber", ColumnDescription = "瀹屾垚鏁伴噺")]
- public int? CompleteNumber { get; set; }
-
- /// <summary>
- /// 寮傚父鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "ExceptNumber", ColumnDescription = "寮傚父鏁伴噺")]
- public int? ExceptNumber { get; set; }
- /// <summary>
- /// 鎿嶄綔鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "OperateTime", ColumnDescription = "鎿嶄綔鏃堕棿")]
- public DateTime? OperateTime { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞", Length = 500)]
- public string? Remark { get; set; }
-
- }
-}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutStockOrder.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutStockOrder.cs
new file mode 100644
index 0000000..9dc46f9
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrder/WmsInOutStockOrder.cs
@@ -0,0 +1,113 @@
+锘縰sing 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;
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.cs
new file mode 100644
index 0000000..60af85a
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Domain/WmsInOutStockOrderDetail/WmsInOutStockOrderDetail.cs
@@ -0,0 +1,57 @@
+锘縰sing 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; }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrder.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrder.cs
new file mode 100644
index 0000000..03c1221
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrder.cs
@@ -0,0 +1,137 @@
+锘縰sing 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);
+
+ // 杞垹闄よ繃婊ゅ櫒锛圓BP妗嗘灦榛樿鏀寔锛�
+ b.ConfigureByConvention();
+ b.ApplyObjectExtensionMappings();
+ });
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs
new file mode 100644
index 0000000..9c7c382
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs
@@ -0,0 +1,98 @@
+锘縰sing 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();
+ });
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
index ba2a7b3..dc25e9f 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs
+++ b/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 */
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs
index b4776d8..2e2bf4a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs
+++ b/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 =>
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs
index 79ea130..68c2582 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs
+++ 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 */
--
Gitblit v1.9.3