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/WmsPlace.cs | 181 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 149 insertions(+), 32 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 aa4612d..ce90057 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涓嬪崍5:35:14
+ * @date : 2024/4/23涓嬪崍6:30:44
* @desc : 搴撲綅琛�
*/
namespace Admin.NET.Core
@@ -32,7 +32,7 @@
/// </summary>
[Comment("搴撲綅鍚嶇О")]
[Required]
- [MaxLength(255)]
+ [MaxLength(50)]
public string PlaceName { get; set; }
@@ -40,17 +40,132 @@
/// 搴撲綅鍒悕
/// </summary>
[Comment("搴撲綅鍒悕")]
- [MaxLength(255)]
- public string PlaceNickName { get; set; }
+ [MaxLength(50)]
+ public string PlaceAlias { get; set; }
/// <summary>
- /// 搴撲綅鐘舵��
+ /// 搴撲綅绫诲瀷
/// </summary>
- [Comment("搴撲綅鐘舵��")]
+ [Comment("搴撲綅绫诲瀷")]
+ [Required]
+
+ public int 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>
+ /// 搴撲綅灞炴��
+ /// </summary>
+ [Comment("搴撲綅灞炴��")]
[Required]
public int PlaceStatus { 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; }
+
+
+ /// <summary>
+ /// 鏄惁婵�娲讳笌浠诲姟璋冨害
+ /// </summary>
+ [Comment("鏄惁婵�娲讳笌浠诲姟璋冨害")]
+
+ public bool? IsActivateWCS { get; set; }
+
+
+ /// <summary>
+ /// 搴撳瓨鐜
+ /// </summary>
+ [Comment("搴撳瓨鐜")]
+ [MaxLength(255)]
+ public string Environment { get; set; }
+
+
+ /// <summary>
+ /// 搴撳尯缂栧彿
+ /// </summary>
+ [Comment("搴撳尯缂栧彿")]
+ [Required]
+ [MaxLength(50)]
+ public string AreaCode { get; set; }
/// <summary>
@@ -66,8 +181,9 @@
/// 搴撳尯鍚嶇О
/// </summary>
[Comment("搴撳尯鍚嶇О")]
- [MaxLength(255)]
- public string WarehouseName { get; set; }
+ [Required]
+ [MaxLength(50)]
+ public string AreaName { get; set; }
/// <summary>
@@ -115,18 +231,10 @@
/// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- [Comment("鍫嗗灈鏈哄簱浣嶅彿")]
- [MaxLength(50)]
- public string SrmNo { get; set; }
-
-
- /// <summary>
/// 搴撲綅X鍧愭爣
/// </summary>
[Comment("搴撲綅X鍧愭爣")]
- [MaxLength(50)]
+ [MaxLength(255)]
public string Xzb { get; set; }
@@ -134,7 +242,7 @@
/// 搴撲綅Y鍧愭爣
/// </summary>
[Comment("搴撲綅Y鍧愭爣")]
- [MaxLength(50)]
+ [MaxLength(255)]
public string Yzb { get; set; }
@@ -142,7 +250,7 @@
/// 搴撲綅Z鍧愭爣
/// </summary>
[Comment("搴撲綅Z鍧愭爣")]
- [MaxLength(50)]
+ [MaxLength(255)]
public string Zzb { get; set; }
@@ -151,7 +259,7 @@
/// </summary>
[Comment("搴撲綅闀垮害")]
[Required]
- [Column("Length", TypeName = "decimal(18,2)")]
+ [Column("Length", TypeName = "decimal(10,3)")]
public decimal Length { get; set; }
@@ -160,7 +268,7 @@
/// </summary>
[Comment("搴撲綅瀹藉害")]
[Required]
- [Column("Width", TypeName = "decimal(18,2)")]
+ [Column("Width", TypeName = "decimal(10,3)")]
public decimal Width { get; set; }
@@ -169,7 +277,7 @@
/// </summary>
[Comment("搴撲綅楂樺害")]
[Required]
- [Column("Height", TypeName = "decimal(18,2)")]
+ [Column("Height", TypeName = "decimal(10,3)")]
public decimal Height { get; set; }
@@ -178,35 +286,44 @@
/// </summary>
[Comment("鏈�澶ф壙閲�")]
[Required]
- [Column("MaxWeight", TypeName = "decimal(18,2)")]
+ [Column("MaxWeight", TypeName = "decimal(10,3)")]
public decimal MaxWeight { get; set; }
/// <summary>
- /// 搴撲綅楂樺害灞炴��
+ /// 鍏ュ簱椤哄簭
/// </summary>
- [Comment("搴撲綅楂樺害灞炴��")]
+ [Comment("鍏ュ簱椤哄簭")]
[Required]
- public int HeightLevel { get; set; }
+ public int InSequence { get; set; }
/// <summary>
- /// 浼樺厛绾�
+ /// 鍑哄簱椤哄簭
/// </summary>
- [Comment("浼樺厛绾�")]
+ [Comment("鍑哄簱椤哄簭")]
[Required]
- public int Priority { get; set; }
+ public int OutSequence { get; set; }
/// <summary>
- /// 閫昏緫鍖哄煙
+ /// 鏄惁铏氭嫙
/// </summary>
- [Comment("閫昏緫鍖哄煙")]
+ [Comment("鏄惁铏氭嫙")]
[Required]
- public int LogicalName { get; set; }
+ public bool IsVirtually { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁绂佺敤
+ /// </summary>
+ [Comment("鏄惁绂佺敤")]
+ [Required]
+
+ public bool IsDisabled { get; set; }
--
Gitblit v1.9.3