From 0b600121a40e9c649e75d1f9e4c441b4040cc2b9 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 07 5月 2025 17:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
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.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 284 ++++++
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderTypeEnum.cs | 40
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.cs | 214 ++++
HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/OrderStatusEnum.cs | 34
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 ++
/dev/null | 86 -
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.Designer.cs | 1656 ++++++++++++++++++++++++++++++++++++
HIAWms/server/src/CMS.Plugin.HIAWms.SqlServer/CMSPluginDbContext.cs | 3
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/CMSPluginDbContext.cs | 2
HIAWms/server/src/CMS.Plugin.HIAWms.PostgreSql/CMSPluginDbContext.cs | 4
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat | 2
HIAWms/server/src/CMS.Plugin.HIAWms.Domain/CMS.Plugin.HIAWms.Domain.csproj | 6
17 files changed, 2,646 insertions(+), 100 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..50fee5d
--- /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..c446f03
--- /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.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs
index 8538dd8..5b12a5a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterialContainer.cs
@@ -40,7 +40,7 @@
builder.Entity<WmsMaterialContainer>(b =>
{
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "WmsMaterialContainer").ToLower(), CMSPluginDbProperties.DbSchema)
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WmsMaterialContainer").ToLower(), CMSPluginDbProperties.DbSchema)
.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
b.ConfigureByConvention();
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.MySQL/Migrations/20250507093411_InitialCreate8.Designer.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.Designer.cs
new file mode 100644
index 0000000..b4de3d2
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.Designer.cs
@@ -0,0 +1,1656 @@
+锘�// <auto-generated />
+using System;
+using CMS.Plugin.HIAWms.MySQL;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Volo.Abp.EntityFrameworkCore;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ [DbContext(typeof(CMSPluginDbContext))]
+ [Migration("20250507093411_InitialCreate8")]
+ partial class InitialCreate8
+ {
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("_Abp_DatabaseProvider", EfCoreDatabaseProvider.MySql)
+ .HasAnnotation("ProductVersion", "6.0.16")
+ .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsAreas.WmsArea", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaDesc")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鎻忚堪");
+
+ b.Property<string>("AreaName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<string>("AreaNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撳尯缂栧彿");
+
+ b.Property<int>("AreaStatus")
+ .HasColumnType("int")
+ .HasComment("搴撳尯鐘舵��");
+
+ b.Property<int>("AreaType")
+ .HasColumnType("int")
+ .HasComment("搴撳尯绫诲瀷");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<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<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaName");
+
+ b.ToTable("scms_wmsareas", (string)null);
+
+ b.HasComment("搴撳尯琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlaces.WmsContainerPlace", b =>
+ {
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("搴撲綅缂栫爜");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("PlaceNo", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.ToTable("scms_wmscontainerplaces", (string)null);
+
+ b.HasComment("瀹瑰櫒搴撲綅鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainers.WmsContainer", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("鎵樼洏鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .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?>("ExceptionNumber")
+ .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<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal?>("LimitHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰珮");
+
+ b.Property<decimal?>("LimitLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愰暱");
+
+ b.Property<decimal?>("LimitWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闄愬");
+
+ b.Property<int?>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鏁伴噺");
+
+ b.Property<decimal?>("MaxWeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("杞介噸涓婇檺");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(200)
+ .HasColumnType("varchar(200)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<decimal?>("SpecHeight")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("楂樺害");
+
+ b.Property<decimal?>("SpecLength")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害");
+
+ b.Property<decimal?>("SpecWidth")
+ .HasPrecision(18, 2)
+ .HasColumnType("decimal(18,2)")
+ .HasComment("瀹藉害");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ContainerNo")
+ .IsUnique();
+
+ b.HasIndex("ContainerStatus");
+
+ b.HasIndex("ContainerType");
+
+ b.ToTable("scms_wmscontainers", (string)null);
+
+ b.HasComment("鎵樼洏淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder.WmsInOutStockOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("CompleteNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("瀹屾垚鏁伴噺");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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>("DistributeNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .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")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵规鍙�");
+
+ 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<int>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鏁伴噺");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderStatus")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鐘舵��");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷");
+
+ b.Property<string>("PlanNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍏宠仈璁″垝缂栧彿");
+
+ b.Property<int>("Priority")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(1)
+ .HasComment("浼樺厛绾�");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo")
+ .IsUnique();
+
+ b.HasIndex("PlanNo");
+
+ b.ToTable("scms_wmsinoutstockorder", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail.WmsInOutStockOrderDetail", b =>
+ {
+ b.Property<string>("OrderNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<int?>("MaterialBatch")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鎵规");
+
+ 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<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("OrderNo", "MaterialId");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("OrderNo", "OrderType");
+
+ b.ToTable("scms_wmsinoutstockorderdetail", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ 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<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<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.WmsMaterialContainer.WmsMaterialContainer", b =>
+ {
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("MaterialId", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.ToTable("scms_wmsmaterialcontainer", (string)null);
+
+ b.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialInfos.WmsMaterialInfo", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(0:鏈楠�,1:妫�楠岄�氳繃,2:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<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<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡鎵瑰彿");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鐗╂枡浠ｅ彿");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁1");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁2");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(255)
+ .HasColumnType("varchar(255)")
+ .HasComment("鍐椾綑瀛楁3");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int?>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CheckStatus");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialId")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo")
+ .IsUnique();
+
+ b.HasIndex("SupplierCode");
+
+ b.ToTable("scms_wmsmaterialinfos", (string)null);
+
+ b.HasComment("WMS鐗╂枡淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.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");
+
+ 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<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<string>("Factory")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐢熶骇宸ュ巶");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsMainBranch")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鏄惁涓轰富鏀");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<decimal>("Length")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害锛堝崟浣嶏細m锛�");
+
+ b.Property<string>("MaterialCode")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鍨嬪彿");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialQuality")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
+
+ b.Property<int>("MaterialType")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<decimal>("OuterDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澶栧緞锛堝崟浣嶏細mm锛�");
+
+ b.Property<string>("PrimaryUnit")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("涓诲崟浣嶏紙濡傦細kg銆乵銆佷釜锛�");
+
+ b.Property<int>("PurchaseType")
+ .HasColumnType("int")
+ .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("Standard")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("瑙勬牸/鏍囧噯锛堝锛欸B/T 8163-2018锛�");
+
+ b.Property<decimal>("WallThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澹佸帤锛堝崟浣嶏細mm锛�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialCode")
+ .IsUnique();
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialType");
+
+ b.HasIndex("PurchaseType");
+
+ b.ToTable("scms_wmsmaterials", (string)null);
+
+ b.HasComment("鐗╂枡鍩虹淇℃伅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialStocks.WmsMaterialStock", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("AreaCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍖哄煙缂栧彿");
+
+ b.Property<string>("AreaName")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("搴撳尯鍚嶇О");
+
+ b.Property<int?>("CheckStatus")
+ .HasColumnType("int")
+ .HasComment("妫�楠岀姸鎬�(1:鏈楠�,2:妫�楠岄�氳繃,3:妫�楠屼笉閫氳繃)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<int>("ContainerStatus")
+ .HasColumnType("int")
+ .HasComment("瀹瑰櫒鐘舵��");
+
+ b.Property<int>("ContainerType")
+ .HasColumnType("int")
+ .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>("EmptyContainer")
+ .HasColumnType("int")
+ .HasComment("鏄惁绌烘墭(2:鍚�,1:鏄�)");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<DateTime?>("InStockTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鍏ュ簱鏃堕棿");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)")
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<int>("IsLock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾(2:鏈攣瀹�,1:宸查攣瀹�)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鎵规");
+
+ b.Property<string>("MaterialId")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("MaterialModel")
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鏈哄瀷/瑙勬牸");
+
+ b.Property<string>("MaterialName")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("鐗╂枡鍚嶇О");
+
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栧彿");
+
+ b.Property<string>("PlaceNo")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("搴撲綅缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("搴撲綅鐘舵��;");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockNumber")
+ .HasColumnType("int")
+ .HasComment("搴撳瓨鏁伴噺");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("搴撲綅绫诲瀷");
+
+ b.Property<string>("SupplierCode")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("渚涘簲鍟嗙紪鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialName");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("PlaceNo");
+
+ b.HasIndex("MaterialBatch", "SupplierCode");
+
+ b.ToTable("scms_wmsmaterialstocks", (string)null);
+
+ b.HasComment("WMS鐗╂枡搴撳瓨琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("Aisle")
+ .HasColumnType("int")
+ .HasComment("宸烽亾");
+
+ b.Property<string>("AreaCode")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵�鍦ㄥ簱鍖�");
+
+ b.Property<int>("ColumnNo")
+ .HasColumnType("int")
+ .HasComment("鍒�");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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>("EmptyContainer")
+ .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>("Islock")
+ .HasColumnType("int")
+ .HasComment("鏄惁閿佸畾");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("LayerNo")
+ .HasColumnType("int")
+ .HasComment("灞�");
+
+ b.Property<string>("PlaceNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("缂栧彿");
+
+ b.Property<int>("PlaceStatus")
+ .HasColumnType("int")
+ .HasComment("璐т綅鐘舵��");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("RowNo")
+ .HasColumnType("int")
+ .HasComment("鎺�");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StorageTypeNo")
+ .HasColumnType("int")
+ .HasComment("璐т綅绫诲瀷");
+
+ b.HasKey("Id");
+
+ b.HasIndex("AreaCode");
+
+ b.HasIndex("PlaceNo")
+ .IsUnique();
+
+ b.HasIndex("PlaceStatus");
+
+ b.HasIndex("StorageTypeNo");
+
+ b.ToTable("scms_wmsplaces", (string)null);
+
+ b.HasComment("搴撲綅琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsStores.WmsStore", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<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<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("RedundantField1")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁1 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField2")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁2 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("RedundantField3")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("StoreCode")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("浠撳簱浠ｇ爜");
+
+ b.Property<string>("StoreName")
+ .HasMaxLength(100)
+ .HasColumnType("varchar(100)")
+ .HasComment("浠撳簱鍚嶇О");
+
+ b.HasKey("Id");
+
+ b.HasIndex("StoreName");
+
+ b.ToTable("scms_wmsstores", (string)null);
+
+ 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("鍫嗗灈鏈篒D");
+
+ 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
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.cs
new file mode 100644
index 0000000..1c83365
--- /dev/null
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250507093411_InitialCreate8.cs
@@ -0,0 +1,214 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CMS.Plugin.HIAWms.MySQL.Migrations
+{
+ public partial class InitialCreate8 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AlterColumn<int>(
+ name: "IsMainBranch",
+ table: "scms_wmsmaterials",
+ type: "int",
+ nullable: false,
+ defaultValue: 0,
+ comment: "鏄惁涓轰富鏀",
+ oldClrType: typeof(int),
+ oldType: "int",
+ oldDefaultValue: 2,
+ oldComment: "鏄惁涓轰富鏀");
+
+ migrationBuilder.CreateTable(
+ name: "scms_wmsinoutstockorder",
+ 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"),
+ OrderStatus = table.Column<int>(type: "int", nullable: false, comment: "鍗曟嵁鐘舵��"),
+ 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"),
+ MaterialModel = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "鍨嬪彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialBatch = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "鎵规鍙�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ OrderType = table.Column<int>(type: "int", nullable: false, comment: "鍗曟嵁绫诲瀷"),
+ StockType = table.Column<int>(type: "int", nullable: false, comment: "鎿嶄綔绫诲瀷锛堟灇涓惧�硷級"),
+ MaterialNumber = table.Column<int>(type: "int", nullable: false, comment: "鍗曟嵁鏁伴噺"),
+ DistributeNumber = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "涓嬪彂鏁伴噺"),
+ CompleteNumber = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "瀹屾垚鏁伴噺"),
+ Priority = table.Column<int>(type: "int", nullable: false, defaultValue: 1, comment: "浼樺厛绾�"),
+ PlanNo = 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"),
+ Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, 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_wmsinoutstockorder", x => x.Id);
+ },
+ comment: "鍑哄叆搴撳崟鎹〃")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_wmsinoutstockorderdetail",
+ columns: table => new
+ {
+ OrderNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "鍗曟嵁缂栧彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialId = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "鐗╂枡鍞竴鐮�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ OrderType = table.Column<int>(type: "int", nullable: false, comment: "鍗曟嵁绫诲瀷锛堟灇涓惧�硷級"),
+ MaterialNo = 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"),
+ 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"),
+ MaterialBatch = table.Column<int>(type: "int", nullable: true, comment: "鐗╂枡鎵规")
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_scms_wmsinoutstockorderdetail", x => new { x.OrderNo, x.MaterialId });
+ },
+ comment: "鍑哄叆搴撳崟鎹槑缁嗚〃")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_wmsmaterialcontainer",
+ columns: table => new
+ {
+ ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "鎵樼洏缂栧彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialId = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "鐗╂枡ID")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true),
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ 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_wmsmaterialcontainer", x => new { x.MaterialId, x.ContainerNo });
+ },
+ comment: "鐗╂枡瀹瑰櫒鍏崇郴琛�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorder_MaterialBatch",
+ table: "scms_wmsinoutstockorder",
+ column: "MaterialBatch");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorder_MaterialNo",
+ table: "scms_wmsinoutstockorder",
+ column: "MaterialNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorder_OperateTime",
+ table: "scms_wmsinoutstockorder",
+ column: "OperateTime");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorder_OrderNo",
+ table: "scms_wmsinoutstockorder",
+ column: "OrderNo",
+ unique: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorder_PlanNo",
+ table: "scms_wmsinoutstockorder",
+ column: "PlanNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorderdetail_ContainerNo",
+ table: "scms_wmsinoutstockorderdetail",
+ column: "ContainerNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorderdetail_MaterialId",
+ table: "scms_wmsinoutstockorderdetail",
+ column: "MaterialId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorderdetail_MaterialNo",
+ table: "scms_wmsinoutstockorderdetail",
+ column: "MaterialNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorderdetail_OrderNo",
+ table: "scms_wmsinoutstockorderdetail",
+ column: "OrderNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockorderdetail_OrderNo_OrderType",
+ table: "scms_wmsinoutstockorderdetail",
+ columns: new[] { "OrderNo", "OrderType" });
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsmaterialcontainer_ContainerNo",
+ table: "scms_wmsmaterialcontainer",
+ column: "ContainerNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsmaterialcontainer_MaterialId",
+ table: "scms_wmsmaterialcontainer",
+ column: "MaterialId");
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "scms_wmsinoutstockorder");
+
+ migrationBuilder.DropTable(
+ name: "scms_wmsinoutstockorderdetail");
+
+ migrationBuilder.DropTable(
+ name: "scms_wmsmaterialcontainer");
+
+ migrationBuilder.AlterColumn<int>(
+ name: "IsMainBranch",
+ table: "scms_wmsmaterials",
+ type: "int",
+ nullable: false,
+ defaultValue: 2,
+ comment: "鏄惁涓轰富鏀",
+ oldClrType: typeof(int),
+ oldType: "int",
+ oldDefaultValue: 0,
+ oldComment: "鏄惁涓轰富鏀");
+ }
+ }
+}
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index 2df82ec..a335516 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -356,6 +356,216 @@
b.HasComment("鎵樼洏淇℃伅琛�");
});
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrder.WmsInOutStockOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<int>("CompleteNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("瀹屾垚鏁伴噺");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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>("DistributeNumber")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .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")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<string>("MaterialBatch")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵规鍙�");
+
+ 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<int>("MaterialNumber")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鏁伴噺");
+
+ b.Property<DateTime?>("OperateTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("鎿嶄綔鏃堕棿");
+
+ b.Property<string>("OrderNo")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<int>("OrderStatus")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁鐘舵��");
+
+ b.Property<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷");
+
+ b.Property<string>("PlanNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍏宠仈璁″垝缂栧彿");
+
+ b.Property<int>("Priority")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(1)
+ .HasComment("浼樺厛绾�");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(500)
+ .HasColumnType("varchar(500)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<int>("StockType")
+ .HasColumnType("int")
+ .HasComment("鎿嶄綔绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialBatch");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OperateTime");
+
+ b.HasIndex("OrderNo")
+ .IsUnique();
+
+ b.HasIndex("PlanNo");
+
+ b.ToTable("scms_wmsinoutstockorder", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockOrderDetail.WmsInOutStockOrderDetail", b =>
+ {
+ b.Property<string>("OrderNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鍗曟嵁缂栧彿");
+
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鍞竴鐮�");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
+
+ b.Property<int?>("MaterialBatch")
+ .HasColumnType("int")
+ .HasComment("鐗╂枡鎵规");
+
+ 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<int>("OrderType")
+ .HasColumnType("int")
+ .HasComment("鍗曟嵁绫诲瀷锛堟灇涓惧�硷級");
+
+ b.HasKey("OrderNo", "MaterialId");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.HasIndex("MaterialNo");
+
+ b.HasIndex("OrderNo");
+
+ b.HasIndex("OrderNo", "OrderType");
+
+ b.ToTable("scms_wmsinoutstockorderdetail", (string)null);
+
+ b.HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃");
+ });
+
modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", b =>
{
b.Property<Guid>("Id")
@@ -491,6 +701,78 @@
b.ToTable("scms_wmsinoutstockrecords", (string)null);
b.HasComment("鍑哄叆搴撹褰曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialContainer.WmsMaterialContainer", b =>
+ {
+ b.Property<string>("MaterialId")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡ID");
+
+ b.Property<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("鎵樼洏缂栧彿");
+
+ b.Property<string>("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasMaxLength(40)
+ .HasColumnType("varchar(40)")
+ .HasColumnName("ConcurrencyStamp");
+
+ 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<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<Guid>("Id")
+ .HasColumnType("char(36)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("MaterialId", "ContainerNo");
+
+ b.HasIndex("ContainerNo");
+
+ b.HasIndex("MaterialId");
+
+ b.ToTable("scms_wmsmaterialcontainer", (string)null);
+
+ b.HasComment("鐗╂枡瀹瑰櫒鍏崇郴琛�");
});
modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialInfos.WmsMaterialInfo", b =>
@@ -688,7 +970,7 @@
b.Property<int>("IsMainBranch")
.ValueGeneratedOnAdd()
.HasColumnType("int")
- .HasDefaultValue(2)
+ .HasDefaultValue(0)
.HasComment("鏄惁涓轰富鏀");
b.Property<DateTime?>("LastModificationTime")
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 6183cc5..fafbc4f 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 InitialCreate7 -c CMSPluginDbContext -o Migrations
+dotnet ef migrations add InitialCreate8 -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 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