From b57f4eca1133a7ecad85abf3cff87fe88c366ec2 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 16:10:54 +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 | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 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 7245cc1..8fa596f 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
@@ -306,7 +306,7 @@
/// <summary>
/// 鐗╂枡绫诲瀷
/// </summary>
- public virtual int? MaterialType { get; set; }
+ public virtual long? MaterialType { get; set; }
/// <summary>
/// 鐗╂枡缁�
@@ -413,6 +413,18 @@
}
/// <summary>
+ /// 缂栬緫鐗╂枡涓氬姟淇℃伅瀹炰綋鍏ュ弬--鍖呭惈鐗╂枡銆佺墿鏂欏鎴峰叧绯汇�佹帶鍒跺睘鎬с�佹浛浠ｅ搧
+ /// </summary>
+ public class UpdateWmsMaterialInfoInput : AddWmsMaterialInfoInput
+ {
+ /// <summary>
+ /// Id涓婚敭
+ /// </summary>
+ [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
+ public long? Id { get; set; }
+ }
+
+ /// <summary>
/// 鐗╂枡淇℃伅琛ㄨ幏鍙栧崟涓弬鏁�
/// </summary>
public class QueryeWmsMaterialInput : BaseId
@@ -433,17 +445,18 @@
/// <summary>
/// 鎺у埗灞炴�ц鍒橧D
/// </summary>
- public long ControlRuleld { get; set; }
+ public long? ControlRuleld { get; set; }
/// <summary>
/// 鏇夸唬鍝�
/// </summary>
- public List<WmsSubstituteGood> SubstituteGoodList { get; set; }
+ public List<AddWmsSubstituteGoodInput> SubstituteGoodList { get; set; }
/// <summary>
- /// 瀹㈡埛妗ｆ
+ /// 寰�鏉ュ叧绯�
/// </summary>
- public List<BaseCustomer> BaseCustomerList { get; set; }
+ public List<BaseCustomerInput> BaseCustomerList { get; set; }
}
+
}
--
Gitblit v1.9.3