From 75c4ec6f18f5ae2db91a22b034ecbadf25a7880c Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周四, 25 4月 2024 12:35:56 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs | 77 +++++++++++++++++---------------------
1 files changed, 34 insertions(+), 43 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
index ee8db96..461e0ba 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -4,27 +4,27 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍4:14:52
- * @desc : 鏇夸唬鍝佺鐞�
+ * @date : 2024/4/24涓婂崍10:48:23
+ * @desc : 鐗╂枡瀹㈡埛鍏宠仈琛�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 鏇夸唬鍝佺鐞�
+ /// 鐗╂枡瀹㈡埛鍏宠仈琛�
/// </summary>
- [Table("wms_substitute_good")]
- [Comment("鏇夸唬鍝佺鐞�")]
- public class WmsSubstituteGood : DEntityBase
+ [Table("wms_material_customer")]
+ [Comment("鐗╂枡瀹㈡埛鍏宠仈琛�")]
+ public class WmsMaterialCustomer : DEntityBase
{
/// <summary>
- /// 鏇夸唬缂栧彿
+ /// 鐗╂枡ID
/// </summary>
- [Comment("鏇夸唬缂栧彿")]
+ [Comment("鐗╂枡ID")]
[Required]
- [MaxLength(50)]
- public string SubstituteCode { get; set; }
+
+ public long MaterialId { get; set; }
/// <summary>
@@ -46,47 +46,38 @@
/// <summary>
- /// 鏇夸唬鍝佺墿鏂欑紪鍙�
+ /// 瀹㈡埛ID
/// </summary>
- [Comment("鏇夸唬鍝佺墿鏂欑紪鍙�")]
+ [Comment("瀹㈡埛ID")]
+ [Required]
+
+ public long CustId { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [Comment("瀹㈡埛缂栧彿")]
[Required]
[MaxLength(50)]
- public string SubstituteMaterialCode { get; set; }
+ public string CustCode { get; set; }
/// <summary>
- /// 鏇夸唬鍝佺墿鏂欏悕绉�
+ /// 瀹㈡埛鑻辨枃鍚嶇О
/// </summary>
- [Comment("鏇夸唬鍝佺墿鏂欏悕绉�")]
+ [Comment("瀹㈡埛鑻辨枃鍚嶇О")]
+ [MaxLength(255)]
+ public string CustEnglishName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛涓枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛涓枃鍚嶇О")]
[Required]
- [MaxLength(50)]
- public string SubstituteMaterialName { get; set; }
-
-
- /// <summary>
- /// 鏇夸唬娆″簭
- /// </summary>
- [Comment("鏇夸唬娆″簭")]
- [Required]
-
- public int SubstituteIndex { get; set; }
-
-
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- [Comment("鐗堟湰鍙�")]
- [MaxLength(50)]
- public string VersionNO { get; set; }
-
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [Comment("鏄惁绂佺敤")]
- [Required]
-
- public bool IsDisabled { get; set; }
+ [MaxLength(255)]
+ public string CustChinaName { get; set; }
--
Gitblit v1.9.3