组装包装，生产排产代码调整

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

@@ -8,14 +8,22 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
 {
     public class ClosedownHistoryOutput
     {
+        /// <summary>
+        /// 设备编码
+        /// </summary>
+        public string eqp_code { get; set; }
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string eqp_name { get; set; }
         /// <summary>
         /// 停机开始时间
         /// </summary>
-        public DateTime? closedown_start_time { get; set; }
+        public string? closedown_start_time { get; set; }
         /// <summary>
         /// 停机结束时间
         /// </summary>
-        public DateTime? closedown_end_time { get; set; }
+        public string? closedown_end_time { get; set; }
         /// <summary>
         /// 停机时间
         /// </summary>

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

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
+{
+    public class GenSubMoCrInput
+    {
+        /// <summary>
+        /// 父工单id 
+        /// </summary>
+        public string mo_id { get; set; }
+        /// <summary>
+        /// 子物料ids
+        /// </summary>
+        public List<string> ids { get; set; }
+
+    }
+
+    //public class SubMo
+    //{
+    //    /// <summary>
+    //    /// 物料id 
+    //    /// </summary>
+    //    public string material_id { get; set; }
+    //    /// <summary>
+    //    /// 物料编码
+    //    /// </summary>
+    //    public string material_code { get; set; }
+    //    /// <summary>
+    //    /// 物料名称
+    //    /// </summary>
+    //    public string material_name { get; set; }
+    //    /// <summary>
+    //    /// 物料型号
+    //    /// </summary>
+    //    public string material_category_code { get; set; }
+    //    /// <summary>
+    //    ///输出数量
+    //    /// </summary>
+    //    public int output_qty { get; set; }
+    //}
+}

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

@@ -0,0 +1,128 @@
+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
+{
+    public class PrdMotreeOutput : TreeModel
+    {
+        public string? org_id { get; set; }
+        /// <summary>
+        /// 工单id 
+        /// </summary>
+
+        public string mo_id { get; set; }
+
+        /// <summary>
+        /// 工单代码
+        /// </summary>
+        public string mo_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        public string? material_code { get; set; }
+
+        /// <summary>
+        /// 工单类型：1-正常工单、2-返工工单、3-试制工单
+        /// </summary>
+        public string? mo_type { get; set; }
+
+        /// <summary>
+        /// 生产状态 Initial: 初始,  Confirm:确认 Release: 下发,  Open: 生产中,  Close: 关单,  Pending: 暂停
+        /// </summary>
+        public string? mo_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 DateTime? plan_start_date { get; set; }
+
+        /// <summary>
+        /// 计划结束时间
+        /// </summary>
+        public DateTime? plan_end_date { get; set; }
+
+        /// <summary>
+        /// 是否生派工单
+        /// </summary>
+        public int? is_create_dispatch { get; set; }
+
+
+        /// <summary>
+        /// 产线代码
+        /// </summary>
+        public string? production_linecode { get; set; }
+
+        /// <summary>
+        /// 是否合并
+        /// </summary>
+        public int? is_merge { get; set; }
+
+        /// <summary>
+        /// 组合工单
+        /// </summary>
+        public string? combine_mo_code { get; set; }
+
+        /// <summary>
+        /// 时间戳
+        /// </summary>
+        public string? time_stamp { 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>
+        /// 物料ID
+        /// </summary>
+        public string? material_id { get; set; }
+
+        /// <summary>
+        /// 已排产数量
+        /// </summary>
+        public int? scheduled_qty { get; set; }
+        /// <summary>
+        /// 父工单id
+        /// </summary>
+        public string parent_id { get; set; }
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdMo.cs

@@ -218,5 +218,9 @@ public partial class PrdMo : BaseEntity<string>
     /// 已排产数量
     /// </summary>
     public int? scheduled_qty { get; set; }
+    /// <summary>
+    /// 父工单id
+    /// </summary>
+    public string parent_id { get; set; }
 
 }