From 192c6f80af51b4757f0555ee80aaa6bc5a731188 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 3 Sep 2024 11:57:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E7=A7=BB=E9=99=A4source=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EMealVoucher/Request/EMealVoucherReceiveRequest.cs      | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs b/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
index 76597552..3615f01a 100644
--- a/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
+++ b/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
@@ -42,7 +42,6 @@ public class EMealVoucherReceiveRequest : IValidatableObject
     /// <summary>
     /// 来宾来源
     /// </summary>
-    [Required(ErrorMessage = "来宾来源不能为空")]
     public string Source { get; set; }
 
     /// <summary>
@@ -78,11 +77,6 @@ public class EMealVoucherReceiveRequest : IValidatableObject
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
-        if (Number != Details.Count)
-        {
-            yield return new ValidationResult("来宾数量不匹配", new[] { nameof(Number) });
-        }
-
         if (Details.DistinctBy(x => x.IdNo).Count() != Details.Count)
         {
             yield return new ValidationResult("证件信息重复", new[] { "IdNo" });

From 2eee800d92d91350f15a1a108e82b366fea744f3 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 3 Sep 2024 12:16:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EMealVoucher/Request/EMealVoucherReceiveRequest.cs   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs b/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
index 3615f01a..5d54e8f4 100644
--- a/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
+++ b/Src/Dlhis.External/EMealVoucher/Request/EMealVoucherReceiveRequest.cs
@@ -25,7 +25,8 @@ public class EMealVoucherReceiveRequest : IValidatableObject
     /// <summary>
     /// 手机号
     /// </summary>
-    [Required(ErrorMessage = "成本中心不能为空")]
+    [MinLength(11, ErrorMessage = "手机号不合法")]
+    [MaxLength(11, ErrorMessage = "手机号不合法")]
     public string Phone { get; set; }
 
     /// <summary>
@@ -59,8 +60,8 @@ public class EMealVoucherReceiveRequest : IValidatableObject
     /// <summary>
     /// 餐别组合 早餐1;午餐2;晚餐3;夜宵4,凌晨餐5
     /// </summary>
-    [MinLength(1, ErrorMessage = "消费厂区不能为空")]
-    [MaxLength(5, ErrorMessage = "消费厂区不能为空")]
+    [MinLength(1, ErrorMessage = "餐别不能为空")]
+    [MaxLength(5, ErrorMessage = "餐别不能为空")]
     public List<int> Shifts { get; set; }
 
     /// <summary>
@@ -124,7 +125,7 @@ public class EMealVoucherReceiveDetailRequest : IValidatableObject
     /// <summary>
     /// 金额
     /// </summary>
-    [Range(0.01, double.MaxValue)]
+    [Range(0.01, double.MaxValue, ErrorMessage = "金额有误")]
     public decimal Amount { get; set; }