Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -195,4 +195,9 @@ public class ModuleConsts
     ///   模块标识-在库物料维护
     /// </summary>
     public const string MODULE_WMSINSTKMIN_ID = "27124095468309";
+    /// <summary>
+    /// 模块标识-区域物料设定
+    /// </summary>
+    public const string MODULE_BASREGIONMAT_ID = "26187428200229";
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -265,5 +265,7 @@
         /// 盘点任务计算状态-未结算
         /// </summary>
         public const string CLOSINGSTATUS_WJS_ID = "27674058079509";
+
+        
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsElevatorH.cs

@@ -44,10 +44,6 @@ public partial class WmsElevatorH : BaseEntity<string>
     /// </summary>
     public string elevator_group { get; set; } = string.Empty;
 
-    /// <summary>
-    /// 状态
-    /// </summary>
-    public int status { get; set; }
 
     /// <summary>
     /// 任务数量

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsElevatorH.part.cs

@@ -59,4 +59,11 @@ public partial class WmsElevatorH
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public string device_id { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(ColumnName = "status")]
+    public int enable_mark { get; set; }
+
 }