From 0632e972f30627c5bd6c5a84373bab8e54a4c3ed Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 23:29:39 +0800
Subject: [PATCH] 往来关系增加枚举、种子数据
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs | 117 ++++++++++++-----------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsSubstituteGood/Dto/WmsSubstituteGoodInput.cs | 77 ++++++++-------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs | 5 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs | 42 ++++++++
5 files changed, 152 insertions(+), 93 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
index d179e9d..41e21be 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/BaseCustomer/Dto/BaseCustomerInput.cs
@@ -3,8 +3,8 @@
using System.ComponentModel.DataAnnotations;
namespace Admin.NET.Application
-{
-
+{
+
/// <summary>
/// 瀹㈡埛妗ｆ鏌ヨ鍙傛暟
/// </summary>
@@ -14,95 +14,95 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
public virtual int? CustType { get; set; }
-
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { 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 BaseCustomerSearchNonPage : PageInputNonPageBase
@@ -111,92 +111,92 @@
/// 瀹㈡埛缂栧彿
/// </summary>
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
public virtual int? CustType { get; set; }
-
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { 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>
@@ -207,73 +207,76 @@
/// <summary>
/// 瀹㈡埛缂栧彿
/// </summary>
+ [Required(ErrorMessage = "瀹㈡埛缂栧彿涓嶈兘涓虹┖")]
public virtual string CustCode { get; set; }
-
+
/// <summary>
/// 瀹㈡埛涓枃鍚嶇О
/// </summary>
+ [Required(ErrorMessage = "瀹㈡埛涓枃鍚嶇О涓嶈兘涓虹┖")]
public virtual string CustChinaName { get; set; }
-
+
/// <summary>
/// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
public virtual string CustEnglishName { get; set; }
-
+
/// <summary>
/// 鍔╄鐮�
/// </summary>
public virtual string MnemonicCode { get; set; }
-
+
/// <summary>
/// 绫诲瀷
/// </summary>
- public virtual int CustType { get; set; }
-
+ [Required(ErrorMessage = "绫诲瀷涓嶈兘涓虹┖")]
+ public virtual BaseCustomerTypeEnum CustType { get; set; }
+
/// <summary>
/// 绫诲瀷鍚嶇О
/// </summary>
public virtual string CustTypeName { get; set; }
-
+
/// <summary>
/// 鑱旂郴浜�
/// </summary>
public virtual string LinkMan { get; set; }
-
+
/// <summary>
/// 鐢佃瘽
/// </summary>
public virtual string Phone { get; set; }
-
+
/// <summary>
/// 鐢靛瓙閭欢
/// </summary>
public virtual string Email { get; set; }
-
+
/// <summary>
/// 閭紪
/// </summary>
public virtual string ZipCode { get; set; }
-
+
/// <summary>
/// 鐪佷唤
/// </summary>
public virtual string Province { get; set; }
-
+
/// <summary>
/// 鍩庡競
/// </summary>
public virtual string City { get; set; }
-
+
/// <summary>
/// 鍦板潃
/// </summary>
public virtual string Address { get; set; }
-
+
/// <summary>
/// 鏄惁绂佺敤
/// </summary>
public virtual bool? IsDisabled { get; set; }
-
+
}
/// <summary>
@@ -300,7 +303,7 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
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..e28c139 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>
@@ -137,38 +137,45 @@
/// <summary>
/// 鏇夸唬缂栧彿
/// </summary>
+ [Required(ErrorMessage = "鏇夸唬缂栧彿涓嶈兘涓虹┖")]
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>
+ [Required(ErrorMessage = "鏇夸唬鍝佺墿鏂欏悕绉颁笉鑳戒负绌�")]
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 +202,7 @@
/// </summary>
[Required(ErrorMessage = "Id涓婚敭涓嶈兘涓虹┖")]
public long? Id { get; set; }
-
+
}
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs
new file mode 100644
index 0000000..1794ee2
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/BaseCustomerEnum.cs
@@ -0,0 +1,42 @@
+锘縰sing System.ComponentModel;
+
+namespace Admin.NET.Core
+{
+ /// <summary>
+ /// 寰�鏉ュ叧绯荤被鍨�
+ /// </summary>
+ public enum BaseCustomerTypeEnum
+ {
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [Description("璐т富")]
+ 璐т富 = 1,
+
+ /// <summary>
+ /// 鏀惰揣浜�
+ /// </summary>
+ [Description("鏀惰揣浜�")]
+ 鏀惰揣浜� = 2,
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [Description("渚涘簲鍟�")]
+ 渚涘簲鍟� = 3,
+
+ /// <summary>
+ /// 鎵胯繍浜�
+ /// </summary>
+ [Description("鎵胯繍浜�")]
+ 鎵胯繍浜� = 4,
+
+ /// <summary>
+ /// 鍏朵粬
+ /// </summary>
+ [Description("鍏朵粬")]
+ 鍏朵粬 = 5
+ }
+
+
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
index e8bad2b..af0e282 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
@@ -264,6 +264,11 @@
new SysDictData{Id=539751869472837, TypeId=539751788187717, Value="B", Code="2", Sort=100, Remark="", Status=0 },
new SysDictData{Id=539751888134213, TypeId=539751788187717, Value="C", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134214, TypeId=539751788187718, Value="璐т富", Code="1", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134215, TypeId=539751788187718, Value="鏀惰揣浜�", Code="2", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134216, TypeId=539751788187718, Value="渚涘簲鍟�", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134217, TypeId=539751788187718, Value="鎵胯繍浜�", Code="3", Sort=100, Remark="", Status=0 },
+ new SysDictData{Id=539751888134217, TypeId=539751788187718, Value="鍏朵粬", Code="3", Sort=100, Remark="", Status=0 },
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index eb5faf3..9151d84 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -80,7 +80,9 @@
new SysDictType{Id=386522984120392, Name="鍗曟嵁澶х被", Code="orderlargecategory_Enum", Sort=100, Remark="", Status=0 },
new SysDictType{Id=386522984120393, Name="鍗曟嵁涓昏〃鐘舵��", Code="order_statusenum", Sort=100, Remark="", Status=0 },
- new SysDictType{Id=539751788187717, Name="鐗╂枡ABC鍒嗙被", Code="order_statusenum", Sort=100, Remark="", Status=0 },
+ new SysDictType{Id=539751788187717, Name="鐗╂枡ABC鍒嗙被", Code="abc_class_type", Sort=100, Remark="", Status=0 },
+
+ new SysDictType{Id=539751788187718, Name="寰�鏉ュ叧绯荤被鍨�", Code="base_customer_type", Sort=100, Remark="", Status=0 },
};
}
}
--
Gitblit v1.9.3