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

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskCompleUpInput.cs

@@ -15,5 +15,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// 任务执行Ids
         /// </summary>
         public List<string> disTaskIds { get; set; }
+
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TaskExecuteAfterUpInput.cs

@@ -14,6 +14,7 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// <summary>
         /// 任务执行Ids
         /// </summary>
-        public List<string> disTaskIds { get; set; } 
+        public List<string> disTaskIds { get; set; }
+
     }
 }

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

@@ -13,4 +13,53 @@ public partial class WmsElevatorH
 {
     [SugarColumn(IsIgnore = true)]
     public int end_floor { get; set; }
+    /// <summary>
+    /// 上级表单ID
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string bill_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 库位ID
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+
+    public string location_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 库位编号
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+
+    public string location_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 点位ID
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+
+    public string point_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 点位编号
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+
+    public string point_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 楼层
+    [SugarColumn(IsIgnore = true)]
+
+    public int floor { get; set; }
+    /// <summary>
+    /// 执行任务Id
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string distask_id { get; set; }
+    /// <summary>
+    /// 设备Id
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string device_id { get; set; }
 }