From 8cfa3e6747a1f72bd65c143150942b2954277c89 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 25 4月 2024 12:59:25 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs | 152 ++++++++------------------------------------------
1 files changed, 25 insertions(+), 127 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
index 7fd3bab..e22aa7f 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍6:13:28
+ * @date : 2024/4/24涓嬪崍4:54:43
* @desc : 搴撲綅琛�
*/
namespace Admin.NET.Core
@@ -32,7 +32,7 @@
/// </summary>
[Comment("搴撲綅鍚嶇О")]
[Required]
- [MaxLength(255)]
+ [MaxLength(50)]
public string PlaceName { get; set; }
@@ -40,7 +40,7 @@
/// 搴撲綅鍒悕
/// </summary>
[Comment("搴撲綅鍒悕")]
- [MaxLength(255)]
+ [MaxLength(50)]
public string PlaceAlias { get; set; }
@@ -50,23 +50,24 @@
[Comment("搴撲綅绫诲瀷")]
[Required]
- public int PlaceType { get; set; }
-
-
- /// <summary>
- /// 瀛樻斁鍗曚綅
- /// </summary>
- [Comment("瀛樻斁鍗曚綅")]
- [MaxLength(255)]
- public string StockUnit { get; set; }
+ public PlaceTypeEnum PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
/// </summary>
[Comment("搴撲綅绫诲瀷鍚嶇О")]
+ [Required]
[MaxLength(50)]
public string PlaceTypeName { get; set; }
+
+
+ /// <summary>
+ /// 瀛樻斁鍗曚綅
+ /// </summary>
+ [Comment("瀛樻斁鍗曚綅")]
+ [MaxLength(50)]
+ public string StockUnit { get; set; }
/// <summary>
@@ -75,111 +76,7 @@
[Comment("搴撲綅灞炴��")]
[Required]
- public int PlaceStatus { get; set; }
-
-
- /// <summary>
- /// 鏉＄爜绾х鎺�
- /// </summary>
- [Comment("鏉＄爜绾х鎺�")]
-
- public bool? IsBarcodeLevelControl { get; set; }
-
-
- /// <summary>
- /// 鍏佽娣锋穯
- /// </summary>
- [Comment("鍏佽娣锋穯")]
-
- public bool? IsAllowConfusion { get; set; }
-
-
- /// <summary>
- /// 鍏佽璐熷簱瀛�
- /// </summary>
- [Comment("鍏佽璐熷簱瀛�")]
-
- public bool? IsAllowNegativeInventory { get; set; }
-
-
- /// <summary>
- /// 妫�楠屽厛杩涘厛鍑�
- /// </summary>
- [Comment("妫�楠屽厛杩涘厛鍑�")]
-
- public bool? IsFIFO { get; set; }
-
-
- /// <summary>
- /// 闆朵欢绾х鎺�
- /// </summary>
- [Comment("闆朵欢绾х鎺�")]
-
- public bool? IsPartLevelControl { get; set; }
-
-
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- [Comment("鏄惁鍫嗗灈鏈哄簱浣�")]
-
- public bool? IsSrmPlace { get; set; }
-
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- [Comment("鍫嗗灈鏈哄簱浣嶅彿")]
- [MaxLength(50)]
- public string SrmPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- [Comment("鏄惁RGV搴撲綅")]
-
- public bool? IsRgvPlace { get; set; }
-
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- [Comment("RGV搴撲綅鍙�")]
- [MaxLength(50)]
- public string RgvPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- [Comment("鏄惁AGV搴撲綅")]
-
- public bool? IsAgvPlace { get; set; }
-
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- [Comment("AGV搴撲綅鍙�")]
- [MaxLength(50)]
- public string AgvPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- [Comment("鏄惁杈撻�佺嚎搴撲綅")]
-
- public bool? IsTransPlace { get; set; }
-
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- [Comment("杈撻�佺嚎搴撲綅鍙�")]
- [MaxLength(50)]
- public string TransPlaceNo { get; set; }
+ public PlaceStatusEnum PlaceStatus { get; set; }
/// <summary>
@@ -199,6 +96,15 @@
/// <summary>
+ /// 搴撳尯缂栧彿
+ /// </summary>
+ [Comment("搴撳尯缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string AreaCode { get; set; }
+
+
+ /// <summary>
/// 鎵�鍦ㄥ簱鍖�
/// </summary>
[Comment("鎵�鍦ㄥ簱鍖�")]
@@ -211,7 +117,8 @@
/// 搴撳尯鍚嶇О
/// </summary>
[Comment("搴撳尯鍚嶇О")]
- [MaxLength(255)]
+ [Required]
+ [MaxLength(50)]
public string AreaName { get; set; }
@@ -317,15 +224,6 @@
[Required]
[Column("MaxWeight", TypeName = "decimal(10,3)")]
public decimal MaxWeight { get; set; }
-
-
- /// <summary>
- /// 搴撲綅楂樺害灞炴��
- /// </summary>
- [Comment("搴撲綅楂樺害灞炴��")]
- [Required]
-
- public int HeightLevel { get; set; }
/// <summary>
--
Gitblit v1.9.3