From b586f4883139022280ac994d7ed02906c0f6c89e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 19 5月 2025 16:59:09 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs
index 7bce03b..08631c1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsMaterial.cs
@@ -50,7 +50,7 @@
             b.HasKey(x => x.Id);
 
             // 瀛楁閰嶇疆
-            b.Property(x => x.MaterialCode)
+            b.Property(x => x.MaterialNo)
                 .HasMaxLength(64)
                 .IsRequired()
                 .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�");
@@ -63,8 +63,13 @@
             b.Property(x => x.PurchaseType)
                 .HasComment("閲囪喘绫诲瀷锛堟灇涓惧�硷級");
 
-            b.Property(x => x.MaterialType)
-                .HasComment("鐗╂枡绫诲瀷锛堟灇涓惧�硷級");
+            b.Property(x => x.MaterialTypeCode)
+                .HasMaxLength(20)
+                .HasComment("鐗╂枡绫诲瀷缂栫爜");
+
+            b.Property(x => x.MaterialTypeDesc)
+                .HasMaxLength(20)
+                .HasComment("鐗╂枡绫诲瀷");
 
             b.Property(x => x.PrimaryUnit)
                 .HasMaxLength(20)
@@ -137,10 +142,10 @@
                 .HasComment("鏄惁绂佺敤");
 
             // 绱㈠紩閰嶇疆
-            b.HasIndex(x => x.MaterialCode).IsUnique(); // 鐗╂枡缂栫爜鍞竴绱㈠紩
+            b.HasIndex(x => x.MaterialNo).IsUnique(); // 鐗╂枡缂栫爜鍞竴绱㈠紩
             b.HasIndex(x => x.MaterialName);           // 鐗╂枡鍚嶇О鏅�氱储寮�
             b.HasIndex(x => x.PurchaseType);           // 閲囪喘绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
-            b.HasIndex(x => x.MaterialType);           // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
+            b.HasIndex(x => x.MaterialTypeCode);           // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛�
 
             b.ApplyObjectExtensionMappings();
         });

--
Gitblit v1.9.3