From f0b6b4d5286d69db4cae6622b8acd8cabcba1cb7 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 13 5月 2025 17:15:20 +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 | 10 +++++++--- 1 files changed, 7 insertions(+), 3 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 7cf375e..9c0d47b 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 @@ -4,6 +4,7 @@ using Microsoft.EntityFrameworkCore; using Volo.Abp; using Volo.Abp.EntityFrameworkCore.Modeling; +using CMS.Plugin.HIAWms.Domain.Shared.Enums; namespace CMS.Plugin.HIAWms.EntityFrameworkCore.Extensions; @@ -49,7 +50,7 @@ b.HasKey(x => x.Id); // 瀛楁閰嶇疆 - b.Property(x => x.MaterialCode) + b.Property(x => x.MaterialNo) .HasMaxLength(64) .IsRequired() .HasComment("鐗╂枡缂栫爜锛堝敮涓�鏍囪瘑锛�"); @@ -90,7 +91,7 @@ .HasComment("闀垮害锛堝崟浣嶏細m锛�"); b.Property(x => x.IsMainBranch) - .HasDefaultValue(false) + .HasDefaultValue(YesNoEnum.N) .HasComment("鏄惁涓轰富鏀"); b.Property(x => x.Factory) @@ -100,6 +101,9 @@ b.Property(x => x.Certification) .HasMaxLength(128) .HasComment("璇佷功缂栧彿"); + b.Property(x => x.MaterialModel) + .HasMaxLength(128) + .HasComment("鍨嬪彿"); // 鍐椾綑瀛楁閰嶇疆 b.Property(x => x.RedundantField1) @@ -133,7 +137,7 @@ .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); // 鐗╂枡绫诲瀷绱㈠紩锛堝闇�鏌ヨ杩囨护锛� -- Gitblit v1.9.3