From 3d3d4409d0c3cccef1321ff9cc06bf60aa7a6655 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周四, 08 5月 2025 17:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs | 19
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs | 359 +++++++++++++
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj | 6
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj | 4
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs | 114 ++++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs | 67 ++
CommonDLL/CmsQueryExtensions.dll | 0
/dev/null | 39 -
Weben_CMS专用代码生成器/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs | 99 +++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs | 224 ++++++++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs | 84 +++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat | 2
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs | 80 +++
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 355 +++++++++++++
15 files changed, 1,366 insertions(+), 88 deletions(-)
diff --git a/CommonDLL/CmsQueryExtensions.dll b/CommonDLL/CmsQueryExtensions.dll
index 06867a8..119a687 100644
--- a/CommonDLL/CmsQueryExtensions.dll
+++ b/CommonDLL/CmsQueryExtensions.dll
Binary files differ
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
index 8304853..c51a507 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialAppService.cs"
@@ -112,6 +112,8 @@
var insertObj = ObjectMapper.Map<WmsMaterialCreateDto, WmsMaterial>(input);
insertObj.Sort = sort;
input.MapExtraPropertiesTo(insertObj, MappingPropertyDefinitionChecks.None);
+
+
await wmsmaterialsRepository.InsertAsync(insertObj);
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs"
new file mode 100644
index 0000000..5432fed
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/Class1.cs"
@@ -0,0 +1,80 @@
+锘�//using Microsoft.EntityFrameworkCore;
+//using Microsoft.EntityFrameworkCore.Metadata.Builders;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+
+//namespace CMS.Plugin.HIAWms.Domain.Extension
+//{
+// public static class EntityTypeBuilderExtensions
+// {
+// public static void xx<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
+// {
+// b.Property(x => x.CreatorId)
+// .HasMaxLength(36)
+// .IsRequired(false)
+// .HasComment("鍒涘缓浜篒D");
+
+// b.Property(x => x.CreatorName)
+// .HasMaxLength(64)
+// .IsRequired(false)
+// .HasComment("鍒涘缓浜�");
+
+// b.Property(x => x.CreationTime)
+// .IsRequired()
+// .HasComment("鍒涘缓鏃堕棿");
+
+// b.Property(x => x.LastModifierName)
+// .HasMaxLength(64)
+// .IsRequired(false)
+// .HasComment("淇敼浜�");
+
+// b.Property(x => x.LastModifierId)
+// .HasMaxLength(36)
+// .IsRequired(false)
+// .HasComment("淇敼浜篒D");
+
+// b.Property(x => x.LastModificationTime)
+// .IsRequired(false)
+// .HasComment("淇敼鏃堕棿");
+
+// b.Property(x => x.IsDeleted)
+// .IsRequired()
+// .HasComment("鏄惁鍒犻櫎");
+
+// b.Property(x => x.DeleterId)
+// .HasMaxLength(36)
+// .IsRequired(false)
+// .HasComment("鍒犻櫎浜篒D");
+
+// b.Property(x => x.DeletionTime)
+// .IsRequired(false)
+// .HasComment("鍒犻櫎鏃堕棿");
+
+// b.Property(x => x.ExtraProperties)
+// .IsRequired(false)
+// .HasComment("鎵╁睍灞炴��");
+
+// b.Property(x => x.ConcurrencyStamp)
+// .IsRequired(false)
+// .HasMaxLength(40)
+// .HasComment("骞跺彂鎴�");
+
+// b.Property(x => x.Sort)
+// .HasDefaultValue(0)
+// .HasComment("鎺掑簭");
+
+// b.Property(x => x.Remark)
+// .HasMaxLength(500)
+// .IsRequired(false)
+// .HasComment("澶囨敞");
+
+// b.Property(x => x.IsDisabled)
+// .IsRequired(false)
+// .HasDefaultValue(false)
+// .HasComment("鏄惁绂佺敤");
+// }
+// }
+//}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs"
new file mode 100644
index 0000000..c3d0c71
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/Extension/MyFullAuditedAggregateRoot.cs"
@@ -0,0 +1,84 @@
+锘�//using System;
+//using Volo.Abp.Auditing;
+//using Volo.Abp.Domain.Entities.Auditing;
+
+//namespace CMS.Plugin.HIAWms.Domain;
+
+///// <summary>
+///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots.
+///// </summary>
+//[Serializable]
+//public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
+//{
+// /// <summary>
+// /// 鍒涘缓浜�
+// /// </summary>
+// public virtual string? CreatorName { get; set; }
+
+// /// <summary>
+// /// 淇敼浜�
+// /// </summary>
+// public virtual string? LastModifierName { get; set; }
+
+// /// <summary>
+// /// 鎺掑簭
+// /// </summary>
+// public virtual int Sort { get; set; }
+
+// /// <summary>
+// /// 澶囨敞
+// /// </summary>
+// public virtual string Remark { get; set; }
+
+// /// <summary>
+// /// 鏄惁绂佺敤
+// /// </summary>
+// public virtual bool? IsDisabled { get; set; }
+
+
+//}
+
+///// <summary>
+///// Implements <see cref="IFullAuditedObject"/> to be a base class for full-audited aggregate roots.
+///// </summary>
+///// <typeparam name="TKey">Type of the primary key of the entity</typeparam>
+//[Serializable]
+//public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
+//{
+// /// <summary>
+// /// 鍒涘缓浜�
+// /// </summary>
+// public virtual string? CreatorName { get; set; }
+
+// /// <summary>
+// /// 淇敼浜�
+// /// </summary>
+// public virtual string? LastModifierName { get; set; }
+
+// /// <summary>
+// /// 鎺掑簭
+// /// </summary>
+// public virtual int Sort { get; set; }
+
+// /// <summary>
+// /// 澶囨敞
+// /// </summary>
+// public virtual string Remark { get; set; }
+
+// /// <summary>
+// /// 鏄惁绂佺敤
+// /// </summary>
+// public virtual bool? IsDisabled { get; set; }
+
+
+// protected MyFullAuditedAggregateRoot()
+// {
+
+// }
+
+// protected MyFullAuditedAggregateRoot(TKey id)
+// : base(id)
+// {
+
+// }
+//}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
index eee2ed5..a27c363 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.Domain/WmsMaterial/WmsMaterial.cs"
@@ -1,5 +1,6 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterial;
+using CmsQueryExtensions.Extension;
using MathNet.Numerics;
using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
@@ -9,7 +10,7 @@
/// <summary>
/// WmsMaterial
/// </summary>
- public class WmsMaterial : FullAuditedAggregateRoot<Guid>
+ public class WmsMaterial : MyFullAuditedAggregateRoot<Guid>
{
/// <summary>
/// 鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�
@@ -91,21 +92,7 @@
/// </summary>
public string RedundantField3 { get; set; }
- /// <summary>
- /// 鎺掑簭
- /// </summary>
- public virtual int Sort { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public virtual string Remark { get; set; }
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- public virtual bool? IsDisabled { get; set; }
-
+
/// <summary>
/// Adjusts the sort.
/// </summary>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
index 67ae4b3..22ed6c0 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs"
@@ -1,6 +1,7 @@
using CMS.Plugin.HIAWms.Domain;
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CMS.Plugin.HIAWms.Domain.WmsMaterial;
+using CmsQueryExtensions.Extension;
using Microsoft.EntityFrameworkCore;
using Volo.Abp;
using Volo.Abp.EntityFrameworkCore.Modeling;
@@ -10,7 +11,7 @@
/// <summary>
/// EfCore鎵╁睍
/// </summary>
-public static partial class CMSPluginEfCoreExtensions
+public static partial class CMSPluginEfCoreExtensions
{
/// <summary>
/// Includes the details.
@@ -138,6 +139,70 @@
b.HasIndex(x => x.PurchaseType); // 閲囪喘绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
b.HasIndex(x => x.MaterialType); // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
+ //閰嶇疆閫氱敤瀛楁
+ b.ConfigureMyCmsEntity();
+
+
+ // b.Property(x => x.CreatorId)
+ // .HasMaxLength(36)
+ // .IsRequired(false)
+ // .HasComment("鍒涘缓浜篒D");
+ // b.Property(x => x.CreatorName)
+ // .HasMaxLength(64)
+ // .IsRequired(false)
+ // .HasComment("鍒涘缓浜�");
+ // b.Property(x => x.CreationTime)
+ //.IsRequired()
+ //.HasComment("鍒涘缓鏃堕棿");
+
+ // b.Property(x => x.LastModifierName)
+ // .HasMaxLength(64)
+ // .IsRequired(false)
+ // .HasComment("淇敼浜�");
+ // b.Property(x => x.LastModifierId)
+ // .HasMaxLength(36)
+ // .IsRequired(false)
+ // .HasComment("淇敼浜篒D");
+ // b.Property(x => x.LastModificationTime)
+ // .IsRequired(false)
+ // .HasComment("淇敼鏃堕棿");
+
+
+ // b.Property(x => x.IsDeleted)
+ // .IsRequired()
+ // .HasComment("鏄惁鍒犻櫎");
+ // b.Property(x => x.DeleterId)
+ // .HasMaxLength(36)
+ // .IsRequired(false)
+ // .HasComment("鍒犻櫎浜篒D");
+ // b.Property(x => x.DeletionTime)
+ // .IsRequired(false)
+ // .HasComment("鍒犻櫎鏃堕棿");
+
+
+ // b.Property(x => x.ExtraProperties)
+ //.IsRequired(false)
+ //.HasComment("鎵╁睍灞炴��");
+ // b.Property(x => x.ConcurrencyStamp)
+ //.IsRequired(false)
+ // .HasMaxLength(40)
+ //.HasComment("骞跺彂鎴�");
+ // // 鍏朵粬閫氱敤瀛楁
+ // b.Property(x => x.Sort)
+ // .HasDefaultValue(0)
+ // .HasComment("鎺掑簭");
+
+ // b.Property(x => x.Remark)
+ // .HasMaxLength(500)
+ // .IsRequired(false)
+ // .HasComment("澶囨敞");
+
+ // b.Property(x => x.IsDisabled)
+ // .IsRequired(false)
+ // .HasDefaultValue(false)
+ // .HasComment("鏄惁绂佺敤");
+
+
b.ApplyObjectExtensionMappings();
});
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj"
index 4cf3215..bec4d76 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/CMS.Plugin.HIAWms.MySQL.csproj"
@@ -23,4 +23,8 @@
<ProjectReference Include="..\CMS.Plugin.HIAWms.EntityFrameworkCore\CMS.Plugin.HIAWms.EntityFrameworkCore.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Migrations\" />
+ </ItemGroup>
+
</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.Designer.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.Designer.cs"
deleted file mode 100644
index 67fed0b..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.Designer.cs"
+++ /dev/null
@@ -1,675 +0,0 @@
-锘�// <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("20250429025531_InitialCreate")]
- partial class InitialCreate
- {
- 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.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.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<bool>("IsMainBranch")
- .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<decimal>("Length")
- .HasColumnType("decimal(18,2)")
- .HasComment("闀垮害锛堝崟浣嶏細m锛�");
-
- b.Property<string>("MaterialCode")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .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.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("浠撳簱淇℃伅琛�");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.cs"
deleted file mode 100644
index aba4201..0000000
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.cs"
+++ /dev/null
@@ -1,39 +0,0 @@
-锘縰sing Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CMS.Plugin.HIAWms.MySQL.Migrations
-{
- public partial class InitialCreate1 : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn<int>(
- name: "IsMainBranch",
- table: "scms_wmsmaterials",
- type: "int",
- nullable: false,
- defaultValue: 2,
- comment: "鏄惁涓轰富鏀",
- oldClrType: typeof(bool),
- oldType: "tinyint(1)",
- oldDefaultValue: false,
- oldComment: "鏄惁涓轰富鏀");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterColumn<bool>(
- name: "IsMainBranch",
- table: "scms_wmsmaterials",
- type: "tinyint(1)",
- nullable: false,
- defaultValue: false,
- comment: "鏄惁涓轰富鏀",
- oldClrType: typeof(int),
- oldType: "int",
- oldDefaultValue: 2,
- oldComment: "鏄惁涓轰富鏀");
- }
- }
-}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.Designer.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs"
similarity index 67%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.Designer.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs"
index bb6700e..3cf28b3 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250430035549_InitialCreate1.Designer.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.Designer.cs"
@@ -12,8 +12,8 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
[DbContext(typeof(CMSPluginDbContext))]
- [Migration("20250430035549_InitialCreate1")]
- partial class InitialCreate1
+ [Migration("20250508090853_InitialCreate4")]
+ partial class InitialCreate4
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
@@ -286,22 +286,22 @@
b.HasComment("鎵樼洏淇℃伅琛�");
});
- modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", 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<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
@@ -323,6 +323,171 @@
.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.WmsMaterial.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")
+ .HasComment("骞跺彂鎴�");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property<Guid?>("CreatorId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍒涘缓浜�");
+
+ b.Property<Guid?>("DeleterId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property<string>("ExtraField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property<string>("ExtraField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁3");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties")
+ .HasComment("鎵╁睍灞炴��");
+
b.Property<string>("Factory")
.HasMaxLength(64)
.HasColumnType("varchar(64)")
@@ -332,7 +497,8 @@
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
- .HasColumnName("IsDeleted");
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
b.Property<bool?>("IsDisabled")
.ValueGeneratedOnAdd()
@@ -348,11 +514,19 @@
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime");
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
.HasColumnType("char(36)")
- .HasColumnName("LastModifierId");
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
b.Property<decimal>("Length")
.HasColumnType("decimal(18,2)")
@@ -669,6 +843,169 @@
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/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs"
similarity index 63%
rename from "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.cs"
rename to "Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs"
index 60b9400..0f8c7c6 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250429025531_InitialCreate.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/20250508090853_InitialCreate4.cs"
@@ -5,7 +5,7 @@
namespace CMS.Plugin.HIAWms.MySQL.Migrations
{
- public partial class InitialCreate : Migration
+ public partial class InitialCreate4 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
@@ -106,6 +106,54 @@
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
+ name: "scms_wmsinoutstockrecords",
+ 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"),
+ 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"),
+ StockType = table.Column<int>(type: "int", nullable: false, comment: "鎿嶄綔绫诲瀷"),
+ 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"),
+ 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"),
+ MaterialId = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "鐗╂枡ID")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ TaskNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "浠诲姟鍙�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ SourcePlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "璧峰搴撲綅")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "鐩爣搴撲綅")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false, comment: "鎺掑簭"),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, 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_wmsinoutstockrecords", x => x.Id);
+ },
+ comment: "鍑哄叆搴撹褰曡〃")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
name: "scms_wmsmaterials",
columns: table => new
{
@@ -125,7 +173,7 @@
MaterialQuality = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "鏉愯川锛堝锛�304涓嶉攬閽級")
.Annotation("MySql:CharSet", "utf8mb4"),
Length = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "闀垮害锛堝崟浣嶏細m锛�"),
- IsMainBranch = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false, comment: "鏄惁涓轰富鏀"),
+ IsMainBranch = table.Column<int>(type: "int", nullable: false, defaultValue: 2, comment: "鏄惁涓轰富鏀"),
Factory = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "鐢熶骇宸ュ巶")
.Annotation("MySql:CharSet", "utf8mb4"),
Certification = table.Column<string>(type: "varchar(128)", maxLength: 128, nullable: true, comment: "璇佷功缂栧彿")
@@ -136,21 +184,31 @@
.Annotation("MySql:CharSet", "utf8mb4"),
RedundantField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍐椾綑瀛楁3 - 棰勭暀鎵╁睍鐢ㄩ��")
.Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraProperties = table.Column<string>(type: "longtext", nullable: true, comment: "鎵╁睍灞炴��")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true, comment: "骞跺彂鎴�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false, comment: "鍒涘缓鏃堕棿"),
+ CreatorId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "鍒涘缓浜篒D", collation: "ascii_general_ci"),
+ LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "淇敼鏃堕棿"),
+ LastModifierId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "淇敼浜篒D", collation: "ascii_general_ci"),
+ IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false, comment: "鏄惁鍒犻櫎"),
+ DeleterId = table.Column<Guid>(type: "char(36)", maxLength: 36, nullable: true, comment: "鍒犻櫎浜篒D", collation: "ascii_general_ci"),
+ DeletionTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "鍒犻櫎鏃堕棿"),
+ CreatorName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "鍒涘缓浜�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ LastModifierName = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: true, comment: "淇敼浜�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
Remark = table.Column<string>(type: "varchar(500)", maxLength: 500, nullable: true, comment: "澶囨敞")
.Annotation("MySql:CharSet", "utf8mb4"),
IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤"),
- ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
+ ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1")
.Annotation("MySql:CharSet", "utf8mb4"),
- ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
+ ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2")
.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)
+ ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3")
+ .Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
@@ -243,6 +301,58 @@
comment: "浠撳簱淇℃伅琛�")
.Annotation("MySql:CharSet", "utf8mb4");
+ migrationBuilder.CreateTable(
+ name: "scms_wmstasks",
+ columns: table => new
+ {
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ TaskNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: false, comment: "浠诲姟鍙�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ TaskType = table.Column<int>(type: "int", nullable: false, comment: "浠诲姟绫诲瀷"),
+ TaskLevel = table.Column<int>(type: "int", nullable: false, comment: "浠诲姟绛夌骇"),
+ TaskStatus = table.Column<int>(type: "int", nullable: false, comment: "浠诲姟鐘舵��"),
+ ContainerNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "鎵樼洏缂栧彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ SourcePlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "璧峰搴撲綅")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ToPlace = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "鐩爣搴撲綅")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Aisle = table.Column<int>(type: "int", nullable: true, comment: "宸烽亾"),
+ DodeviceId = table.Column<int>(type: "int", nullable: true, comment: "鍫嗗灈鏈篒D"),
+ Dodevicetype = table.Column<int>(type: "int", nullable: false, comment: "璁惧绫诲瀷"),
+ TaskDodeviceStatus = table.Column<int>(type: "int", nullable: false, comment: "璁惧浠诲姟鐘舵��"),
+ IsRead = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "WCS鏄惁鍙互璇诲彇"),
+ SonTaskType = table.Column<int>(type: "int", nullable: true, comment: "瀛愪换鍔＄被鍨�"),
+ SourceOrderNo = table.Column<string>(type: "varchar(50)", maxLength: 50, nullable: true, comment: "鏉ユ簮鍗曟嵁鍙�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ IsNextTask = table.Column<int>(type: "int", nullable: true, comment: "涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛"),
+ MutableParam1 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "鍙彉鍙橀噺1")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MutableParam2 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "鍙彉鍙橀噺2")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MutableParam3 = table.Column<string>(type: "varchar(200)", maxLength: 200, nullable: true, comment: "鍙彉鍙橀噺3")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false, comment: "鎺掑簭"),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, 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_wmstasks", x => x.Id);
+ },
+ comment: "浠诲姟琛�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
migrationBuilder.CreateIndex(
name: "IX_scms_wmsareas_AreaName",
table: "scms_wmsareas",
@@ -263,6 +373,41 @@
name: "IX_scms_wmscontainers_ContainerType",
table: "scms_wmscontainers",
column: "ContainerType");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_ContainerNo",
+ table: "scms_wmsinoutstockrecords",
+ column: "ContainerNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_MaterialId",
+ table: "scms_wmsinoutstockrecords",
+ column: "MaterialId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_MaterialNo",
+ table: "scms_wmsinoutstockrecords",
+ column: "MaterialNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_OperateTime",
+ table: "scms_wmsinoutstockrecords",
+ column: "OperateTime");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_OrderNo",
+ table: "scms_wmsinoutstockrecords",
+ column: "OrderNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_StockType",
+ table: "scms_wmsinoutstockrecords",
+ column: "StockType");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmsinoutstockrecords_TaskNo",
+ table: "scms_wmsinoutstockrecords",
+ column: "TaskNo");
migrationBuilder.CreateIndex(
name: "IX_scms_wmsmaterials_MaterialCode",
@@ -310,6 +455,57 @@
name: "IX_scms_wmsstores_StoreName",
table: "scms_wmsstores",
column: "StoreName");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_ContainerNo",
+ table: "scms_wmstasks",
+ column: "ContainerNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_DodeviceId",
+ table: "scms_wmstasks",
+ column: "DodeviceId");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_IsRead",
+ table: "scms_wmstasks",
+ column: "IsRead");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_Sort",
+ table: "scms_wmstasks",
+ column: "Sort");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_SourceOrderNo",
+ table: "scms_wmstasks",
+ column: "SourceOrderNo");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_SourcePlace",
+ table: "scms_wmstasks",
+ column: "SourcePlace");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_TaskNo",
+ table: "scms_wmstasks",
+ column: "TaskNo",
+ unique: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_TaskStatus",
+ table: "scms_wmstasks",
+ column: "TaskStatus");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_TaskType",
+ table: "scms_wmstasks",
+ column: "TaskType");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_wmstasks_ToPlace",
+ table: "scms_wmstasks",
+ column: "ToPlace");
}
protected override void Down(MigrationBuilder migrationBuilder)
@@ -321,6 +517,9 @@
name: "scms_wmscontainers");
migrationBuilder.DropTable(
+ name: "scms_wmsinoutstockrecords");
+
+ migrationBuilder.DropTable(
name: "scms_wmsmaterials");
migrationBuilder.DropTable(
@@ -328,6 +527,9 @@
migrationBuilder.DropTable(
name: "scms_wmsstores");
+
+ migrationBuilder.DropTable(
+ name: "scms_wmstasks");
}
}
}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
index 88d2312..cf7429b 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs"
@@ -284,22 +284,22 @@
b.HasComment("鎵樼洏淇℃伅琛�");
});
- modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterials.WmsMaterial", b =>
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsInOutStockRecord.WmsInOutStockRecord", 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<string>("ContainerNo")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("瀹瑰櫒缂栧彿");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
@@ -321,6 +321,171 @@
.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.WmsMaterial.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")
+ .HasComment("骞跺彂鎴�");
+
+ b.Property<DateTime>("CreationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("CreationTime")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property<Guid?>("CreatorId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍒涘缓浜�");
+
+ b.Property<Guid?>("DeleterId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property<string>("ExtraField2")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property<string>("ExtraField3")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎵╁睍瀛楁3");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties")
+ .HasComment("鎵╁睍灞炴��");
+
b.Property<string>("Factory")
.HasMaxLength(64)
.HasColumnType("varchar(64)")
@@ -330,7 +495,8 @@
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
- .HasColumnName("IsDeleted");
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
b.Property<bool?>("IsDisabled")
.ValueGeneratedOnAdd()
@@ -346,11 +512,19 @@
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime");
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
.HasColumnType("char(36)")
- .HasColumnName("LastModifierId");
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
b.Property<decimal>("Length")
.HasColumnType("decimal(18,2)")
@@ -667,6 +841,169 @@
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/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat"
index 101a898..5c47039 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/server/src/CMS.Plugin.HIAWms.MySQL/Scripts/UpdateMigrations.bat"
@@ -1,5 +1,5 @@
cd ../
-dotnet ef migrations add InitialCreate1 -c CMSPluginDbContext -o Migrations
+dotnet ef migrations add InitialCreate4 -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/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj"
index 132c02c..d6ad5a8 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/CmsQueryExtensions.csproj"
@@ -6,4 +6,10 @@
<Nullable>enable</Nullable>
</PropertyGroup>
+ <ItemGroup>
+ <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.16" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.16" />
+ <PackageReference Include="Volo.Abp.Ddd.Domain" Version="6.0.0" />
+ </ItemGroup>
+
</Project>
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs"
new file mode 100644
index 0000000..716facd
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/EntityTypeBuilderExtensions.cs"
@@ -0,0 +1,99 @@
+锘縰sing Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CmsQueryExtensions.Extension
+{
+ /// <summary>
+ /// 鐢ㄤ簬鎵╁睍 EntityTypeBuilder 鐨勯潤鎬佺被锛屾彁渚涢拡瀵圭户鎵胯嚜 MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬬殑閰嶇疆鎵╁睍鏂规硶
+ /// </summary>
+ public static class EntityTypeBuilderExtensions
+ {
+ /// <summary>
+ /// 閽堝缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨嬶紝閰嶇疆鍏跺叕鍏卞睘鎬�
+ /// </summary>
+ /// <typeparam name="TEntity">缁ф壙鑷� MyFullAuditedAggregateRoot<Guid> 鐨勫疄浣撶被鍨�</typeparam>
+ /// <param name="b">EntityTypeBuilder<TEntity> 瀹炰緥锛岀敤浜庨厤缃疄浣撶殑灞炴��</param>
+ public static void ConfigureMyCmsEntity<TEntity>(this EntityTypeBuilder<TEntity> b) where TEntity : MyFullAuditedAggregateRoot<Guid>
+ {
+ b.Property(x => x.CreatorId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property(x => x.CreatorName)
+ .HasMaxLength(64)
+ .IsRequired(false)
+ .HasComment("鍒涘缓浜�");
+
+ b.Property(x => x.CreationTime)
+ .IsRequired()
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property(x => x.LastModifierName)
+ .HasMaxLength(64)
+ .IsRequired(false)
+ .HasComment("淇敼浜�");
+
+ b.Property(x => x.LastModifierId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("淇敼浜篒D");
+
+ b.Property(x => x.LastModificationTime)
+ .IsRequired(false)
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property(x => x.IsDeleted)
+ .IsRequired()
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property(x => x.DeleterId)
+ .HasMaxLength(36)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property(x => x.DeletionTime)
+ .IsRequired(false)
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property(x => x.ExtraProperties)
+ .IsRequired(false)
+ .HasComment("鎵╁睍灞炴��");
+
+ b.Property(x => x.ConcurrencyStamp)
+ .IsRequired(false)
+ .HasMaxLength(40)
+ .HasComment("骞跺彂鎴�");
+
+ b.Property(x => x.Sort)
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property(x => x.Remark)
+ .HasMaxLength(500)
+ .IsRequired(false)
+ .HasComment("澶囨敞");
+
+ b.Property(x => x.IsDisabled)
+ .IsRequired(false)
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property(x => x.ExtraField1)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁1");
+
+ b.Property(x => x.ExtraField2)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁2");
+
+ b.Property(x => x.ExtraField3)
+ .HasMaxLength(256)
+ .IsRequired(false)
+ .HasComment("鎵╁睍瀛楁3");
+
+ }
+ }
+}
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs"
new file mode 100644
index 0000000..ca7ea91
--- /dev/null
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/queryExtensions/CmsQueryExtensions/Extension/EntityTypeBuilderExtensions/MyFullAuditedAggregateRoot.cs"
@@ -0,0 +1,114 @@
+锘縰sing System;
+using Volo.Abp.Auditing;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CmsQueryExtensions.Extension;
+
+/// <summary>
+/// 瀹炰綋绫诲熀绫�
+/// </summary>
+[Serializable]
+public abstract class MyFullAuditedAggregateRoot : FullAuditedAggregateRoot
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string? LastModifierName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+
+}
+
+/// <summary>
+/// 瀹炰綋绫诲熀绫�
+/// </summary>
+/// <typeparam name="TKey"></typeparam>
+[Serializable]
+public abstract class MyFullAuditedAggregateRoot<TKey> : FullAuditedAggregateRoot<TKey>
+{
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public virtual string? CreatorName { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public virtual string? LastModifierName { get; set; }
+
+ /// <summary>
+ /// 鎺掑簭
+ /// </summary>
+ public virtual int Sort { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public virtual string? Remark { get; set; }
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ public virtual bool? IsDisabled { get; set; }
+
+
+ /// <summary>
+ /// 鎵╁睍瀛楁1
+ /// </summary>
+ public virtual string? ExtraField1 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁2
+ /// </summary>
+ public virtual string? ExtraField2 { get; set; }
+
+ /// <summary>
+ /// 鎵╁睍瀛楁3
+ /// </summary>
+ public virtual string? ExtraField3 { get; set; }
+
+ protected MyFullAuditedAggregateRoot()
+ {
+
+ }
+
+ protected MyFullAuditedAggregateRoot(TKey id)
+ : base(id)
+ {
+
+ }
+}
--
Gitblit v1.9.3