From 52d3e2a6f892a4e9e3241c00eb9228588ebc4e7c Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周二, 23 4月 2024 16:29:56 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs | 77 +++++++++++++++-----------------------
1 files changed, 30 insertions(+), 47 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..558cc86 100755
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsMaterialCustomer.cs
@@ -4,89 +4,72 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍4:14:52
- * @desc : 鏇夸唬鍝佺鐞�
+ * @date : 2024/4/23涓嬪崍4:29:28
+ * @desc : 鍖呰鍏崇郴鍩虹琛�
*/
namespace Admin.NET.Core
{
/// <summary>
- /// 鏇夸唬鍝佺鐞�
+ /// 鍖呰鍏崇郴鍩虹琛�
/// </summary>
- [Table("wms_substitute_good")]
- [Comment("鏇夸唬鍝佺鐞�")]
- public class WmsSubstituteGood : DEntityBase
+ [Table("wms_container_packaging")]
+ [Comment("鍖呰鍏崇郴鍩虹琛�")]
+ public class WmsContainerPackaging : DEntityBase
{
/// <summary>
- /// 鏇夸唬缂栧彿
+ /// 瀹瑰櫒绫诲瀷ID
/// </summary>
- [Comment("鏇夸唬缂栧彿")]
+ [Comment("瀹瑰櫒绫诲瀷ID")]
[Required]
- [MaxLength(50)]
- public string SubstituteCode { get; set; }
+
+ public long ContainerTypeId { get; set; }
/// <summary>
- /// 鐗╂枡缂栧彿
+ /// 瀹瑰櫒绫诲瀷鍚嶇О
/// </summary>
- [Comment("鐗╂枡缂栧彿")]
+ [Comment("瀹瑰櫒绫诲瀷鍚嶇О")]
[Required]
- [MaxLength(50)]
- public string MaterialCode { get; set; }
+ [MaxLength(255)]
+ public string ContainerTypeName { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
+ /// 鐗╂枡绫诲瀷ID
/// </summary>
- [Comment("鐗╂枡鍚嶇О")]
+ [Comment("鐗╂枡绫诲瀷ID")]
[Required]
- [MaxLength(50)]
- public string MaterialName { get; set; }
+
+ public long MaterialTypeId { get; set; }
/// <summary>
- /// 鏇夸唬鍝佺墿鏂欑紪鍙�
+ /// 鐗╂枡绫诲瀷缂栧彿
/// </summary>
- [Comment("鏇夸唬鍝佺墿鏂欑紪鍙�")]
+ [Comment("鐗╂枡绫诲瀷缂栧彿")]
[Required]
- [MaxLength(50)]
- public string SubstituteMaterialCode { get; set; }
+ [MaxLength(255)]
+ public string MaterialTypeCode { get; set; }
/// <summary>
- /// 鏇夸唬鍝佺墿鏂欏悕绉�
+ /// 鐗╂枡绫诲瀷鍚嶇О
/// </summary>
- [Comment("鏇夸唬鍝佺墿鏂欏悕绉�")]
+ [Comment("鐗╂枡绫诲瀷鍚嶇О")]
[Required]
- [MaxLength(50)]
- public string SubstituteMaterialName { get; set; }
+ [MaxLength(255)]
+ public string MaterialTypeName { get; set; }
/// <summary>
- /// 鏇夸唬娆″簭
+ /// 鐗╂枡瀹瑰櫒瀹归噺
/// </summary>
- [Comment("鏇夸唬娆″簭")]
- [Required]
+ [Comment("鐗╂枡瀹瑰櫒瀹归噺")]
- public int SubstituteIndex { get; set; }
-
-
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- [Comment("鐗堟湰鍙�")]
- [MaxLength(50)]
- public string VersionNO { get; set; }
-
-
- /// <summary>
- /// 鏄惁绂佺敤
- /// </summary>
- [Comment("鏄惁绂佺敤")]
- [Required]
-
- public bool IsDisabled { get; set; }
+ [Column("BoxQty", TypeName = "decimal(10,3)")]
+ public decimal? BoxQty { get; set; }
--
Gitblit v1.9.3