From 17c0c88cb5419351e4f0bf498e4b9535c5b39197 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 5月 2025 21:55:40 +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.WmsInOutStockOrderDetail.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs
index c446f03..c8d28bf 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.EntityFrameworkCore/Extensions/CMSPluginEfCoreExtensions.WmsInOutStockOrderDetail.cs
@@ -44,8 +44,10 @@
                          CMSPluginDbProperties.DbSchema)
                  .HasComment("鍑哄叆搴撳崟鎹槑缁嗚〃");
 
-                // 澶嶅悎涓婚敭閰嶇疆锛堟牴鎹笟鍔¢渶姹傝皟鏁达級
-                b.HasKey(x => new { x.OrderNo, x.MaterialId });
+                // 涓婚敭閰嶇疆
+                b.HasKey(x => x.Id);
+                //// 澶嶅悎涓婚敭閰嶇疆锛堟牴鎹笟鍔¢渶姹傝皟鏁达級
+                //b.HasKey(x => new { x.OrderNo, x.MaterialId });
 
                 // 瀛楁閰嶇疆
                 b.Property(x => x.OrderNo)
@@ -80,8 +82,22 @@
                     .HasComment("鏈哄瀷");
 
                 b.Property(x => x.MaterialBatch)
+                    .HasMaxLength (50)
                     .HasComment("鐗╂枡鎵规");
 
+                b.Property(x => x.Remark)
+                   .HasMaxLength(500)
+                   .HasComment("澶囨敞");
+
+                b.Property(x => x.Sort)
+                    .HasDefaultValue(0)
+                    .HasComment("鎺掑簭");
+
+                b.Property(x => x.IsDisabled)
+                    .HasDefaultValue(false)
+                    .HasComment("鏄惁绂佺敤");
+
+
                 // 绱㈠紩閰嶇疆锛堟牴鎹煡璇㈤渶姹備紭鍖栵級
                 b.HasIndex(x => x.OrderNo); // 鍗曟嵁鏌ヨ
                 b.HasIndex(x => x.MaterialNo); // 鐗╂枡鏌ヨ

--
Gitblit v1.9.3