1

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

@@ -0,0 +1,157 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Security;
+
+namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
+{
+    /// <summary>
+    /// 组装、包装，生产任务管理树形输出类
+    /// </summary>
+    public class PackReportTreeOutput : TreeModel
+    {
+        /// <summary>
+        /// 生产任务编号
+        /// </summary>
+        public string? mo_task_code { get; set; }
+
+        /// <summary>
+        /// 工单Id
+        /// </summary>
+        public string? mo_id { get; set; }
+
+        /// <summary>
+        /// 物料Id
+        /// </summary>
+        public string? material_id { get; set; }
+        /// <summary>
+        /// 产线id
+        /// </summary>
+        public string? workline_id { get; set; }
+
+        /// <summary>
+        /// 工位id
+        /// </summary>
+        public string? workstation_id { get; set; }
+
+        /// <summary>
+        /// 工艺路线id
+        /// </summary>
+        public string? workroute_id { get; set; }
+
+        /// <summary>
+        /// 生产bom id
+        /// </summary>
+        public string? bom_id { get; set; }
+
+        /// <summary>
+        /// 任务单状态
+        /// </summary>
+        public string? mo_task_status { get; set; }
+
+        /// <summary>
+        /// 计划数量
+        /// </summary>
+        public int? plan_qty { get; set; }
+
+        /// <summary>
+        /// 已投入数量
+        /// </summary>
+        public int? input_qty { get; set; }
+
+        /// <summary>
+        /// 已完工数量
+        /// </summary>
+        public int? complete_qty { get; set; }
+
+        /// <summary>
+        /// 报废数量
+        /// </summary>
+        public int? scrap_qty { get; set; }
+
+        /// <summary>
+        /// 已排产数量
+        /// </summary>
+        public int? scheduled_qty { get; set; }
+
+        /// <summary>
+        /// 排产类型:1、注塑、挤出2、组装、包装
+        /// </summary>
+        public int? schedule_type { get; set; }
+
+        /// <summary>
+        /// 计划开始时间
+        /// </summary>
+        public string plan_start_date { get; set; }
+
+        /// <summary>
+        /// 计划结束时间
+        /// </summary>
+        public string plan_end_date { get; set; }
+
+        /// <summary>
+        /// 实际开工日期
+        /// </summary>
+        public DateTime? act_start_date { get; set; }
+
+        /// <summary>
+        /// 实际完工日期
+        /// </summary>
+        public DateTime? act_end_date { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string? modify_id { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+
+        /// <summary>
+        /// 扩展字段
+        /// </summary>
+        public string? extras { get; set; }
+
+        /// <summary>
+        /// 生产顺序
+        /// </summary>
+        public int? prd_order { get; set; }
+
+        /// <summary>
+        /// 预计开始时间
+        /// </summary>
+        public DateTime? estimated_start_date { get; set; }
+
+        /// <summary>
+        /// 预计结束时间
+        /// </summary>
+        public DateTime? estimated_end_date { get; set; }
+        /// <summary>
+        /// 父任务Id
+        /// </summary>
+        public string? parent_id { get; set; }
+
+        /// <summary>
+        /// 工序任务量
+        /// </summary>
+        public int? process_task_qty { get; set; }
+        /// <summary>
+        /// 工序id 
+        /// </summary>
+        public string process_id { get; set; }
+    }
+}

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

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Filter;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+
+namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
+{
+    public class PrdPackReportQueryInput : PageInputBase
+    {
+        /// <summary>
+        /// 生产任务编号
+        /// </summary>
+        public string mo_task_code { get; set; }
+    }
+}

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

@@ -46,5 +46,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// 物料属性
         /// </summary>
         public string material_property { get; set; }
+
+        
     }
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTask.part.cs

@@ -70,5 +70,20 @@ namespace Tnb.ProductionMgr.Entities
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public string material_property { get; set; }
+        /// <summary>
+        /// 工序名称
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string process_name { get; set; }
+        /// <summary>
+        /// 工序编码
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string process_code { get; set; }
+        /// <summary>
+        /// 产线编码
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string workline_code { get; set; }
     }
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMoTaskDefectRecord.cs

@@ -52,7 +52,7 @@ public partial class PrdMoTaskDefectRecord : BaseEntity<string>
     /// <summary>
     /// 报废数量
     /// </summary>
-    public int? scrap_qty { get; set; }
+    public int scrap_qty { get; set; }
 
     /// <summary>
     /// 生产任务单状态
@@ -81,6 +81,6 @@ public partial class PrdMoTaskDefectRecord : BaseEntity<string>
     /// <summary>
     /// 任务类型
     /// </summary>
-    public int mo_task_type { get; set; }
+    public string mo_task_type { get; set; }
 
 }

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdReportRecord.cs

@@ -47,7 +47,7 @@ public partial class PrdReportRecord : BaseEntity<string>
     /// <summary>
     /// 完成数量
     /// </summary>
-    public int? completed_qty { get; set; }
+    public int completed_qty { get; set; }
 
     /// <summary>
     /// 任务单号
@@ -60,5 +60,13 @@ public partial class PrdReportRecord : BaseEntity<string>
     /// <summary>
     /// 任务类型
     /// </summary>
-    public int mo_task_type { get; set; }
+    public string mo_task_type { get; set; }
+    /// <summary>
+    /// 生产任务id 
+    /// </summary>
+    public string mo_task_id { get; set; }
+    /// <summary>
+    /// 已报工数量
+    /// </summary>
+    public int reported_work_qty { get; set; }
 }