WMS 库房业务，生成任务，任务执行

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

@@ -1,4 +1,5 @@
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -22,6 +23,18 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// </summary>
         public const string PRETASK_BILL_STATUS_DXF_ID = "26126822610469";
         /// <summary>
+        /// 预任务单据状态-已下发Id
+        /// </summary>
+        public const string PRETASK_BILL_STATUS_YXF_ID = "26126830290469";
+        /// <summary>
+        /// 预任务单据状态-已开始Id
+        /// </summary>
+        public const string PRETASK_BILL_STATUS_START_ID = "26126834032677";
+        /// <summary>
+        /// 任务单据状态-已下达Id
+        /// </summary>
+        public const string TASK_BILL_STATUS_YXD_ID = "26126853976101";
+        /// <summary>
         /// 预任务生成业务类型-载具移入Id
         /// </summary>
         public const string BIZTYPE_MOVEIN_ID = "26121988909861";
@@ -29,5 +42,9 @@ namespace Tnb.WarehouseMgr.Entities.Consts
         /// 单据状态-作业中
         /// </summary>
         public const string BILLSTATUS_ON_ID = "25065143245845";
+        /// <summary>
+        /// 预任务类型-入库TypeId 
+        /// </summary>
+        public const string WMS_PRETASK_INSTOCK_TYPE_ID = "26126748597797";
     }
 }

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

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
+{
+    /// <summary>
+    /// 任务执行取操作输入参数
+    /// </summary>
+    public class TaskExecuteAfterUpInput
+    {
+        /// <summary>
+        /// 任务执行Ids
+        /// </summary>
+        public List<string> DisTaskIds { get; set; }
+    }
+}

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

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
+{
+    /// <summary>
+    /// 任务执行输入参数
+    /// </summary>
+    public class TaskExecuteUpInput
+    {
+        /// <summary>
+        /// 生成任务Ids
+        /// </summary>
+        public List<string> disTaskIds { get; set; }
+        /// <summary>
+        /// 设备Ids
+        /// </summary>
+        public List<string> EqpIds { get; set; }
+
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs

@@ -92,12 +92,12 @@ public partial class WmsDistaskH : BaseEntity<string>
     /// <summary>
     /// 预任务申请ID
     /// </summary>
-    public string pertask_id { get; set; } = string.Empty;
+    public string pretask_id { get; set; } = string.Empty;
 
     /// <summary>
     /// 预任务申请单号
     /// </summary>
-    public string pertask_code { get; set; } = string.Empty;
+    public string pretask_code { get; set; } = string.Empty;
 
     /// <summary>
     /// 是否签收
@@ -182,7 +182,7 @@ public partial class WmsDistaskH : BaseEntity<string>
     /// <summary>
     /// 协议内容
     /// </summary>
-    public string agreement { get; set; } = string.Empty;
+    public string? agreement { get; set; }
 
     /// <summary>
     /// 扩展字段
@@ -194,4 +194,24 @@ public partial class WmsDistaskH : BaseEntity<string>
     /// </summary>
     public DateTime? timestamp { get; set; }
 
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// 起始库位编号
+    /// </summary>
+    public string startlocation_code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 目标库位编号
+    /// </summary>
+    public string endlocation_code { get; set; } = string.Empty;
+
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs

@@ -153,5 +153,9 @@ public partial class WmsPretaskH : BaseEntity<string>
     /// 目标库位编号
     /// </summary>
     public string endlocation_code { get; set; } = string.Empty;
+    /// <summary>
+    /// 优先级
+    /// </summary>
+    public int priority { get; set; } = 1;
 
 }

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

@@ -0,0 +1,17 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 预任务申请主表
+/// </summary>
+public partial class WmsPretaskH
+{
+    /// <summary>
+    /// 单次搬运数量
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public int move_num { get; set; }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Mapper/Mapper.cs

@@ -8,11 +8,9 @@ namespace Tnb.WarehouseMgr.Entities.Mapper
     {
         public void Register(TypeAdapterConfig config)
         {
-            //config.ForType<InOutStockApplyforUpInput, WmsInstockD>()
-            //      .Map(dest => dest.id, src => src.bill_id);
-            //config.ForType<InOutStockApplyforUpInput, WmsOutstockD>()
-            //      .Map(dest => dest.id, src => src.bill_id);
-
+            config.ForType<WmsPretaskH, WmsDistaskH>()
+                  .Map(dest => dest.pretask_id, src => src.id)
+                  .Map(dest => dest.pretask_code, src => src.bill_code);
         }
     }
 }