From 44a93bbeb890317fd74e12032131fcc4d7e81f19 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周三, 24 4月 2024 14:25:37 +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 | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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..5237c06 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,7 +43,7 @@
/// <summary>
/// 搴撲綅灞炴��
/// </summary>
- public virtual int? PlaceStatus { get; set; }
+ public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
/// <summary>
/// 鏄惁鍫嗗灈鏈哄簱浣�
@@ -235,7 +235,7 @@
/// <summary>
/// 搴撲綅绫诲瀷
/// </summary>
- public virtual int? PlaceType { get; set; }
+ public virtual Admin.NET.Core.PlaceTypeEnum? PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
@@ -250,7 +250,7 @@
/// <summary>
/// 搴撲綅灞炴��
/// </summary>
- public virtual int? PlaceStatus { get; set; }
+ public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
/// <summary>
/// 鏄惁鍫嗗灈鏈哄簱浣�
@@ -445,7 +445,7 @@
/// 搴撲綅绫诲瀷
/// </summary>
[Required(ErrorMessage = "搴撲綅绫诲瀷涓嶈兘涓虹┖")]
- public virtual int PlaceType { get; set; }
+ public virtual Admin.NET.Core.PlaceTypeEnum PlaceType { get; set; }
/// <summary>
/// 搴撲綅绫诲瀷鍚嶇О
@@ -453,14 +453,10 @@
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>
/// 鏄惁鍫嗗灈鏈哄簱浣�
--
Gitblit v1.9.3