From 23ab862c0a83c10ef56d92ffb6366e09fba64eed Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Mon, 20 May 2024 15:11:56 +0800
Subject: [PATCH] =?UTF-8?q?kitting=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Kittings/DTOs/KittingDTO.cs                        |  2 +-
 .../Kittings/Inputs/KittingEditInput.cs                |  2 +-
 .../Kittings/Inputs/KittingImportInput.cs              | 10 ++++++----
 .../src/Win_in.Sfs.Basedata.Domain/Kittings/Kitting.cs |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
index 24c62708e..026fe3b54 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/DTOs/KittingDTO.cs
@@ -17,7 +17,7 @@ public class KittingDTO : EntityDto<Guid>, IHasCode, IHasName
     [Display(Name = "名称")]
     public string Name { get; set; }
 
-    [Display(Name = "底盘打包数")]
+    [Display(Name = "底盘打包数量")]
     public decimal ChassisQty { get; set; }
 
     [Display(Name = "明细")]
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingEditInput.cs
index 49223abcb..2f0aecf8d 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingEditInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingEditInput.cs
@@ -19,7 +19,7 @@ public class KittingEditInput : EntityDto<Guid>, IMultiTenant, IRemark, IHasExtr
     public string Code { get; set; }
     public string Name { get; set; }
 
-    [Display(Name = "底盘打包数")]
+    [Display(Name = "底盘打包数量")]
     public decimal ChassisQty { get; set; }
 
     public virtual List<KittingDetailInput>  Details { get; set; }=new List<KittingDetailInput>();
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs
index 3062be0a7..4cc7888cb 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Kittings/Inputs/KittingImportInput.cs
@@ -6,7 +6,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
 public class KittingImportInput : SfsBaseDataImportInputBase
 {
 
-
+    [Required(ErrorMessage = "{0}是必填项")]
     [Display(Name = "Kitting编码")]
     public string Code { get; set; }
 
@@ -50,9 +50,10 @@ public class KittingImportInput : SfsBaseDataImportInputBase
    
 
     /// <summary>
-    ///     包装数量
+    ///     数量
     /// </summary>
-    [Display(Name = "包装数量")]
+    [Display(Name = "数量")]
+    [Required(ErrorMessage = "{0}是必填项")]
     public decimal Qty { set; get; }
 
     /// <summary>
@@ -61,5 +62,6 @@ public class KittingImportInput : SfsBaseDataImportInputBase
     [Display(Name = "配置")]
     public string Conf { set; get; }
 
-    [Display(Name = "底盘打包数")] public decimal ChassisQty { get; set; }
+    [Display(Name = "底盘打包数量")]
+    public decimal ChassisQty { get; set; }
 }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/Kitting.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/Kitting.cs
index 9b28332d1..60253cba3 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/Kitting.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/Kittings/Kitting.cs
@@ -19,7 +19,7 @@ public class Kitting : SfsBaseDataAggregateRootBase, IHasCode
 {
     public string Code { get ; set ; }
     public string Name { get ; set ; }
-    [Display(Name = "底盘打包数")]
+    [Display(Name = "底盘打包数量")]
     public decimal ChassisQty { get; set; }
     public virtual List<KittingDetail> Details { get; set; } = new List<KittingDetail>();
 }