From 0e394ed580b09329ecaa8476bbb6334f8212b009 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 13:40:31 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse

---
 iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
index 8b40223..a9f7638 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialOutput.cs
@@ -139,4 +139,31 @@
         public string UpdatedUserName { get; set; }
         
     }
+
+
+    /// <summary>
+    /// 鐗╂枡涓氬姟淇℃伅瀹炰綋鍑哄弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠e搧
+    /// </summary>
+    public class WmsMaterialInfoOutput
+    {
+        /// <summary>
+        /// 鐗╂枡鍩虹淇℃伅
+        /// </summary>
+        public WmsMaterialOutput MaterialInfo { get; set; }
+
+        /// <summary>
+        /// 鎺у埗灞炴�ц鍒�
+        /// </summary>
+        public List<WmsControlRuleDetailOutput> ControlRuleDetailList { get; set; }
+
+        /// <summary>
+        /// 鏇夸唬鍝�
+        /// </summary>
+        public List<WmsSubstituteGoodOutput> SubstituteGoodList { get; set; }
+
+        /// <summary>
+        /// 寰�鏉ュ叧绯�
+        /// </summary>
+        public List<BaseCustomerOutput> BaseCustomerList { get; set; }
+    }
 }

--
Gitblit v1.9.3