From 3946fe3c23ff022b7e1d27c2a29041496ef6d529 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:43 +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/WmsMaterialInput.cs | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 59b3ddd..f1a2169 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -415,13 +415,36 @@
/// <summary>
/// 缂栬緫鐗╂枡涓氬姟淇℃伅瀹炰綋鍏ュ弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠ｅ搧
/// </summary>
- public class UpdateWmsMaterialInfoInput : AddWmsMaterialInfoInput
+ public class UpdateWmsMaterialInfoInput
{
+
/// <summary>
- /// Id涓婚敭
+ /// 鐗╂枡鍩虹淇℃伅
/// </summary>
- [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
- public long? Id { get; set; }
+ public UpdateWmsMaterialInput MaterialInput { get; set; }
+
+ /// <summary>
+ /// 鎺у埗灞炴�ц鍒橧D
+ /// </summary>
+ public long? ControlRuleld { get; set; }
+
+ /// <summary>
+ /// 鏇夸唬鍝�
+ /// </summary>
+ public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
+
+ ///// <summary>
+ ///// 寰�鏉ュ崟浣�
+ ///// </summary>
+ //public List<BaseCustomerInput> BaseCustomerList { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛妗ｆ锛堝線鏉ュ崟浣嶏級ID鍒楄〃
+ /// </summary>
+ public List<long> BaseCustomerList { get; set; }
+
+
}
/// <summary>
@@ -465,4 +488,6 @@
}
+
+
}
--
Gitblit v1.9.3