From 8692b1646a52670e80354e4d2e6cd3f54dc33bb0 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 11:08:20 +0800
Subject: [PATCH] 22
---
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/WorkPlanStatusEnum.cs | 40 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.Designer.cs | 664 +++++++++++++++++++++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs | 19
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/CallMaterialOrder.cs | 56 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs | 65 ++
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 293 +++++++++
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的作业计划表配置文本.txt | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs | 2
Weben_CMS专用代码生成器/Code/App.config | 2
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的物料信息表配置文本.txt | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.cs | 294 +++++++++
Weben_CMS专用代码生成器/Code/Const/SystemConst.cs | 5
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrder.cs | 65 ++
/dev/null | 178 -----
Weben_CMS专用代码生成器/Code/MainForm.cs | 12
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs | 6
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrderRecord/CallMaterialOrderRecord.cs | 57 +
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/CallMaterialStatusEnum.cs | 41 +
Weben_CMS专用代码生成器/Code/File/GenerateCodeConfigParamFiles/祥子的作业计划表配置文本(模糊查询自动版).txt | 2
PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/CMSPluginDbContext.cs | 2
20 files changed, 1,605 insertions(+), 202 deletions(-)
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
index 0b1715d..a4b95f8 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Application/Implements/WorkPlanAppService.cs
@@ -180,7 +180,7 @@
updateObj.OuterDiameter = input.OuterDiameter;
updateObj.Thickness = input.Thickness;
updateObj.Material = input.Material;
- updateObj.HasMainSignature = input.HasMainSignature;
+
updateObj.ProcessRouteNumber = input.ProcessRouteNumber;
updateObj.PlannedStartTime = input.PlannedStartTime;
updateObj.PlannedEndTime = input.PlannedEndTime;
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/CallMaterialStatusEnum.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/CallMaterialStatusEnum.cs
new file mode 100644
index 0000000..f6a3884
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/CallMaterialStatusEnum.cs
@@ -0,0 +1,41 @@
+using System.ComponentModel;
+
+namespace CMS.Plugin.PipeLineLems.Domain.Shared.Enums
+{
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public enum CallMaterialStatusEnum : byte
+ {
+ /// <summary>
+ /// 鏈墽琛�
+ /// </summary>
+ [Description("鏈墽琛�")]
+ 鏈墽琛� = 0,
+
+ /// <summary>
+ /// 鍙枡涓�
+ /// </summary>
+ [Description("鍙枡涓�")]
+ 鍙枡涓� = 1,
+
+
+ /// <summary>
+ /// 鍙枡瀹屾垚
+ /// </summary>
+ [Description("鍙枡瀹屾垚")]
+ 鍙枡瀹屾垚 = 4,
+
+ /// <summary>
+ /// 宸插彇娑堝彨鏂�
+ /// </summary>
+ [Description("宸插彇娑堝彨鏂�")]
+ 宸插彇娑堝彨鏂� = 5,
+
+ /// <summary>
+ /// 鍙枡澶辫触
+ /// </summary>
+ [Description("鍙枡澶辫触")]
+ 鍙枡澶辫触 = 6,
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/WorkPlanStatusEnum.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/WorkPlanStatusEnum.cs
new file mode 100644
index 0000000..67b46c5
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain.Shared/Enums/WorkPlanStatusEnum.cs
@@ -0,0 +1,40 @@
+using System.ComponentModel;
+
+namespace CMS.Plugin.PipeLineLems.Domain.Shared.Enums
+{
+ /// <summary>
+ /// 浣滀笟璁″垝鐘舵��
+ /// </summary>
+ public enum WorkPlanStatusEnum : byte
+ {
+ /// <summary>
+ /// 鏈墽琛�
+ /// </summary>
+ [Description("鏈墽琛�")]
+ 鏈墽琛� = 0,
+
+ /// <summary>
+ /// 鎵ц涓�
+ /// </summary>
+ [Description("鎵ц涓�")]
+ 鎵ц涓� = 1,
+
+ /// <summary>
+ /// 鏆傚仠涓�
+ /// </summary>
+ [Description("鏆傚仠涓�")]
+ 鏆傚仠涓� = 2,
+
+ /// <summary>
+ /// 宸插畬鎴�
+ /// </summary>
+ [Description("宸插畬鎴�")]
+ 宸插畬鎴� = 4,
+
+ /// <summary>
+ /// 宸插彇娑�
+ /// </summary>
+ [Description("宸插彇娑�")]
+ 宸插彇娑� = 5,
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/CallMaterialOrder.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/CallMaterialOrder.cs
new file mode 100644
index 0000000..a32671b
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrder/CallMaterialOrder.cs
@@ -0,0 +1,56 @@
+using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder
+{
+ /// <summary>
+ /// 鍙枡鍗曡〃
+ /// </summary>
+ public class CallMaterialOrder : MyFullAuditedAggregateRoot<Guid>
+ {
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑
+ /// </summary>
+ public string DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string MaterialMode { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鏁伴噺
+ /// </summary>
+ public int Quantity { get; set; }
+
+ /// <summary>
+ /// WMS杩斿洖缁撴灉
+ /// </summary>
+ public string WmsRetResult { get; set; }
+
+ /// <summary>
+ /// WMS浠诲姟鍙�
+ /// </summary>
+ public string WmsTaskNo { get; set; }
+
+
+
+ /// <summary>
+ /// Adjusts the sort.
+ /// </summary>
+ /// <param name="sort">The sort.</param>
+ public void AdjustSort(int sort)
+ {
+ Sort = sort;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrderRecord/CallMaterialOrderRecord.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrderRecord/CallMaterialOrderRecord.cs
new file mode 100644
index 0000000..94b6a4b
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/CallMaterialOrderRecord/CallMaterialOrderRecord.cs
@@ -0,0 +1,57 @@
+using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace CMS.Plugin.PipeLineLems.Domain.CallMaterialOrderRecord
+{
+ /// <summary>
+ /// 鍙枡璁板綍琛�
+ /// </summary>
+ public class CallMaterialOrderRecord : MyFullAuditedAggregateRootForRecord<Guid>
+ {
+ /// <summary>
+ /// 鍘熸枡鏍囪瘑
+ /// </summary>
+ public string DataIdentifier { get; set; }
+
+ /// <summary>
+ /// 鍘熸枡鍨嬪彿
+ /// </summary>
+ public string MaterialMode { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum CallMaterialStatus { get; set; }
+
+
+
+ /// <summary>
+ /// 鍙枡鏁伴噺
+ /// </summary>
+ public int Quantity { get; set; }
+
+
+ /// <summary>
+ /// WMS杩斿洖缁撴灉
+ /// </summary>
+ public string WmsRetResult { get; set; }
+
+ /// <summary>
+ /// WMS浠诲姟鍙�
+ /// </summary>
+ public string WmsTaskNo { get; set; }
+
+ /// <summary>
+ /// Adjusts the sort.
+ /// </summary>
+ /// <param name="sort">The sort.</param>
+ public void AdjustSort(int sort)
+ {
+ Sort = sort;
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
index 3d22889..6c4c61d 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.Domain/WorkPlan/WorkPlan.cs
@@ -1,4 +1,5 @@
using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.Enums;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema;
using Volo.Abp.Domain.Entities.Auditing;
@@ -14,6 +15,16 @@
/// 浠诲姟缂栫爜
/// </summary>
public string TaskCode { get; set; }
+
+ /// <summary>
+ /// 璁″垝鐘舵��
+ /// </summary>
+ public WorkPlanStatusEnum WorkPlanStatus { get; set; }
+
+ /// <summary>
+ /// 鍙枡鐘舵��
+ /// </summary>
+ public CallMaterialStatusEnum CallMaterialStatus { get; set; }
#region 鍘熸枡绠′俊鎭�
@@ -176,10 +187,10 @@
public string Material { get; set; }
- /// <summary>
- /// 鏄惁涓绘敮绠�
- /// </summary>
- public bool HasMainSignature { get; set; }
+ ///// <summary>
+ ///// 鏄惁涓绘敮绠�
+ ///// </summary>
+ //public bool HasMainSignature { get; set; }
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrder.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrder.cs
new file mode 100644
index 0000000..8489a82
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrder.cs
@@ -0,0 +1,65 @@
+using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.MyTestEntityNames;
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.PipeLineLems.EntityFrameworkCore.Extensions;
+
+/// <summary>
+/// EfCore鎵╁睍
+/// </summary>
+public static partial class CMSPluginEfCoreExtensions
+{
+ /// <summary>
+ /// Includes the details.
+ /// </summary>
+ /// <param name="queryable">The queryable.</param>
+ /// <param name="include">if set to <c>true</c> [include].</param>
+ /// <returns></returns>
+ public static IQueryable<CallMaterialOrder> IncludeDetails(this IQueryable<CallMaterialOrder> queryable, bool include = true)
+ {
+ if (!include)
+ {
+ return queryable;
+ }
+
+ return queryable;
+ }
+
+ /// <summary>
+ /// Configures the mytestentityname.
+ /// </summary>
+ /// <param name="builder">The builder.</param>
+ public static void ConfigureCallMaterialOrder(this ModelBuilder builder)
+ {
+ Check.NotNull(builder, nameof(builder));
+
+ builder.Entity<CallMaterialOrder>(b =>
+ {
+ //Configure table & schema name
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_CallMaterialOrders").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("鍙枡鍗曡〃");
+
+ b.ConfigureByConvention();
+
+ // Configure properties
+
+ b.Property(x => x.CallMaterialStatus).IsRequired().HasComment("鍙枡鐘舵��");
+ b.Property(x => x.DataIdentifier).IsRequired().HasMaxLength(256).HasComment("鍘熸枡鏍囪瘑");
+ b.Property(x => x.MaterialMode).HasMaxLength(256).HasComment("鍘熸枡鍨嬪彿");
+ b.Property(x => x.Quantity).HasComment("鍙枡鏁伴噺");
+ b.Property(x => x.WmsRetResult).HasComment("WMS杩斿洖缁撴灉");
+ b.Property(x => x.WmsTaskNo).HasComment("WMS浠诲姟鍙�");
+
+ b.ConfigureMyCmsEntity();
+
+ // Configure indexes
+ b.HasIndex(u => u.DataIdentifier).IsUnique();
+ b.HasIndex(u => u.DataIdentifier);
+
+ b.ApplyObjectExtensionMappings();
+ });
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs
new file mode 100644
index 0000000..75005f6
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.CallMaterialOrderRecord.cs
@@ -0,0 +1,65 @@
+using CMS.Plugin.MyExtension.Domain;
+using CMS.Plugin.PipeLineLems.Domain;
+using CMS.Plugin.PipeLineLems.Domain.Shared.MyTestEntityNames;
+using CMS.Plugin.PipeLineLems.Domain.CallMaterialOrderRecord;
+using Microsoft.EntityFrameworkCore;
+using Volo.Abp;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace CMS.Plugin.PipeLineLems.EntityFrameworkCore.Extensions;
+
+/// <summary>
+/// EfCore鎵╁睍
+/// </summary>
+public static partial class CMSPluginEfCoreExtensions
+{
+ /// <summary>
+ /// Includes the details.
+ /// </summary>
+ /// <param name="queryable">The queryable.</param>
+ /// <param name="include">if set to <c>true</c> [include].</param>
+ /// <returns></returns>
+ public static IQueryable<CallMaterialOrderRecord> IncludeDetails(this IQueryable<CallMaterialOrderRecord> queryable, bool include = true)
+ {
+ if (!include)
+ {
+ return queryable;
+ }
+
+ return queryable;
+ }
+
+ /// <summary>
+ /// Configures the mytestentityname.
+ /// </summary>
+ /// <param name="builder">The builder.</param>
+ public static void ConfigureCallMaterialOrderRecord(this ModelBuilder builder)
+ {
+ Check.NotNull(builder, nameof(builder));
+
+ builder.Entity<CallMaterialOrderRecord>(b =>
+ {
+ //Configure table & schema name
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_CallMaterialOrderRecords").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("鍙枡璁板綍琛�");
+
+ b.ConfigureByConvention();
+
+ // Configure properties
+
+ b.Property(x => x.CallMaterialStatus).IsRequired().HasComment("鍙枡鐘舵��");
+ b.Property(x => x.DataIdentifier).IsRequired().HasMaxLength(256).HasComment("鍘熸枡鏍囪瘑");
+ b.Property(x => x.MaterialMode).HasMaxLength(256).HasComment("鍘熸枡鍨嬪彿");
+ b.Property(x => x.Quantity).HasComment("鍙枡鏁伴噺");
+ b.Property(x => x.WmsRetResult).HasComment("WMS杩斿洖缁撴灉");
+ b.Property(x => x.WmsTaskNo).HasComment("WMS浠诲姟鍙�");
+
+ b.ConfigureMyCmsEntityForRecord();
+
+ // Configure indexes
+ b.HasIndex(u => u.DataIdentifier).IsUnique();
+ b.HasIndex(u => u.DataIdentifier);
+
+ b.ApplyObjectExtensionMappings();
+ });
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
index e9d55d9..ecce079 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WorkPlan.cs
@@ -40,12 +40,14 @@
builder.Entity<WorkPlan>(b =>
{
//Configure table & schema name
- b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WorkPlans").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("WorkPlan");
+ b.ToTable((CMSPluginDbProperties.DbTablePrefix + "_WorkPlans").ToLower(), CMSPluginDbProperties.DbSchema).HasComment("浣滀笟璁″垝琛�");
b.ConfigureByConvention();
// Configure properties
b.Property(x => x.TaskCode).HasMaxLength(256).IsRequired().HasComment("浠诲姟缂栫爜");
+ b.Property(x => x.WorkPlanStatus).IsRequired().HasComment("璁″垝鐘舵��");
+ b.Property(x => x.CallMaterialStatus).IsRequired().HasComment("鍙枡鐘舵��");
b.Property(x => x.DataIdentifier).HasMaxLength(256).HasComment("鍘熸枡鏍囪瘑");
b.Property(x => x.MaterialMode).HasMaxLength(256).HasComment("鍘熸枡鍨嬪彿");
b.Property(x => x.Length).HasColumnType("decimal(18,2)").HasComment("闀垮害(mm)");
@@ -71,7 +73,7 @@
b.Property(x => x.OuterDiameter).HasColumnType("decimal(18,2)").HasComment("澶栧緞(mm)");
b.Property(x => x.Thickness).HasColumnType("decimal(18,2)").HasComment("澹佸帤(mm)");
b.Property(x => x.Material).HasMaxLength(256).HasComment("鏉愯川");
- b.Property(x => x.HasMainSignature).HasComment("鏄惁涓绘敮绠�");
+
b.Property(x => x.MarkingPosition).HasColumnType("decimal(18,2)").HasComment("鎵撶爜浣嶇疆");
b.Property(x => x.CuttingPosition).HasColumnType("decimal(18,2)").HasComment("鍒囧壊浣嶇疆");
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/CMSPluginDbContext.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/CMSPluginDbContext.cs
index d25d80a..5273088 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/CMSPluginDbContext.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/CMSPluginDbContext.cs
@@ -34,6 +34,8 @@
builder.ConfigureMyTestEntityName();
builder.ConfigureWorkPlan();
+ builder.ConfigureCallMaterialOrder();
+ builder.ConfigureCallMaterialOrderRecord();
/* Configure your own tables/entities inside here */
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.Designer.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.Designer.cs
deleted file mode 100644
index 9b7b62a..0000000
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.Designer.cs
+++ /dev/null
@@ -1,385 +0,0 @@
-锘�// <auto-generated />
-using System;
-using CMS.Plugin.PipeLineLems.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.PipeLineLems.MySQL.Migrations
-{
- [DbContext(typeof(CMSPluginDbContext))]
- [Migration("20250510023811_Update1")]
- partial class Update1
- {
- 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.PipeLineLems.Domain.MyTestEntityNames.MyTestEntityName", b =>
- {
- b.Property<Guid>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("char(36)");
-
- b.Property<string>("Code")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .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>("Name")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("鍚嶇О");
-
- b.Property<string>("Remark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("澶囨敞");
-
- b.Property<int>("Sort")
- .HasColumnType("int")
- .HasComment("鎺掑簭");
-
- b.HasKey("Id");
-
- b.HasIndex("Name");
-
- b.ToTable("scms_mytestentitynames", (string)null);
-
- b.HasComment("MyTestEntityName");
- });
-
- modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.WorkPlan.WorkPlan", b =>
- {
- b.Property<Guid>("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("char(36)");
-
- 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<decimal>("CuttingPosition")
- .HasColumnType("decimal(65,30)");
-
- b.Property<string>("DataIdentifier")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鍘熸枡鏍囪瘑");
-
- b.Property<string>("DeleteRemark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .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>("EquipmentCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .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>("FactoryCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("宸ュ巶浠ｇ爜");
-
- b.Property<decimal>("FlangeInnerDiameter")
- .HasColumnType("decimal(18,2)")
- .HasComment("娉曞叞鐩村緞(mm)");
-
- b.Property<decimal>("FlangeThickness")
- .HasColumnType("decimal(18,2)")
- .HasComment("娉曞叞鍘氬害(mm)");
-
- b.Property<bool>("HasMainSignature")
- .HasColumnType("tinyint(1)")
- .HasComment("鏄惁涓绘敮绠�");
-
- b.Property<bool>("IsDeleted")
- .ValueGeneratedOnAdd()
- .HasColumnType("tinyint(1)")
- .HasDefaultValue(false)
- .HasColumnName("IsDeleted")
- .HasComment("鏄惁鍒犻櫎");
-
- b.Property<bool?>("IsDisabled")
- .ValueGeneratedOnAdd()
- .HasColumnType("tinyint(1)")
- .HasDefaultValue(false)
- .HasComment("鏄惁绂佺敤");
-
- b.Property<DateTime?>("LastModificationTime")
- .HasColumnType("datetime(6)")
- .HasColumnName("LastModificationTime")
- .HasComment("淇敼鏃堕棿");
-
- b.Property<Guid?>("LastModifierId")
- .HasMaxLength(36)
- .HasColumnType("char(36)")
- .HasColumnName("LastModifierId")
- .HasComment("淇敼浜篒D");
-
- b.Property<string>("LastModifierName")
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("淇敼浜�");
-
- b.Property<decimal>("Length")
- .HasColumnType("decimal(18,2)")
- .HasComment("闀垮害(mm)");
-
- b.Property<string>("MarkingContent")
- .HasMaxLength(1024)
- .HasColumnType("varchar(1024)")
- .HasComment("鎵撶爜鍐呭");
-
- b.Property<decimal>("MarkingPosition")
- .HasColumnType("decimal(65,30)");
-
- b.Property<string>("Material")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鏉愯川");
-
- b.Property<string>("MaterialMode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鍘熸枡鍨嬪彿");
-
- b.Property<string>("OperationRemark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鎿嶄綔澶囨敞");
-
- b.Property<decimal>("OuterDiameter")
- .HasColumnType("decimal(18,2)")
- .HasComment("澶栧緞(mm)");
-
- b.Property<string>("PipeAllowableStress")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("娉曞叞鍐茬爜鍐呭");
-
- b.Property<decimal>("PipeDiameter")
- .HasColumnType("decimal(18,2)")
- .HasComment("濂楃闀垮害(mm)");
-
- b.Property<string>("PipeFittingCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("绠′欢缂栫爜");
-
- b.Property<string>("PipeSectionName")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("绠℃鍚嶇О");
-
- b.Property<string>("PipeSpecCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("绠℃缂栫爜");
-
- b.Property<decimal>("PipeWallThickness")
- .HasColumnType("decimal(18,2)")
- .HasComment("濂楃鐩村緞(mm)");
-
- b.Property<DateTime?>("PlannedEndTime")
- .HasColumnType("datetime(6)")
- .HasComment("璁″垝瀹屾垚鏃堕棿");
-
- b.Property<DateTime?>("PlannedStartTime")
- .HasColumnType("datetime(6)")
- .HasComment("璁″垝寮�濮嬫椂闂�");
-
- b.Property<string>("PreSerialNumber")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("椤哄簭鍙�");
-
- b.Property<string>("ProcessName")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("宸ュ簭鍚嶇О");
-
- b.Property<string>("ProcessRouteNumber")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("宸ヨ壓娴佸悜缂栧彿");
-
- b.Property<string>("ProductCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("浜у搧浠ｇ爜");
-
- b.Property<int>("Quantity")
- .HasColumnType("int")
- .HasComment("绠℃鏁伴噺");
-
- b.Property<string>("Remark")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("澶囨敞");
-
- b.Property<int>("Sort")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasDefaultValue(0)
- .HasComment("鎺掑簭");
-
- b.Property<string>("TaskCode")
- .IsRequired()
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("浠诲姟缂栫爜");
-
- b.Property<string>("TeamInfo")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鐝粍淇℃伅");
-
- b.Property<decimal>("Thickness")
- .HasColumnType("decimal(18,2)")
- .HasComment("澹佸帤(mm)");
-
- b.Property<string>("Timestamp")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("鏃堕棿鎴�");
-
- b.Property<string>("WeldingHeatInput")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("娉曞叞鍏О鍘嬪姏");
-
- b.Property<string>("WorkpieceName")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("宸ヤ欢鍚嶇О");
-
- b.Property<string>("WorkstationCode")
- .HasMaxLength(256)
- .HasColumnType("varchar(256)")
- .HasComment("宸ヤ綅浠ｇ爜");
-
- b.HasKey("Id");
-
- b.HasIndex("DataIdentifier");
-
- b.HasIndex("PlannedEndTime");
-
- b.HasIndex("PlannedStartTime");
-
- b.HasIndex("TaskCode")
- .IsUnique();
-
- b.ToTable("scms_workplans", (string)null);
-
- b.HasComment("WorkPlan");
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.cs
deleted file mode 100644
index ccff912..0000000
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250510023811_Update1.cs
+++ /dev/null
@@ -1,178 +0,0 @@
-锘縰sing System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-#nullable disable
-
-namespace CMS.Plugin.PipeLineLems.MySQL.Migrations
-{
- public partial class Update1 : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.AlterDatabase()
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "scms_mytestentitynames",
- columns: table => new
- {
- Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
- Code = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "缂栫爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Name = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "鍚嶇О")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Sort = table.Column<int>(type: "int", nullable: false, comment: "鎺掑簭"),
- Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
- .Annotation("MySql:CharSet", "utf8mb4"),
- 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_mytestentitynames", x => x.Id);
- },
- comment: "MyTestEntityName")
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateTable(
- name: "scms_workplans",
- columns: table => new
- {
- Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
- TaskCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "浠诲姟缂栫爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鏍囪瘑")
- .Annotation("MySql:CharSet", "utf8mb4"),
- MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鍨嬪彿")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Length = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "闀垮害(mm)"),
- MarkingContent = table.Column<string>(type: "varchar(1024)", maxLength: 1024, nullable: true, comment: "鎵撶爜鍐呭")
- .Annotation("MySql:CharSet", "utf8mb4"),
- MarkingPosition = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
- CuttingPosition = table.Column<decimal>(type: "decimal(65,30)", nullable: false),
- Quantity = table.Column<int>(type: "int", nullable: false, comment: "绠℃鏁伴噺"),
- FlangeThickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "娉曞叞鍘氬害(mm)"),
- FlangeInnerDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "娉曞叞鐩村緞(mm)"),
- WeldingHeatInput = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "娉曞叞鍏О鍘嬪姏")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PipeAllowableStress = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "娉曞叞鍐茬爜鍐呭")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PipeDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "濂楃闀垮害(mm)"),
- PipeWallThickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "濂楃鐩村緞(mm)"),
- FactoryCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ュ巶浠ｇ爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- ProductCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "浜у搧浠ｇ爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- WorkstationCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヤ綅浠ｇ爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- EquipmentCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "璁惧浠ｇ爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- WorkpieceName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヤ欢鍚嶇О")
- .Annotation("MySql:CharSet", "utf8mb4"),
- ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ュ簭鍚嶇О")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PipeFittingCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠′欢缂栫爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PreSerialNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "椤哄簭鍙�")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠℃缂栫爜")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠℃鍚嶇О")
- .Annotation("MySql:CharSet", "utf8mb4"),
- OuterDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "澶栧緞(mm)"),
- Thickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "澹佸帤(mm)"),
- Material = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鏉愯川")
- .Annotation("MySql:CharSet", "utf8mb4"),
- HasMainSignature = table.Column<bool>(type: "tinyint(1)", nullable: false, comment: "鏄惁涓绘敮绠�"),
- ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヨ壓娴佸悜缂栧彿")
- .Annotation("MySql:CharSet", "utf8mb4"),
- PlannedStartTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "璁″垝寮�濮嬫椂闂�"),
- PlannedEndTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "璁″垝瀹屾垚鏃堕棿"),
- TeamInfo = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鐝粍淇℃伅")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Timestamp = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鏃堕棿鎴�")
- .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"),
- OperationRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎿嶄綔澶囨敞")
- .Annotation("MySql:CharSet", "utf8mb4"),
- DeleteRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍒犻櫎澶囨敞")
- .Annotation("MySql:CharSet", "utf8mb4"),
- Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
- Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
- .Annotation("MySql:CharSet", "utf8mb4"),
- IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤"),
- ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1")
- .Annotation("MySql:CharSet", "utf8mb4"),
- ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2")
- .Annotation("MySql:CharSet", "utf8mb4"),
- ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3")
- .Annotation("MySql:CharSet", "utf8mb4")
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_scms_workplans", x => x.Id);
- },
- comment: "WorkPlan")
- .Annotation("MySql:CharSet", "utf8mb4");
-
- migrationBuilder.CreateIndex(
- name: "IX_scms_mytestentitynames_Name",
- table: "scms_mytestentitynames",
- column: "Name");
-
- migrationBuilder.CreateIndex(
- name: "IX_scms_workplans_DataIdentifier",
- table: "scms_workplans",
- column: "DataIdentifier");
-
- migrationBuilder.CreateIndex(
- name: "IX_scms_workplans_PlannedEndTime",
- table: "scms_workplans",
- column: "PlannedEndTime");
-
- migrationBuilder.CreateIndex(
- name: "IX_scms_workplans_PlannedStartTime",
- table: "scms_workplans",
- column: "PlannedStartTime");
-
- migrationBuilder.CreateIndex(
- name: "IX_scms_workplans_TaskCode",
- table: "scms_workplans",
- column: "TaskCode",
- unique: true);
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "scms_mytestentitynames");
-
- migrationBuilder.DropTable(
- name: "scms_workplans");
- }
- }
-}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.Designer.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.Designer.cs
new file mode 100644
index 0000000..5d02775
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.Designer.cs
@@ -0,0 +1,664 @@
+锘�// <auto-generated />
+using System;
+using CMS.Plugin.PipeLineLems.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.PipeLineLems.MySQL.Migrations
+{
+ [DbContext(typeof(CMSPluginDbContext))]
+ [Migration("20250511025035_Update1")]
+ partial class Update1
+ {
+ 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.PipeLineLems.Domain.CallMaterialOrder.CallMaterialOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .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<string>("DataIdentifier")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鏍囪瘑");
+
+ b.Property<string>("DeleteRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<string>("MaterialMode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鍨嬪彿");
+
+ b.Property<string>("OperationRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property<int>("Quantity")
+ .HasColumnType("int")
+ .HasComment("鍙枡鏁伴噺");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("WmsRetResult")
+ .HasColumnType("longtext")
+ .HasComment("WMS杩斿洖缁撴灉");
+
+ b.Property<string>("WmsTaskNo")
+ .HasColumnType("longtext")
+ .HasComment("WMS浠诲姟鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataIdentifier")
+ .IsUnique();
+
+ b.ToTable("scms_callmaterialorders", (string)null);
+
+ b.HasComment("鍙枡鍗曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.CallMaterialOrderRecord.CallMaterialOrderRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .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<string>("DataIdentifier")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("MaterialMode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鍨嬪彿");
+
+ b.Property<int>("Quantity")
+ .HasColumnType("int")
+ .HasComment("鍙枡鏁伴噺");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("WmsRetResult")
+ .HasColumnType("longtext")
+ .HasComment("WMS杩斿洖缁撴灉");
+
+ b.Property<string>("WmsTaskNo")
+ .HasColumnType("longtext")
+ .HasComment("WMS浠诲姟鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataIdentifier")
+ .IsUnique();
+
+ b.ToTable("scms_callmaterialorderrecords", (string)null);
+
+ b.HasComment("鍙枡璁板綍琛�");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.MyTestEntityNames.MyTestEntityName", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<string>("Code")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .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>("Name")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鍚嶇О");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int")
+ .HasComment("鎺掑簭");
+
+ b.HasKey("Id");
+
+ b.HasIndex("Name");
+
+ b.ToTable("scms_mytestentitynames", (string)null);
+
+ b.HasComment("MyTestEntityName");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.WorkPlan.WorkPlan", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .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<decimal>("CuttingPosition")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("鍒囧壊浣嶇疆");
+
+ b.Property<string>("DataIdentifier")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鏍囪瘑");
+
+ b.Property<string>("DeleteRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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>("EquipmentCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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>("FactoryCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("宸ュ巶浠ｇ爜");
+
+ b.Property<decimal>("FlangeInnerDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("娉曞叞鐩村緞(mm)");
+
+ b.Property<decimal>("FlangeThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("娉曞叞鍘氬害(mm)");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<decimal>("Length")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("闀垮害(mm)");
+
+ b.Property<string>("MarkingContent")
+ .HasMaxLength(1024)
+ .HasColumnType("varchar(1024)")
+ .HasComment("鎵撶爜鍐呭");
+
+ b.Property<decimal>("MarkingPosition")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("鎵撶爜浣嶇疆");
+
+ b.Property<string>("Material")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鏉愯川");
+
+ b.Property<string>("MaterialMode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鍨嬪彿");
+
+ b.Property<string>("OperationRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property<decimal>("OuterDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澶栧緞(mm)");
+
+ b.Property<string>("PipeAllowableStress")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("娉曞叞鍐茬爜鍐呭");
+
+ b.Property<decimal>("PipeDiameter")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("濂楃闀垮害(mm)");
+
+ b.Property<string>("PipeFittingCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("绠′欢缂栫爜");
+
+ b.Property<string>("PipeSectionName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("绠℃鍚嶇О");
+
+ b.Property<string>("PipeSpecCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("绠℃缂栫爜");
+
+ b.Property<decimal>("PipeWallThickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("濂楃鐩村緞(mm)");
+
+ b.Property<DateTime?>("PlannedEndTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("璁″垝瀹屾垚鏃堕棿");
+
+ b.Property<DateTime?>("PlannedStartTime")
+ .HasColumnType("datetime(6)")
+ .HasComment("璁″垝寮�濮嬫椂闂�");
+
+ b.Property<string>("PreSerialNumber")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("椤哄簭鍙�");
+
+ b.Property<string>("ProcessName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("宸ュ簭鍚嶇О");
+
+ b.Property<string>("ProcessRouteNumber")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("宸ヨ壓娴佸悜缂栧彿");
+
+ b.Property<string>("ProductCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("浜у搧浠ｇ爜");
+
+ b.Property<int>("Quantity")
+ .HasColumnType("int")
+ .HasComment("绠℃鏁伴噺");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("TaskCode")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("浠诲姟缂栫爜");
+
+ b.Property<string>("TeamInfo")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鐝粍淇℃伅");
+
+ b.Property<decimal>("Thickness")
+ .HasColumnType("decimal(18,2)")
+ .HasComment("澹佸帤(mm)");
+
+ b.Property<string>("Timestamp")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鏃堕棿鎴�");
+
+ b.Property<string>("WeldingHeatInput")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("娉曞叞鍏О鍘嬪姏");
+
+ b.Property<byte>("WorkPlanStatus")
+ .HasColumnType("tinyint unsigned")
+ .HasComment("璁″垝鐘舵��");
+
+ b.Property<string>("WorkpieceName")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("宸ヤ欢鍚嶇О");
+
+ b.Property<string>("WorkstationCode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("宸ヤ綅浠ｇ爜");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataIdentifier");
+
+ b.HasIndex("PlannedEndTime");
+
+ b.HasIndex("PlannedStartTime");
+
+ b.HasIndex("TaskCode")
+ .IsUnique();
+
+ b.ToTable("scms_workplans", (string)null);
+
+ b.HasComment("浣滀笟璁″垝琛�");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.cs
new file mode 100644
index 0000000..217edf9
--- /dev/null
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/20250511025035_Update1.cs
@@ -0,0 +1,294 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace CMS.Plugin.PipeLineLems.MySQL.Migrations
+{
+ public partial class Update1 : Migration
+ {
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AlterDatabase()
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_callmaterialorderrecords",
+ columns: table => new
+ {
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "鍘熸枡鏍囪瘑")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鍨嬪彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ CallMaterialStatus = table.Column<byte>(type: "tinyint unsigned", nullable: false, comment: "鍙枡鐘舵��"),
+ Quantity = table.Column<int>(type: "int", nullable: false, comment: "鍙枡鏁伴噺"),
+ WmsRetResult = table.Column<string>(type: "longtext", nullable: true, comment: "WMS杩斿洖缁撴灉")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ WmsTaskNo = table.Column<string>(type: "longtext", nullable: true, comment: "WMS浠诲姟鍙�")
+ .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"),
+ Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
+ Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3")
+ .Annotation("MySql:CharSet", "utf8mb4")
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_scms_callmaterialorderrecords", x => x.Id);
+ },
+ comment: "鍙枡璁板綍琛�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_callmaterialorders",
+ columns: table => new
+ {
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "鍘熸枡鏍囪瘑")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鍨嬪彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ CallMaterialStatus = table.Column<byte>(type: "tinyint unsigned", nullable: false, comment: "鍙枡鐘舵��"),
+ Quantity = table.Column<int>(type: "int", nullable: false, comment: "鍙枡鏁伴噺"),
+ WmsRetResult = table.Column<string>(type: "longtext", nullable: true, comment: "WMS杩斿洖缁撴灉")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ WmsTaskNo = table.Column<string>(type: "longtext", nullable: true, comment: "WMS浠诲姟鍙�")
+ .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"),
+ OperationRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎿嶄綔澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ DeleteRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍒犻櫎澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
+ Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤"),
+ ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3")
+ .Annotation("MySql:CharSet", "utf8mb4")
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_scms_callmaterialorders", x => x.Id);
+ },
+ comment: "鍙枡鍗曡〃")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_mytestentitynames",
+ columns: table => new
+ {
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ Code = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "缂栫爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Name = table.Column<string>(type: "varchar(64)", maxLength: 64, nullable: false, comment: "鍚嶇О")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false, comment: "鎺掑簭"),
+ Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ 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_mytestentitynames", x => x.Id);
+ },
+ comment: "MyTestEntityName")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateTable(
+ name: "scms_workplans",
+ columns: table => new
+ {
+ Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
+ TaskCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: false, comment: "浠诲姟缂栫爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ WorkPlanStatus = table.Column<byte>(type: "tinyint unsigned", nullable: false, comment: "璁″垝鐘舵��"),
+ CallMaterialStatus = table.Column<byte>(type: "tinyint unsigned", nullable: false, comment: "鍙枡鐘舵��"),
+ DataIdentifier = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鏍囪瘑")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MaterialMode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍘熸枡鍨嬪彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Length = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "闀垮害(mm)"),
+ MarkingContent = table.Column<string>(type: "varchar(1024)", maxLength: 1024, nullable: true, comment: "鎵撶爜鍐呭")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ MarkingPosition = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "鎵撶爜浣嶇疆"),
+ CuttingPosition = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "鍒囧壊浣嶇疆"),
+ Quantity = table.Column<int>(type: "int", nullable: false, comment: "绠℃鏁伴噺"),
+ FlangeThickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "娉曞叞鍘氬害(mm)"),
+ FlangeInnerDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "娉曞叞鐩村緞(mm)"),
+ WeldingHeatInput = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "娉曞叞鍏О鍘嬪姏")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PipeAllowableStress = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "娉曞叞鍐茬爜鍐呭")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PipeDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "濂楃闀垮害(mm)"),
+ PipeWallThickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "濂楃鐩村緞(mm)"),
+ FactoryCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ュ巶浠ｇ爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ProductCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "浜у搧浠ｇ爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ WorkstationCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヤ綅浠ｇ爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ EquipmentCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "璁惧浠ｇ爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ WorkpieceName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヤ欢鍚嶇О")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ProcessName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ュ簭鍚嶇О")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PipeFittingCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠′欢缂栫爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PreSerialNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "椤哄簭鍙�")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PipeSpecCode = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠℃缂栫爜")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PipeSectionName = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "绠℃鍚嶇О")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ OuterDiameter = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "澶栧緞(mm)"),
+ Thickness = table.Column<decimal>(type: "decimal(18,2)", nullable: false, comment: "澹佸帤(mm)"),
+ Material = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鏉愯川")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ProcessRouteNumber = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "宸ヨ壓娴佸悜缂栧彿")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ PlannedStartTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "璁″垝寮�濮嬫椂闂�"),
+ PlannedEndTime = table.Column<DateTime>(type: "datetime(6)", nullable: true, comment: "璁″垝瀹屾垚鏃堕棿"),
+ TeamInfo = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鐝粍淇℃伅")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Timestamp = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鏃堕棿鎴�")
+ .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"),
+ OperationRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎿嶄綔澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ DeleteRemark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鍒犻櫎澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ Sort = table.Column<int>(type: "int", nullable: false, defaultValue: 0, comment: "鎺掑簭"),
+ Remark = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "澶囨敞")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ IsDisabled = table.Column<bool>(type: "tinyint(1)", nullable: true, defaultValue: false, comment: "鏄惁绂佺敤"),
+ ExtraField1 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁1")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField2 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁2")
+ .Annotation("MySql:CharSet", "utf8mb4"),
+ ExtraField3 = table.Column<string>(type: "varchar(256)", maxLength: 256, nullable: true, comment: "鎵╁睍瀛楁3")
+ .Annotation("MySql:CharSet", "utf8mb4")
+ },
+ constraints: table =>
+ {
+ table.PrimaryKey("PK_scms_workplans", x => x.Id);
+ },
+ comment: "浣滀笟璁″垝琛�")
+ .Annotation("MySql:CharSet", "utf8mb4");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_callmaterialorderrecords_DataIdentifier",
+ table: "scms_callmaterialorderrecords",
+ column: "DataIdentifier",
+ unique: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_callmaterialorders_DataIdentifier",
+ table: "scms_callmaterialorders",
+ column: "DataIdentifier",
+ unique: true);
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_mytestentitynames_Name",
+ table: "scms_mytestentitynames",
+ column: "Name");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_workplans_DataIdentifier",
+ table: "scms_workplans",
+ column: "DataIdentifier");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_workplans_PlannedEndTime",
+ table: "scms_workplans",
+ column: "PlannedEndTime");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_workplans_PlannedStartTime",
+ table: "scms_workplans",
+ column: "PlannedStartTime");
+
+ migrationBuilder.CreateIndex(
+ name: "IX_scms_workplans_TaskCode",
+ table: "scms_workplans",
+ column: "TaskCode",
+ unique: true);
+ }
+
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropTable(
+ name: "scms_callmaterialorderrecords");
+
+ migrationBuilder.DropTable(
+ name: "scms_callmaterialorders");
+
+ migrationBuilder.DropTable(
+ name: "scms_mytestentitynames");
+
+ migrationBuilder.DropTable(
+ name: "scms_workplans");
+ }
+ }
+}
diff --git a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index b2668e8..1845792 100644
--- a/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/PipeLineLems/server/src/CMS.Plugin.PipeLineLems.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -21,6 +21,279 @@
.HasAnnotation("ProductVersion", "6.0.16")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
+ modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.CallMaterialOrder.CallMaterialOrder", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .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<string>("DataIdentifier")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鏍囪瘑");
+
+ b.Property<string>("DeleteRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<bool?>("IsDisabled")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasComment("鏄惁绂佺敤");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("LastModifierName")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("淇敼浜�");
+
+ b.Property<string>("MaterialMode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鍨嬪彿");
+
+ b.Property<string>("OperationRemark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鎿嶄綔澶囨敞");
+
+ b.Property<int>("Quantity")
+ .HasColumnType("int")
+ .HasComment("鍙枡鏁伴噺");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("WmsRetResult")
+ .HasColumnType("longtext")
+ .HasComment("WMS杩斿洖缁撴灉");
+
+ b.Property<string>("WmsTaskNo")
+ .HasColumnType("longtext")
+ .HasComment("WMS浠诲姟鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataIdentifier")
+ .IsUnique();
+
+ b.ToTable("scms_callmaterialorders", (string)null);
+
+ b.HasComment("鍙枡鍗曡〃");
+ });
+
+ modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.CallMaterialOrderRecord.CallMaterialOrderRecord", b =>
+ {
+ b.Property<Guid>("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("char(36)");
+
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .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<string>("DataIdentifier")
+ .IsRequired()
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .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<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁鍒犻櫎");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("淇敼鏃堕棿");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasMaxLength(36)
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("淇敼浜篒D");
+
+ b.Property<string>("MaterialMode")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("鍘熸枡鍨嬪彿");
+
+ b.Property<int>("Quantity")
+ .HasColumnType("int")
+ .HasComment("鍙枡鏁伴噺");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(256)
+ .HasColumnType("varchar(256)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("鎺掑簭");
+
+ b.Property<string>("WmsRetResult")
+ .HasColumnType("longtext")
+ .HasComment("WMS杩斿洖缁撴灉");
+
+ b.Property<string>("WmsTaskNo")
+ .HasColumnType("longtext")
+ .HasComment("WMS浠诲姟鍙�");
+
+ b.HasKey("Id");
+
+ b.HasIndex("DataIdentifier")
+ .IsUnique();
+
+ b.ToTable("scms_callmaterialorderrecords", (string)null);
+
+ b.HasComment("鍙枡璁板綍琛�");
+ });
+
modelBuilder.Entity("CMS.Plugin.PipeLineLems.Domain.MyTestEntityNames.MyTestEntityName", b =>
{
b.Property<Guid>("Id")
@@ -107,6 +380,10 @@
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
+ b.Property<byte>("CallMaterialStatus")
+ .HasColumnType("tinyint unsigned")
+ .HasComment("鍙枡鐘舵��");
+
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
@@ -131,7 +408,8 @@
.HasComment("鍒涘缓浜�");
b.Property<decimal>("CuttingPosition")
- .HasColumnType("decimal(65,30)");
+ .HasColumnType("decimal(18,2)")
+ .HasComment("鍒囧壊浣嶇疆");
b.Property<string>("DataIdentifier")
.HasMaxLength(256)
@@ -192,10 +470,6 @@
.HasColumnType("decimal(18,2)")
.HasComment("娉曞叞鍘氬害(mm)");
- b.Property<bool>("HasMainSignature")
- .HasColumnType("tinyint(1)")
- .HasComment("鏄惁涓绘敮绠�");
-
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
@@ -235,7 +509,8 @@
.HasComment("鎵撶爜鍐呭");
b.Property<decimal>("MarkingPosition")
- .HasColumnType("decimal(65,30)");
+ .HasColumnType("decimal(18,2)")
+ .HasComment("鎵撶爜浣嶇疆");
b.Property<string>("Material")
.HasMaxLength(256)
@@ -352,6 +627,10 @@
.HasColumnType("varchar(256)")
.HasComment("娉曞叞鍏О鍘嬪姏");
+ b.Property<byte>("WorkPlanStatus")
+ .HasColumnType("tinyint unsigned")
+ .HasComment("璁″垝鐘舵��");
+
b.Property<string>("WorkpieceName")
.HasMaxLength(256)
.HasColumnType("varchar(256)")
@@ -375,7 +654,7 @@
b.ToTable("scms_workplans", (string)null);
- b.HasComment("WorkPlan");
+ 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/Code/App.config" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
index 3654ec7..ce09596 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/Code/App.config"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/App.config"
@@ -3,7 +3,7 @@
<connectionStrings>
<add name="鏈湴_MySql_CMS" connectionString="Server=localhost;Database=07a6b2f4bbb04e8bb23a9f17a4a769c2_project;Uid=root;Pwd=123abc.com;" />
<add name="ZS_鏈湴WmsMysql" connectionString="Server=localhost;Database=cms.plugin.hiawms;Uid=root;Pwd=123abc.com;" />
- <add name="Shao_鏈湴WmsMysql" connectionString="Server=localhost;Database=cms.plugin.hiawms;Uid=root;Pwd=123abc.com;" />
+ <add name="Shao_鏈湴WmsMysql" connectionString="Server=localhost;Database=cms.plugin.pipelinelems;Uid=root;Pwd=123abc.com;" />
<!-- <add name="LA22012_姝︽眽鐗ч噹_鐢熶骇搴揰浼熸湰鐜" connectionString="Data Source=10.10.40.166;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=123abc.com" />
<add name="LA22012_姝︽眽鐗ч噹_鐢熶骇搴揰26娴嬭瘯鐜" connectionString="Data Source=172.27.96.26;Initial Catalog=WHMY_Prod_Test;Persist Security Info=True;User ID=sa;Password=MJC!2022@wms" />
<add name="LA22012_姝︽眽鐗ч噹_澶囦欢搴揰浼熸湰鐜" connectionString="Data Source=10.10.40.166;Initial Catalog=WHMY_Admin.NET;Persist Security Info=True;User ID=sa;Password=123abc.com" />
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/Code/Const/SystemConst.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/Code/Const/SystemConst.cs"
index 932857f..f6a886d 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/Code/Const/SystemConst.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/Code/Const/SystemConst.cs"
@@ -22,5 +22,10 @@
/// 鐗规畩瀛楁-鎵╁睍瀛楁
/// </summary>
public const string pro_ExtraProperties = "ExtraProperties";
+
+ /// <summary>
+ /// 鏋氫妇鐨勬弿杩板瓧娈靛悕绉�
+ /// </summary>
+ public const string enumDescName = "Desc";
}
}
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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt"
index c4d7364..56e63b9 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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254\050\346\250\241\347\263\212\346\237\245\350\257\242\350\207\252\345\212\250\347\211\210\051.txt"
@@ -9,6 +9,6 @@
[妯＄硦鏌ヨ瀛楁]:
[妯＄硦鏌ヨ瀛楁鍚峕:
[椤圭洰鍛藉悕绌洪棿]:PipeLineLems
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:WorkPlanStatus,WorkPlanStatusEnum&CallMaterialStatus,CallMaterialStatusEnum
[鍓嶇鏍规枃浠跺す鍚嶇О]:pipelinelems_web
[鎺掑簭]:CreationTime
\ No newline at end of file
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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
index ed11518..d4f932b 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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\344\275\234\344\270\232\350\256\241\345\210\222\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
@@ -9,6 +9,6 @@
[妯＄硦鏌ヨ瀛楁]:'TaskCode','MaterialMode', 'ProductCode'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ヤ换鍔＄紪鐮�/鍘熸枡鍨嬪彿/浜у搧浠ｇ爜
[椤圭洰鍛藉悕绌洪棿]:PipeLineLems
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:WorkPlanStatus,WorkPlanStatusEnum&CallMaterialStatus,CallMaterialStatusEnum
[鍓嶇鏍规枃浠跺す鍚嶇О]:pipelinelems_web
[鎺掑簭]:CreationTime
\ No newline at end of file
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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
index 967fc02..ba55a09 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/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/File/GenerateCodeConfigParamFiles/\347\245\245\345\255\220\347\232\204\347\211\251\346\226\231\344\277\241\346\201\257\350\241\250\351\205\215\347\275\256\346\226\207\346\234\254.txt"
@@ -9,6 +9,6 @@
[妯＄硦鏌ヨ瀛楁]:'MaterialCode', 'MaterialName', 'Remark'
[妯＄硦鏌ヨ瀛楁鍚峕:璇疯緭鍏ョ墿鏂欑紪鐮�/鐗╂枡鍚嶇О/澶囨敞
[椤圭洰鍛藉悕绌洪棿]:HIAWms
-[鏋氫妇绫诲瀷瀛楁闆嗗悎]:PurchaseType|PurchaseTypeEnum|PurchaseTypeDesc,MaterialType|MaterialTypeEnum|MaterialTypeDesc,IsMainBranch|YesNoEnum|IsMainBranchDesc
+[鏋氫妇绫诲瀷瀛楁闆嗗悎]:PurchaseType,PurchaseTypeEnum&MaterialType,MaterialTypeEnum&IsMainBranch,YesNoEnum
[鍓嶇鏍规枃浠跺す鍚嶇О]:templatedemo_web
[鎺掑簭]:CreationTime
\ No newline at end of file
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/Code/MainForm.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/Code/MainForm.cs"
index 6311a10..a3cde54 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/Code/MainForm.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/Code/MainForm.cs"
@@ -246,20 +246,20 @@
//澶勭悊鏋氫妇绫诲瀷
List<EnumModel> enumList = new List<EnumModel>();
var str_enumList = this.tb_EnumList.Text.Trim();
- if (str_enumList.IndexOf(',') > -1)
+ if (str_enumList.IndexOf('&') > -1)
{
str_enumList = str_enumList.Replace("\n", "");
str_enumList = str_enumList.Replace("\t", "");
str_enumList = str_enumList.Replace("\r", "");
- var arr_enumList = str_enumList.Split(',');
+ var arr_enumList = str_enumList.Split('&');
foreach (var item in arr_enumList)
{
- var arr_single = item.Split('|');
+ var arr_single = item.Split(',');
enumList.Add(new EnumModel()
{
EnumAttrName = arr_single[0],
EnumType = arr_single[1],
- EnumTypeDesc = arr_single[2]
+ EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
});
}
}
@@ -267,12 +267,12 @@
{
if (!string.IsNullOrEmpty(str_enumList))
{
- var arr_single = str_enumList.Split('|');
+ var arr_single = str_enumList.Split(',');
enumList.Add(new EnumModel()
{
EnumAttrName = arr_single[0],
EnumType = arr_single[1],
- EnumTypeDesc = arr_single[2]
+ EnumTypeDesc = arr_single[0] + SystemConst.enumDescName
});
}
}
--
Gitblit v1.9.3