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/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs
index 7cd66bd..2cbd141 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs
@@ -3,8 +3,8 @@
 using System.ComponentModel.DataAnnotations;
 
 namespace Admin.NET.Application
-{    
-    
+{
+
     /// <summary>
     /// 鏇夸唬鍝佺鐞嗘煡璇㈠弬鏁�
     /// </summary>
@@ -14,60 +14,60 @@
         /// 鏇夸唬缂栧彿
         /// </summary>
         public virtual string SubstituteCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡鍚嶇О
         /// </summary>
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欑紪鍙�
         /// </summary>
         public virtual string SubstituteMaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欏悕绉�
         /// </summary>
         public virtual string SubstituteMaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬娆″簭
         /// </summary>
         public virtual int? SubstituteIndex { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
         public virtual bool? IsDisabled { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         public virtual List<string> CreatedTime { get; set; }
-        
+
         /// <summary>
         /// 鏇存柊鏃堕棿
         /// </summary>
         public virtual List<string> UpdatedTime { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鑰呭悕绉�
         /// </summary>
         public virtual string CreatedUserName { get; set; }
-        
+
         /// <summary>
         /// 淇敼鑰呭悕绉�
         /// </summary>
         public virtual string UpdatedUserName { get; set; }
-        
+
     }
 
-        /// <summary>
+    /// <summary>
     /// 鏇夸唬鍝佺鐞嗕笉鍒嗛〉鏌ヨ鍙傛暟
     /// </summary>
     public class WmsSubstituteGoodSearchNonPage : PageInputNonPageBase
@@ -76,57 +76,57 @@
         /// 鏇夸唬缂栧彿
         /// </summary>
         public virtual string SubstituteCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡鍚嶇О
         /// </summary>
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欑紪鍙�
         /// </summary>
         public virtual string SubstituteMaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欏悕绉�
         /// </summary>
         public virtual string SubstituteMaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬娆″簭
         /// </summary>
         public virtual int? SubstituteIndex { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
         public virtual bool? IsDisabled { get; set; }
-        
+
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
-         public virtual List<DateTimeOffset>? CreatedTime { get; set; }
-        
+        public virtual List<DateTimeOffset>? CreatedTime { get; set; }
+
         /// <summary>
         /// 鏇存柊鏃堕棿
         /// </summary>
-         public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
-        
+        public virtual List<DateTimeOffset>? UpdatedTime { get; set; }
+
         /// <summary>
         /// 鍒涘缓鑰呭悕绉�
         /// </summary>
         public virtual string CreatedUserName { get; set; }
-        
+
         /// <summary>
         /// 淇敼鑰呭悕绉�
         /// </summary>
         public virtual string UpdatedUserName { get; set; }
-        
+
     }
 
     /// <summary>
@@ -138,37 +138,42 @@
         /// 鏇夸唬缂栧彿
         /// </summary>
         public virtual string SubstituteCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡缂栧彿
         /// </summary>
+        [Required(ErrorMessage = "鐗╂枡缂栧彿涓嶈兘涓虹┖")]
         public virtual string MaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鐗╂枡鍚嶇О
         /// </summary>
+        [Required(ErrorMessage = "鐗╂枡鍚嶇О涓嶈兘涓虹┖")]
         public virtual string MaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欑紪鍙�
         /// </summary>
+        [Required(ErrorMessage = "鏇夸唬鍝佺墿鏂欑紪鍙蜂笉鑳戒负绌�")]
         public virtual string SubstituteMaterialCode { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬鍝佺墿鏂欏悕绉�
         /// </summary>
         public virtual string SubstituteMaterialName { get; set; }
-        
+
         /// <summary>
         /// 鏇夸唬娆″簭
         /// </summary>
+        [Required(ErrorMessage = "鏇夸唬娆″簭涓嶈兘涓虹┖")]
         public virtual int SubstituteIndex { get; set; }
-        
+
         /// <summary>
         /// 鏄惁绂佺敤
         /// </summary>
+        [Required(ErrorMessage = "鏄惁绂佺敤涓嶈兘涓虹┖")]
         public virtual bool IsDisabled { get; set; }
-        
+
     }
 
     /// <summary>
@@ -195,7 +200,7 @@
         /// </summary>
         [Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
         public long? Id { get; set; }
-        
+
     }
 
     /// <summary>

--
Gitblit v1.9.3