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.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs | 140 ++++------------------------------------------
1 files changed, 12 insertions(+), 128 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
index e83f6f4..4176170 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
@@ -28,7 +28,7 @@
/// <summary>
/// 搴撲綅绫诲瀷
/// </summary>
- public virtual int? PlaceType { get; set; }
+ public virtual Admin.NET.Core.PlaceTypeEnum? PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
@@ -43,47 +43,9 @@
/// <summary>
/// 搴撲綅灞炴��
/// </summary>
- public virtual int? PlaceStatus { get; set; }
+ public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { get; set; }
+
/// <summary>
/// 鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -235,7 +197,7 @@
/// <summary>
/// 搴撲綅绫诲瀷
/// </summary>
- public virtual int? PlaceType { get; set; }
+ public virtual Admin.NET.Core.PlaceTypeEnum? PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
@@ -250,47 +212,9 @@
/// <summary>
/// 搴撲綅灞炴��
/// </summary>
- public virtual int? PlaceStatus { get; set; }
+ public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { get; set; }
+
/// <summary>
/// 鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -445,62 +369,21 @@
/// 搴撲綅绫诲瀷
/// </summary>
[Required(ErrorMessage = "搴撲綅绫诲瀷涓嶈兘涓虹┖")]
- public virtual int PlaceType { get; set; }
+ public virtual Admin.NET.Core.PlaceTypeEnum PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
/// </summary>
+ [Required(ErrorMessage = "搴撲綅绫诲瀷鍚嶇О涓嶈兘涓虹┖")]
public virtual string PlaceTypeName { get; set; }
-
- /// <summary>
- /// 瀛樻斁鍗曚綅
- /// </summary>
- public virtual string StockUnit { get; set; }
/// <summary>
/// 搴撲綅灞炴��
/// </summary>
- public virtual int? PlaceStatus { get; set; }
+ [Required(ErrorMessage = "搴撲綅灞炴�т笉鑳戒负绌�")]
+ public virtual Admin.NET.Core.PlaceStatusEnum PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { get; set; }
/// <summary>
/// 鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -520,7 +403,8 @@
/// <summary>
/// 鎵�鍦ㄥ簱鍖�
/// </summary>
- public virtual long? AreaId { get; set; }
+ [Required(ErrorMessage = "鎵�鍦ㄥ簱鍖轰笉鑳戒负绌�")]
+ public virtual long AreaId { get; set; }
/// <summary>
/// 搴撳尯鍚嶇О
--
Gitblit v1.9.3