合并

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSchedlingCrInput.cs

@@ -10,14 +10,6 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
     /// 组装、包装排产输入参数
     /// </summary>
     public class PackSchedlingCrInput
-    {
-        /// <summary>
-        /// bom任务集合
-        /// </summary>
-        public List<PackSchedlingItem>  items{ get; set; }
-    }
-
-    public class PackSchedlingItem 
     {
         /// <summary>
         /// 工单Id
@@ -28,10 +20,6 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// </summary>
         public string bom_id { get; set; }
         /// <summary>
-        /// 工序id
-        /// </summary>
-        public string process_id { get; set; }
-        /// <summary>
         /// 产线Id
         /// </summary>
         public string workline_id { get; set; }
@@ -39,21 +27,26 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// 物料Id
         /// </summary>
         public string material_id { get; set; }
+        
         /// <summary>
-        /// 生产任务单号
+        /// 排产数量
         /// </summary>
-        public string mo_task_code { get; set; }
+        public string scheduled_qty { get; set; }
+
         /// <summary>
-        /// 物料编码
-        /// </summary>
-        public string material_code { get; set; }
+        /// Desc:预计开始时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime estimated_start_date { get; set; }
+
         /// <summary>
-        /// 物料名称
-        /// </summary>
-        public string material_name { get; set; }
-        /// <summary>
-        /// bom产出料数量
-        /// </summary>
-        public string qty { get; set; }
+        /// Desc:预计结束时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime estimated_end_date { get; set; }
+
+
     }
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PackSechelToBeIssueListOutput.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.DirectoryServices.Protocols;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
+{
+    /// <summary>
+    /// 组装、包装生产任务待下发输出参数列表 
+    /// </summary>
+    public class PackSechelToBeIssueListOutput
+    {
+        /// <summary>
+        /// 生产任务ID
+        /// </summary>
+        public string mo_task_id { get; set; }
+        /// <summary>
+        /// 生产任务编号
+        /// </summary>
+        public string mo_task_code { get; set; }
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        public string material_code { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string material_name { get; set; }
+        /// <summary>
+        /// 产线编号
+        /// </summary>
+        public string workline_code { get; set; }
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string workline_name { get; set; }
+        /// <summary>
+        /// 任务单状态 
+        /// </summary>
+        public string mo_task_status { get; set; }
+        /// <summary>
+        /// 生产任务数量
+        /// </summary>
+        public int scheduled_qty { get; set; }
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        public int plan_qty { get; set; }
+        /// <summary>
+        /// 工序任务量
+        /// </summary>
+        public int process_task_qty { get; set; }
+
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/PrdMoTaskOutput.cs

@@ -47,6 +47,14 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// </summary>
         public string eqp_type_code { get; set; }
         /// <summary>
+        /// 产线编码
+        /// </summary>
+        public string workline_code { get; set; }
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string workline_name { get; set; }
+        /// <summary>
         /// 任务单数量
         /// </summary>
         public int mo_task_qty { get; set; }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdTaskLog.cs

@@ -108,6 +108,12 @@ namespace Tnb.ProductionMgr.Entities
         /// 任务单编号 
         /// </summary>
         public string mo_task_code { get; set; }
+        /// <summary>
+        /// 产线Code
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string workline_code { get; set; }
+
 
     }
 }