From 3946fe3c23ff022b7e1d27c2a29041496ef6d529 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周五, 26 4月 2024 10:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/iWare_RawMaterialWarehouse
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
index 15a4491..a1122e6 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsArea.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍5:33:52
+ * @date : 2024/4/23涓嬪崍6:31:24
* @desc : 搴撳尯琛�
*/
namespace Admin.NET.Core
@@ -72,9 +72,9 @@
/// <summary>
- /// ERP浠ｇ爜
+ /// ERP搴撳瓨鍦�
/// </summary>
- [Comment("ERP浠ｇ爜")]
+ [Comment("ERP搴撳瓨鍦�")]
[Required]
[MaxLength(50)]
public string ErpCode { get; set; }
@@ -90,6 +90,51 @@
/// <summary>
+ /// 闆朵欢绾х鎺�
+ /// </summary>
+ [Comment("闆朵欢绾х鎺�")]
+ [Required]
+
+ public bool IsBarcodeLevelControl { get; set; }
+
+
+ /// <summary>
+ /// 妫�楠屽厛杩涘厛鍑�
+ /// </summary>
+ [Comment("妫�楠屽厛杩涘厛鍑�")]
+ [Required]
+
+ public bool IsFIFO { get; set; }
+
+
+ /// <summary>
+ /// 闆朵欢绾х鎺�
+ /// </summary>
+ [Comment("闆朵欢绾х鎺�")]
+ [Required]
+
+ public bool IsPartLevelControl { get; set; }
+
+
+ /// <summary>
+ /// 鍏佽娣锋穯
+ /// </summary>
+ [Comment("鍏佽娣锋穯")]
+ [Required]
+
+ public bool IsAllowConfusion { get; set; }
+
+
+ /// <summary>
+ /// 鍏佽璐熷簱瀛�
+ /// </summary>
+ [Comment("鍏佽璐熷簱瀛�")]
+ [Required]
+
+ public bool IsAllowNegativeInventory { get; set; }
+
+
+ /// <summary>
/// 鏄惁铏氭嫙
/// </summary>
[Comment("鏄惁铏氭嫙")]
--
Gitblit v1.9.3