From 1d5806bb69891d4045438b12c15cd42cc937e5a2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 24 4月 2024 11:14:24 +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 | 104 ++++++++++++++++++++++++++++------------------------
1 files changed, 56 insertions(+), 48 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 558cc86..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,72 +4,80 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍4:29:28
- * @desc : 鍖呰鍏崇郴鍩虹琛�
+ * @date : 2024/4/24涓婂崍10:48:23
+ * @desc : 鐗╂枡瀹㈡埛鍏宠仈琛�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 鍖呰鍏崇郴鍩虹琛�
+ /// 鐗╂枡瀹㈡埛鍏宠仈琛�
/// </summary>
- [Table("wms_container_packaging")]
- [Comment("鍖呰鍏崇郴鍩虹琛�")]
- public class WmsContainerPackaging : DEntityBase
+ [Table("wms_material_customer")]
+ [Comment("鐗╂枡瀹㈡埛鍏宠仈琛�")]
+ public class WmsMaterialCustomer : DEntityBase
{
/// <summary>
- /// 瀹瑰櫒绫诲瀷ID
+ /// 鐗╂枡ID
/// </summary>
- [Comment("瀹瑰櫒绫诲瀷ID")]
+ [Comment("鐗╂枡ID")]
[Required]
- public long ContainerTypeId { get; set; }
+ public long MaterialId { get; set; }
/// <summary>
- /// 瀹瑰櫒绫诲瀷鍚嶇О
+ /// 鐗╂枡缂栧彿
/// </summary>
- [Comment("瀹瑰櫒绫诲瀷鍚嶇О")]
+ [Comment("鐗╂枡缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialCode { get; set; }
+
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [Comment("鐗╂枡鍚嶇О")]
+ [Required]
+ [MaxLength(50)]
+ public string MaterialName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛ID
+ /// </summary>
+ [Comment("瀹㈡埛ID")]
+ [Required]
+
+ public long CustId { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [Comment("瀹㈡埛缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string CustCode { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛鑻辨枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛鑻辨枃鍚嶇О")]
+ [MaxLength(255)]
+ public string CustEnglishName { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛涓枃鍚嶇О
+ /// </summary>
+ [Comment("瀹㈡埛涓枃鍚嶇О")]
[Required]
[MaxLength(255)]
- public string ContainerTypeName { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷ID
- /// </summary>
- [Comment("鐗╂枡绫诲瀷ID")]
- [Required]
-
- public long MaterialTypeId { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷缂栧彿
- /// </summary>
- [Comment("鐗╂枡绫诲瀷缂栧彿")]
- [Required]
- [MaxLength(255)]
- public string MaterialTypeCode { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡绫诲瀷鍚嶇О
- /// </summary>
- [Comment("鐗╂枡绫诲瀷鍚嶇О")]
- [Required]
- [MaxLength(255)]
- public string MaterialTypeName { get; set; }
-
-
- /// <summary>
- /// 鐗╂枡瀹瑰櫒瀹归噺
- /// </summary>
- [Comment("鐗╂枡瀹瑰櫒瀹归噺")]
-
- [Column("BoxQty", TypeName = "decimal(10,3)")]
- public decimal? BoxQty { get; set; }
+ public string CustChinaName { get; set; }
--
Gitblit v1.9.3