From 8dbe04f7807d7a4540910552a3db7d7d9008c488 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 20 5月 2025 14:30:50 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs | 162 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 145 insertions(+), 17 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
index 52830b8..9f6d04a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -139,7 +139,7 @@
b.HasComment("搴撳尯琛�");
});
- modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlaces.WmsContainerPlace", b =>
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsContainerPlace.WmsContainerPlace", b =>
{
b.Property<string>("PlaceNo")
.HasMaxLength(50)
@@ -623,8 +623,9 @@
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
- b.Property<int?>("MaterialBatch")
- .HasColumnType("int")
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
.HasComment("鐗╂枡鎵规");
b.Property<string>("MaterialId")
@@ -742,6 +743,11 @@
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
+ b.Property<string>("MaterialBatch")
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡鎵规");
+
b.Property<string>("MaterialId")
.IsRequired()
.HasMaxLength(50)
@@ -769,7 +775,6 @@
.HasComment("鎿嶄綔鏃堕棿");
b.Property<string>("OrderNo")
- .IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasComment("鍗曟嵁缂栧彿");
@@ -1106,12 +1111,6 @@
.HasColumnType("decimal(18,2)")
.HasComment("闀垮害锛堝崟浣嶏細m锛�");
- b.Property<string>("MaterialNo")
- .IsRequired()
- .HasMaxLength(64)
- .HasColumnType("varchar(64)")
- .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
-
b.Property<string>("MaterialModel")
.HasMaxLength(128)
.HasColumnType("varchar(128)")
@@ -1123,14 +1122,26 @@
.HasColumnType("varchar(128)")
.HasComment("鐗╂枡鍚嶇О");
+ b.Property<string>("MaterialNo")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
+
b.Property<string>("MaterialQuality")
.HasMaxLength(64)
.HasColumnType("varchar(64)")
.HasComment("鏉愯川锛堝锛�304涓嶉攬閽級");
- b.Property<int>("MaterialType")
- .HasColumnType("int")
- .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+ b.Property<string>("MaterialTypeCode")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("鐗╂枡绫诲瀷缂栫爜");
+
+ b.Property<string>("MaterialTypeDesc")
+ .HasMaxLength(20)
+ .HasColumnType("varchar(20)")
+ .HasComment("鐗╂枡绫诲瀷");
b.Property<decimal>("OuterDiameter")
.HasColumnType("decimal(18,2)")
@@ -1182,12 +1193,12 @@
b.HasKey("Id");
+ b.HasIndex("MaterialName");
+
b.HasIndex("MaterialNo")
.IsUnique();
- b.HasIndex("MaterialName");
-
- b.HasIndex("MaterialType");
+ b.HasIndex("MaterialTypeCode");
b.HasIndex("PurchaseType");
@@ -1380,6 +1391,115 @@
b.HasComment("WMS鐗╂枡搴撳瓨琛�");
});
+ modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsMaterialTypes.WmsMaterialType", 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")
+ .HasComment("鍒涘缓鏃堕棿");
+
+ b.Property<Guid?>("CreatorId")
+ .HasColumnType("char(36)")
+ .HasColumnName("CreatorId")
+ .HasComment("鍒涘缓浜篒D");
+
+ b.Property<string>("CreatorName")
+ .HasColumnType("longtext");
+
+ b.Property<string>("DeleteRemark")
+ .HasColumnType("longtext");
+
+ b.Property<Guid?>("DeleterId")
+ .HasColumnType("char(36)")
+ .HasColumnName("DeleterId")
+ .HasComment("鍒犻櫎浜篒D");
+
+ b.Property<DateTime?>("DeletionTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("DeletionTime")
+ .HasComment("鍒犻櫎鏃堕棿");
+
+ b.Property<string>("ExtraField1")
+ .HasColumnType("longtext");
+
+ b.Property<string>("ExtraField2")
+ .HasColumnType("longtext");
+
+ b.Property<string>("ExtraField3")
+ .HasColumnType("longtext");
+
+ b.Property<string>("ExtraProperties")
+ .HasColumnType("longtext")
+ .HasColumnName("ExtraProperties");
+
+ b.Property<bool>("IsDeleted")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
+ .HasColumnName("IsDeleted")
+ .HasComment("鏄惁宸插垹闄�");
+
+ b.Property<bool?>("IsDisabled")
+ .HasColumnType("tinyint(1)");
+
+ b.Property<DateTime?>("LastModificationTime")
+ .HasColumnType("datetime(6)")
+ .HasColumnName("LastModificationTime")
+ .HasComment("鏈�鍚庝慨鏀规椂闂�");
+
+ b.Property<Guid?>("LastModifierId")
+ .HasColumnType("char(36)")
+ .HasColumnName("LastModifierId")
+ .HasComment("鏈�鍚庝慨鏀逛汉ID");
+
+ b.Property<string>("LastModifierName")
+ .HasColumnType("longtext");
+
+ b.Property<string>("MaterialTypeCode")
+ .IsRequired()
+ .HasMaxLength(64)
+ .HasColumnType("varchar(64)")
+ .HasComment("绫诲瀷缂栫爜");
+
+ b.Property<string>("MaterialTypeDesc")
+ .IsRequired()
+ .HasMaxLength(128)
+ .HasColumnType("varchar(128)")
+ .HasComment("绫诲瀷鎻忚堪");
+
+ b.Property<string>("OperationRemark")
+ .HasColumnType("longtext");
+
+ b.Property<string>("Remark")
+ .HasMaxLength(50)
+ .HasColumnType("varchar(50)")
+ .HasComment("澶囨敞");
+
+ b.Property<int>("Sort")
+ .HasColumnType("int");
+
+ b.HasKey("Id");
+
+ b.HasIndex("MaterialTypeCode")
+ .IsUnique();
+
+ b.HasIndex("MaterialTypeDesc");
+
+ b.ToTable("scms_wmsmaterialtype", (string)null);
+
+ b.HasComment("鐗╂枡绫诲瀷琛�");
+ });
+
modelBuilder.Entity("CMS.Plugin.HIAWms.Domain.WmsPlaces.WmsPlace", b =>
{
b.Property<Guid>("Id")
@@ -1436,8 +1556,10 @@
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
- b.Property<bool?>("IsDisabled")
+ b.Property<bool>("IsDisabled")
+ .ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
+ .HasDefaultValue(false)
.HasComment("鏄惁绂佺敤");
b.Property<int>("Islock")
@@ -1701,6 +1823,12 @@
.HasColumnType("varchar(200)")
.HasComment("鍙彉鍙橀噺3");
+ b.Property<int>("PlcTaskId")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int")
+ .HasDefaultValue(0)
+ .HasComment("浠诲姟鐘舵��");
+
b.Property<int?>("SonTaskType")
.HasColumnType("int")
.HasComment("瀛愪换鍔＄被鍨�");
--
Gitblit v1.9.3