diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs
index 1ff7bb4c6..28fcd5459 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/AQLs/Inputs/AQLImportInput.cs
@@ -7,20 +7,20 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class AQLImportInput : SfsBaseDataImportInputBase
{
///
- /// 物品编号
+ /// 物品代码
///
[Key]
- [Display(Name = "物品编号")]
- [Required(ErrorMessage = "物品编号是必填项")]
+ [Display(Name = "物品代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ItemCode { get; set; }
///
- /// 供应商编号
+ /// 供应商代码
///
[Key]
- [Display(Name = "供应商编号")]
- [Required(ErrorMessage = "供应商编号是必填项")]
+ [Display(Name = "供应商代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string SupplierCode { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Areas/Inputs/AreaImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Areas/Inputs/AreaImportInput.cs
index f68741313..0352703a1 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Areas/Inputs/AreaImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Areas/Inputs/AreaImportInput.cs
@@ -8,18 +8,18 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class AreaImportInput : SfsBaseDataImportInputBase
{
///
- /// 编码
+ /// 区域代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "区域代码")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 区域名称
///
- [Display(Name = "名称")]
+ [Display(Name = "区域名称")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerAddresses/Inputs/CustomerAddressImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerAddresses/Inputs/CustomerAddressImportInput.cs
index 57c85eb42..81d2b202a 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerAddresses/Inputs/CustomerAddressImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerAddresses/Inputs/CustomerAddressImportInput.cs
@@ -7,7 +7,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class CustomerAddressImportInput : SfsBaseDataImportInputBase
{
///
- /// 客户编号
+ /// 客户代码
///
[Display(Name = "客户代码")]
[Required(ErrorMessage = "{0}是必填项")]
@@ -15,7 +15,7 @@ public class CustomerAddressImportInput : SfsBaseDataImportInputBase
public string CustomerCode { get; set; }
///
- /// 库位编号
+ /// 仓库代码
///
[Display(Name = "仓库代码")]
[Required(ErrorMessage = "{0}是必填项")]
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs
index ab0705d23..4b0880904 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/CustomerItems/Inputs/CustomerItemImportInput.cs
@@ -9,7 +9,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class CustomerItemImportInput : SfsBaseDataImportInputBase
{
///
- /// 物品编号
+ /// 物品代码
///
[Key]
[Display(Name = "物品代码")]
@@ -27,7 +27,7 @@ public class CustomerItemImportInput : SfsBaseDataImportInputBase
public string CustomerCode { get; set; }
///
- /// 客户物品编号
+ /// 客户物品代码
///
[Display(Name = "客户物品代码")]
[Required(ErrorMessage = "{0}是必填项")]
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Docks/Inputs/DockImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Docks/Inputs/DockImportInput.cs
index b30a742d5..77ef033d8 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Docks/Inputs/DockImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Docks/Inputs/DockImportInput.cs
@@ -7,16 +7,16 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class DockImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 收货口代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "收货口代码")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 收货口名称
///
- [Display(Name = "名称")]
+ [Display(Name = "收货口名称")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
///
@@ -26,9 +26,9 @@ public class DockImportInput : SfsBaseDataImportInputBase
[StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Description { get; set; }
///
- /// 仓库
+ /// 仓库代码
///
- [Display(Name = "仓库")]
+ [Display(Name = "仓库代码")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string WarehouseCode { get; set; }
@@ -36,6 +36,7 @@ public class DockImportInput : SfsBaseDataImportInputBase
/// 默认库位代码
///
[Display(Name = "默认库位代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string DefaultLocationCode { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs
index b104514f0..3d64f11a2 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemBasics/Inputs/ItemBasicImportInput.cs
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
+using Win_in.Sfs.Shared.Application.Contracts;
using Win_in.Sfs.Shared.Domain;
using Win_in.Sfs.Shared.Domain.Shared;
@@ -8,33 +9,33 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class ItemBasicImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 物品代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "物品代码")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 物品名称
///
- [Display(Name = "名称")]
+ [Display(Name = "物品名称")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
///
- /// 描述1
+ /// 物品描述1
///
- [Display(Name = "描述1")]
+ [Display(Name = "物品描述1")]
[StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Desc1 { get; set; }
///
- /// 描述2
+ /// 物品描述2
///
- [Display(Name = "描述2")]
+ [Display(Name = "物品描述2")]
[StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Desc2 { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs
index 4d0511784..f66abd2fc 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemCategories/Inputs/ItemCategoryImportInput.cs
@@ -11,7 +11,7 @@ public class ItemCategoryImportInput : SfsBaseDataImportInputBase
///
[Key]
[Display(Name = "物品代码")]
- [Required(ErrorMessage = "物品代码是必填项")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ItemCode { get; set; }
@@ -20,7 +20,7 @@ public class ItemCategoryImportInput : SfsBaseDataImportInputBase
///
[Key]
[Display(Name = "分类代码")]
- [Required(ErrorMessage = "分类代码是必填项")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string CategoryCode { get; set; }
@@ -28,7 +28,7 @@ public class ItemCategoryImportInput : SfsBaseDataImportInputBase
/// 分类值
///
[Display(Name = "分类值")]
- [Required(ErrorMessage = "分类值是必填项")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.DescLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Value { get; set; }
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackImportInput.cs
index bbd8cd77f..9ea2c9977 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemPacks/Inputs/ItemPackImportInput.cs
@@ -7,11 +7,11 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class ItemPackImportInput : SfsBaseDataImportInputBase
{
///
- /// 包装编号
+ /// 包装代码
///
[Key]
- [Display(Name = "包装编号")]
- [Required(ErrorMessage = "包装编号不能为空")]
+ [Display(Name = "包装代码")]
+ [Required(ErrorMessage = "{0}不能为空")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string PackCode { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs
index 2e0fcc49a..fdcb12022 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemQualities/Inputs/ItemQualityImportInput.cs
@@ -24,11 +24,11 @@ public class ItemQualityImportInput : SfsBaseDataImportInputBase
// public string Name { get; set; }
///
- /// 供应商编号
+ /// 供应商代码
///
[Key]
[Display(Name = "供应商代码")]
- [Required(ErrorMessage = "供应商编号是必填项")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string SupplierCode { get; set; }
///
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs
index 4dda4cb49..6ce177f58 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemSafetyStocks/Inputs/ItemSafetyStockImportInput.cs
@@ -66,7 +66,7 @@ public class ItemSafetyStockImportInput : SfsBaseDataImportInputBase
///
/// 补料点
///
- [ImporterHeader(Name = "安全库存", Format = "#,##0")]
+ [ImporterHeader(Name = "补料点", Format = "#,##0")]
[Display(Name = "补料点")]
[Required(ErrorMessage = "{0}是必填项")]
public decimal FeedLine { get; set; }
@@ -74,7 +74,7 @@ public class ItemSafetyStockImportInput : SfsBaseDataImportInputBase
///
/// 补料数量
///
- [ImporterHeader(Name = "安全库存", Format = "#,##0")]
+ [ImporterHeader(Name = "补料数量", Format = "#,##0")]
[Display(Name = "补料数量")]
[Required(ErrorMessage = "{0}是必填项")]
public decimal FeedQty { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs
index 51ecc07e4..e1e10c1b3 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ItemStoreRelations/Inputs/ItemStoreRelationImportInput.cs
@@ -13,6 +13,7 @@ public class ItemStoreRelationImportInput : SfsBaseDataImportInputBase
///
[Key]
[Display(Name = "物品代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string ItemCode { get; set; }
///
@@ -71,9 +72,9 @@ public class ItemStoreRelationImportInput : SfsBaseDataImportInputBase
public string AltUm { get; set; }
///
- /// 储存单位
+ /// 存储单位
///
- [Display(Name = "储存单位")]
+ [Display(Name = "存储单位")]
public string StoreUM { get; set; }
///
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs
index 0eb79c9dd..973b44f20 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/LocationGroups/Inputs/LocationGroupImportInput.cs
@@ -10,18 +10,19 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocationSwitch
{
///
- /// 编码
+ /// 库位组代码
///
[Key]
- [Display(Name = "代码")]
- [Required(ErrorMessage = "代码是必填项")]
+ [Display(Name = "库位组代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 库位组名称
///
- [Display(Name = "名称")]
+ [Display(Name = "库位组名称")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
@@ -70,114 +71,114 @@ public class LocationGroupImportInput : SfsBaseDataImportInputBase, IHasLocation
public string OverflowLocationGroup { get; set; }
///
- /// 可以混物品
+ /// 是否混物品
///
- [Display(Name = "可以混物品")]
+ [Display(Name = "是否混物品")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixItem { get; set; } = true;
///
- /// 可以混批次
+ /// 是否混批次
///
- [Display(Name = "可以混批次")]
+ [Display(Name = "是否混批次")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixLot { get; set; } = true;
///
- /// 可以混状态
+ /// 是否混状态
///
- [Display(Name = "可以混状态")]
+ [Display(Name = "是否混状态")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixStatus { get; set; } = true;
///
- /// 可以负库存
+ /// 是否负库存
///
- [Display(Name = "可以负库存")]
+ [Display(Name = "是否负库存")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableNegative { get; set; } = true;
///
- /// 可以保留零库存
+ /// 是否保留零库存
///
- [Display(Name = "可以保留零库存")]
+ [Display(Name = "是否保留零库存")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableKeepZero { get; set; } = true;
///
- /// 可以机会盘点
+ /// 是否动态盘点
///
- [Display(Name = "可以机会盘点")]
+ [Display(Name = "是否动态盘点")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableOpportunityCount { get; set; } = true;
///
- /// 可以领料
+ /// 是否领料
///
- [Display(Name = "可以领料")]
+ [Display(Name = "是否领料")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnablePick { get; set; } = true;
///
- /// 可以过量领料
+ /// 是否过量领料
///
- [Display(Name = "可以过量领料")]
+ [Display(Name = "是否过量领料")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableOverPick { get; set; } = true;
///
- /// 可以整包存储
+ /// 是否整包存储
///
- [Display(Name = "可以整包存储")]
+ [Display(Name = "是否整包存储")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableWholeStore { get; set; } = true;
///
- /// 可以散件存储
+ /// 是否散件存储
///
- [Display(Name = "可以散件存储")]
+ [Display(Name = "是否散件存储")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableBreakStore { get; set; } = true;
///
- /// 可以发出
+ /// 是否发出
///
- [Display(Name = "可以发出")]
+ [Display(Name = "是否发出")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableShip { get; set; } = true;
///
- /// 可以接收
+ /// 是否接收
///
- [Display(Name = "可以接收")]
+ [Display(Name = "是否接收")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReceive { get; set; } = true;
///
- /// 可以退货给供应商
+ /// 是否退货给供应商
///
- [Display(Name = "可以退货给供应商")]
+ [Display(Name = "是否退货给供应商")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReturnToSupplier { get; set; } = true;
///
- /// 可以接收客户退货
+ /// 是否接收客户退货
///
- [Display(Name = "可以接收客户退货")]
+ [Display(Name = "是否接收客户退货")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReturnFromCustomer { get; set; } = true;
///
- /// 是否可以拆箱
+ /// 是否拆箱
///
- [Display(Name = "是否可以拆箱")]
+ [Display(Name = "是否拆箱")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableSplitBox { get; set; } = true;
///
- /// 是否可以拆托
+ /// 是否拆托
///
- [Display(Name = "是否可以拆托")]
+ [Display(Name = "是否拆托")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableSplitPallet { get; set; } = true;
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs
index 9e5b2d9a3..2a2e2e0ab 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Locations/Inputs/LocationImportInput.cs
@@ -9,11 +9,11 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class LocationImportInput : SfsBaseDataImportInputBase, IHasLocationSwitch
{
///
- /// 代码
+ /// 库位代码
///
[Key]
- [Display(Name = "代码")]
- [Required(ErrorMessage = "代码是必填项")]
+ [Display(Name = "库位代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
@@ -114,99 +114,99 @@ public class LocationImportInput : SfsBaseDataImportInputBase, IHasLocationSwitc
public int PickOrder { get; set; }
///
- /// 可以混物品
+ /// 是否混物品
///
- [Display(Name = "可以混物品")]
+ [Display(Name = "是否混物品")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixItem { get; set; } = true;
///
- /// 可以混批次
+ /// 是否混批次
///
- [Display(Name = "可以混批次")]
+ [Display(Name = "是否混批次")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixLot { get; set; } = true;
///
- /// 可以混状态
+ /// 是否混状态
///
- [Display(Name = "可以混状态")]
+ [Display(Name = "是否混状态")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableMixStatus { get; set; } = true;
///
- /// 可以负库存
+ /// 是否负库存
///
- [Display(Name = "可以负库存")]
+ [Display(Name = "是否负库存")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableNegative { get; set; } = true;
///
- /// 可以保留零库存
+ /// 是否保留零库存
///
- [Display(Name = "可以保留零库存")]
+ [Display(Name = "是否保留零库存")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableKeepZero { get; set; } = true;
///
- /// 可以机会盘点
+ /// 是否盘点
///
- [Display(Name = "可以机会盘点")]
+ [Display(Name = "是否盘点")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableOpportunityCount { get; set; } = true;
///
- /// 可以领料
+ /// 是否领料
///
- [Display(Name = "可以领料")]
+ [Display(Name = "是否领料")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnablePick { get; set; } = true;
///
- /// 可以过量领料
+ /// 是否过量领料
///
- [Display(Name = "可以过量领料")]
+ [Display(Name = "是否过量领料")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableOverPick { get; set; } = true;
///
- /// 可以整包存储
+ /// 是否整包存储
///
- [Display(Name = "可以整包存储")]
+ [Display(Name = "是否整包存储")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableWholeStore { get; set; } = true;
///
- /// 可以散件存储
+ /// 是否散件存储
///
- [Display(Name = "可以散件存储")]
+ [Display(Name = "是否散件存储")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableBreakStore { get; set; } = true;
///
- /// 可以发出
+ /// 是否发出
///
- [Display(Name = "可以发出")]
+ [Display(Name = "是否发出")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableShip { get; set; } = true;
///
- /// 可以接收
+ /// 是否接收
///
- [Display(Name = "可以接收")]
+ [Display(Name = "是否接收")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReceive { get; set; } = true;
///
- /// 可以退货给供应商
+ /// 是否退货给供应商
///
- [Display(Name = "可以退货给供应商")]
+ [Display(Name = "是否退货给供应商")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReturnToSupplier { get; set; } = true;
///
- /// 可以接收客户退货
+ /// 是否接收客户退货
///
- [Display(Name = "可以接收客户退货")]
+ [Display(Name = "是否接收客户退货")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableReturnFromCustomer { get; set; } = true;
///
- /// 是否可以拆箱
+ /// 是否拆箱
///
- [Display(Name = "是否可以拆箱")]
+ [Display(Name = "是否拆箱")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableSplitBox { get; set; } = true;
///
- /// 是否可以拆托
+ /// 是否拆托
///
- [Display(Name = "是否可以拆托")]
+ [Display(Name = "是否拆托")]
[Required(ErrorMessage = "{0}是必填项")]
public bool EnableSplitPallet { get; set; } = true;
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs
index a7ce7fb71..2a90a38cf 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/ProductionLines/Inputs/ProductionLineImportInput.cs
@@ -11,7 +11,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class ProductionLineImportInput : SfsBaseDataImportInputBase
{
///
- /// 编码
+ /// 生产线代码
///
[Key]
[Display(Name = "生产线代码")]
@@ -19,10 +19,10 @@ public class ProductionLineImportInput : SfsBaseDataImportInputBase
public string Code { get; set; }
///
- /// 名称
+ /// 生产线名称
///
- [Display(Name = "名称")]
- [Required(ErrorMessage = "名称是必填项")]
+ [Display(Name = "生产线名称")]
+ [Required(ErrorMessage = "{生产线名称}是必填项")]
public string Name { get; set; }
///
@@ -35,25 +35,28 @@ public class ProductionLineImportInput : SfsBaseDataImportInputBase
/// 类型
///
[Display(Name = "类型")]
- [Required(ErrorMessage = "类型是必填项")]
+ [Required(ErrorMessage = "{0}是必填项")]
public EnumProductionLineType Type { get; set; }
///
- /// 车间
+ /// 车间代码
///
- [Display(Name = "车间")]
+ [Display(Name = "车间代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string WorkshopCode { get; set; }
///
/// 原料库位
///
[Display(Name = "原料库位")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string RawLocationCode { get; set; }
///
/// 成品库位
///
[Display(Name = "成品库位")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string ProductLocationCode { get; set; }
///
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Projects/Inputs/ProjectImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Projects/Inputs/ProjectImportInput.cs
index f5730ea72..6036128f6 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Projects/Inputs/ProjectImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Projects/Inputs/ProjectImportInput.cs
@@ -29,6 +29,7 @@ public class ProjectImportInput : SfsBaseDataImportInputBase
/// 项目名称
///
[Display(Name = "项目名称")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
@@ -36,6 +37,7 @@ public class ProjectImportInput : SfsBaseDataImportInputBase
/// 开始时间
///
[Display(Name = "开始时间")]
+ [Required(ErrorMessage = "{0}是必填项")]
[ImporterHeader(Name = "开始时间", Format = "yyyy-MM-dd")]
[ExporterHeader(DisplayName = "开始时间", Format = "yyyy-MM-dd")]
public DateTime? BeginTime { get; set; }
@@ -44,6 +46,7 @@ public class ProjectImportInput : SfsBaseDataImportInputBase
/// 结束时间
///
[Display(Name = "结束时间")]
+ [Required(ErrorMessage = "{0}是必填项")]
[ImporterHeader(Name = "结束时间", Format = "yyyy-MM-dd")]
[ExporterHeader(DisplayName = "结束时间", Format = "yyyy-MM-dd")]
public DateTime? EndTime { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs
index 17f408fd5..87900dc3a 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Shifts/Inputs/ShiftImportInput.cs
@@ -9,18 +9,18 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class ShiftImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 班次代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "班次代码")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 班次名称
///
- [Display(Name = "名称")]
+ [Display(Name = "班次名称")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs
index 53e8c3558..4008f4e33 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierItems/Inputs/SupplierItemImportInput.cs
@@ -10,11 +10,11 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class SupplierItemImportInput : SfsBaseDataImportInputBase
{
///
- /// 供应商编号
+ /// 供应商代码
///
[Key]
- [Display(Name = "供应商编号")]
- [Required(ErrorMessage = "供应商编号是必填项")]
+ [Display(Name = "供应商代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string SupplierCode { get; set; }
@@ -26,19 +26,19 @@ public class SupplierItemImportInput : SfsBaseDataImportInputBase
public string SupplierSimpleName { get; set; }
///
- /// 物品编号
+ /// 物品代码
///
[Key]
- [Display(Name = "物品编号")]
- [Required(ErrorMessage = "物品编号是必填项")]
+ [Display(Name = "物品代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string ItemCode { get; set; }
///
- /// 供应商物品编号
+ /// 供应商物品代码
///
- [Display(Name = "供应商物品编号")]
- [Required(ErrorMessage = "供应商物品编号是必填项")]
+ [Display(Name = "供应商物品代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string SupplierItemCode { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierTimeWindows/Inputs/SupplierTimeWindowImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierTimeWindows/Inputs/SupplierTimeWindowImportInput.cs
index 6002f9390..ae640f7a4 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierTimeWindows/Inputs/SupplierTimeWindowImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SupplierTimeWindows/Inputs/SupplierTimeWindowImportInput.cs
@@ -34,11 +34,11 @@ public class SupplierTimeWindowImportInput : SfsBaseDataImportInputBase
public string TimeSlot { get; set; }
///
- /// 日期
+ /// 当前星期
///
[Key]
- [Display(Name = "日期")]
- [Required(ErrorMessage = "日期是必填项")]
+ [Display(Name = "当前星期")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Week { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Teams/Inputs/TeamImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Teams/Inputs/TeamImportInput.cs
index 512df78ff..f80559f25 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Teams/Inputs/TeamImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/Teams/Inputs/TeamImportInput.cs
@@ -10,18 +10,18 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class TeamImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 班组代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "班组代码")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 班组名称
///
- [Display(Name = "名称")]
+ [Display(Name = "班组名称")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkCenters/Inputs/WorkStationImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkCenters/Inputs/WorkStationImportInput.cs
index a1db7f218..101d2f22c 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkCenters/Inputs/WorkStationImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkCenters/Inputs/WorkStationImportInput.cs
@@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Win_in.Sfs.Basedata.Domain.Shared;
+using Win_in.Sfs.Shared.Domain;
namespace Win_in.Sfs.Basedata.Application.Contracts;
@@ -9,9 +10,10 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class WorkStationImportInput : SfsBaseDataImportInputBase
{
///
- /// 编码
+ /// 工作中心代码
///
- [Display(Name = "编码")]
+ [Display(Name = "工作中心代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
public string Code { get; set; }
///
@@ -27,9 +29,9 @@ public class WorkStationImportInput : SfsBaseDataImportInputBase
public string Description { get; set; }
///
- /// 生产线
+ /// 生产线代码
///
- [Display(Name = "生产线")]
+ [Display(Name = "生产线代码")]
public string ProductionLineCode { get; set; }
///
@@ -51,4 +53,11 @@ public class WorkStationImportInput : SfsBaseDataImportInputBase
[Required(ErrorMessage = "{0}是必填项")]
public EnumWorkStationType? Type { get; set; }
+ ///
+ /// 备注
+ ///
+ [Display(Name = "备注")]
+ [StringLength(SfsEfCorePropertyConst.RemarkLength, ErrorMessage = "{0}最多输入{1}个字符")]
+ public string Remark { get; set; }
+
}
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkGroups/Inputs/WorkGroupImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkGroups/Inputs/WorkGroupImportInput.cs
index ae8454fd5..71ec6c426 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkGroups/Inputs/WorkGroupImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkGroups/Inputs/WorkGroupImportInput.cs
@@ -7,17 +7,18 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
public class WorkGroupImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 工作组代码
///
[Key]
- [Display(Name = "代码")]
- [Required(ErrorMessage = "代码是必填项")]
+ [Display(Name = "工作组代码")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 工作组名称
///
- [Display(Name = "名称")]
+ [Display(Name = "工作组名称")]
+ [Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.NameLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }
diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkShops/Inputs/WorkShopImportInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkShops/Inputs/WorkShopImportInput.cs
index 15621ac44..af9b25876 100644
--- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkShops/Inputs/WorkShopImportInput.cs
+++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/WorkShops/Inputs/WorkShopImportInput.cs
@@ -11,18 +11,18 @@ public class WorkShopImportInput : SfsBaseDataImportInputBase
{
///
- /// 代码
+ /// 车间代码
///
[Key]
- [Display(Name = "代码")]
+ [Display(Name = "车间代码")]
[Required(ErrorMessage = "{0}是必填项")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Code { get; set; }
///
- /// 名称
+ /// 车间名称
///
- [Display(Name = "名称")]
+ [Display(Name = "车间名称")]
[StringLength(SfsEfCorePropertyConst.CodeLength, ErrorMessage = "{0}最多输入{1}个字符")]
public string Name { get; set; }