Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairApply.cs

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainPlanCrInput.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 生成保养计划输入参数
+    /// </summary>
+    public class MaintainPlanCrInput
+    {
+        /// <summary>
+        /// 规则id 
+        /// </summary>
+        public string rule_id { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainPlanMoldLstOutput.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using NPOI.HSSF.Record.Chart;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 保养计划模具列表输出参数
+    /// </summary>
+    public class MaintainPlanMoldLstOutput
+    {
+        /// <summary>
+        /// 模具Id
+        /// </summary>
+        public string mold_id { get; set; }
+        /// <summary>
+        /// 模具编码
+        /// </summary>
+        public string mold_code { get; set; }
+        /// <summary>
+        /// 模具名称
+        /// </summary>
+        public string mold_name { get;}
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainRuleMoldListOutput.cs

@@ -23,5 +23,15 @@ namespace Tnb.EquipMgr.Entities.Dto
         /// 模具名称 
         /// </summary>
         public string mold_name { get; set; }
+        /// <summary>
+        /// 项目组Id
+        /// </summary>
+        public string item_group_id { get; set; }
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string item_group_name { get; set; }
+
+
     }
 }

EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldRuleSelectorListOutput.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 模具规则选择列表输出类
+    /// </summary>
+    public class MoldRuleSelectorListOutput
+    {
+        /// <summary>
+        /// 模具Id
+        /// </summary>
+        public string mold_id { get; set; }
+        /// <summary>
+        /// 模具编号
+        /// </summary>
+        public string mold_code { get; set; }
+        /// <summary>
+        /// 模具名称
+        /// </summary>
+        public string mold_name { get; set; }
+        /// <summary>
+        /// 项目组列表 
+        /// </summary>
+        public List<MaintainItemGroupItem> groupItems { get; set; }
+    }
+
+    public class MaintainItemGroupItem
+    {
+        /// <summary>
+        /// 保养项目组Id
+        /// </summary>
+        public string item_group_id { get; set; }
+        public string name { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/RelevanceMoldFromPlanInput.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    /// <summary>
+    /// 模具保养计划制定-计划关联模具输入参数
+    /// </summary>
+    public class RelevanceMoldFromPlanInput : BaseMoldMaintainInput
+    {
+
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/RelevanceMoldInput.cs

@@ -9,11 +9,33 @@ namespace Tnb.EquipMgr.Entities.Dto
     /// <summary>
     /// 模具规则定义，关键模具输入参数
     /// </summary>
-    public class RelevanceMoldInput : BaseMoldMaintainInput
+    public class RelevanceMoldInput
     {
         /// <summary>
         /// 规则Id
         /// </summary>
-        public string? rule_id { get; set; }
+        public string rule_id { get; set; }
+
+        /// <summary>
+        /// 行id 包含模具id，项目组Id
+        /// </summary>
+        public List<RowIdItem> rowIds { get; set; }
+        /// <summary>
+        /// 模具Ids
+        /// </summary>
+        public List<string> ids { get; set; }
+
+    }
+
+    public class RowIdItem 
+    {
+        /// <summary>
+        /// 模具id
+        /// </summary>
+        public string mold_id { get; set; }
+        /// <summary>
+        /// 项目组id
+        /// </summary>
+        public string group_id { get; set; }
     }
 }