From c2bac53ff77d91dfffb4bda9b0bcbf6556fda9a1 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 13:25:23 +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 |  127 ++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 122 insertions(+), 5 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 14a2a3f..9f6d04a 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.MySQL/Migrations/CMSPluginDbContextModelSnapshot.cs
@@ -1133,9 +1133,15 @@
                         .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)")
@@ -1192,7 +1198,7 @@
                     b.HasIndex("MaterialNo")
                         .IsUnique();
 
-                    b.HasIndex("MaterialType");
+                    b.HasIndex("MaterialTypeCode");
 
                     b.HasIndex("PurchaseType");
 
@@ -1385,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")
@@ -1441,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")

--
Gitblit v1.9.3