异常开始结束带代码提交

EquipMgr/Tnb.EquipMgr.Entities/Dto/BaseMoldMaintainInput.cs

@@ -8,7 +8,7 @@ namespace Tnb.EquipMgr.Entities.Dto
 {
     public class BaseMoldMaintainInput
     {
-        public string item_group_id { get; set; }
+        public string id { get; set; }
         public List<string> ids { get; set; }
     }
 }

EquipMgr/Tnb.EquipMgr.Entities/Dto/ClosedownEndListOutput.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class ClosedownEndListOutput
+    {
+        public string id { get; set; }
+        /// <summary>
+        /// 生产场地
+        /// </summary>
+        public string workshop_name { get; set; }
+        /// <summary>
+        /// 停机原因
+        /// </summary>
+        public string reason { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string eqp_code { get; set; }
+        /// <summary>
+        /// 设备型号
+        /// </summary>
+        public string eqp_type_code { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        /// <param name=""></param>
+        /// <returns></returns>
+        public string operator_name { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+        /// <summary>
+        /// 停机开始时间
+        /// </summary>
+        public DateTime? closeddown_start_time { get; set; }
+
+    }
+}

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

@@ -19,10 +19,18 @@ namespace Tnb.EquipMgr.Entities.Dto
         /// <summary>
         /// 模具编码
         /// </summary>
-        public string mold_code { get; set; }
+        public string? mold_code { get; set; }
         /// <summary>
         /// 模具名称
         /// </summary>
-        public string mold_name { get;}
+        public string? mold_name { get; set; }
+        /// <summary>
+        /// 库房编码
+        /// </summary>
+        public string? whcode { get; set; }
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+        public string? location_code { get; set; }
     }
 }

EquipMgr/Tnb.EquipMgr.Entities/Dto/MaintainStatusUpInput.cs

@@ -0,0 +1,23 @@
+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 MaintainStatusUpInput
+    {
+        /// <summary>
+        /// 维修任务单id数组
+        /// </summary>
+        public List<string> ids { get; set; }
+        /// <summary>
+        /// 维修单状态    DWX(待维修)、WXZ(维修中)、YWC(已维修)
+        /// </summary> 
+        public string  status { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/MoldMaintainUpInput.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class MoldMaintainUpInput
+    {
+        /// <summary>
+        /// 维修任务Id数组
+        /// </summary>
+        public List<string> ids { get; set; }
+        /// <summary>
+        /// 维修状态 
+        /// </summary>
+        public string  status{ get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs

@@ -183,5 +183,9 @@ public partial class EqpEquipment : BaseEntity<string>
     /// 模具Id
     /// </summary>
     public string? mold_id { get; set; }
+    /// <summary>
+    /// 工位编码
+    /// </summary>
+    public string station_code { get; set; }
 
 }

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainTask.cs

@@ -0,0 +1,56 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具维修任务表
+/// </summary>
+[SugarTable("tool_mold_maintain_task")]
+public partial class ToolMoldMaintainTask : BaseEntity<string>
+{
+    public ToolMoldMaintainTask()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 维修单号
+    /// </summary>
+    public string? code { get; set; }
+
+    /// <summary>
+    /// 模具id
+    /// </summary>
+    public string? mold_id { 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_strat_time { get; set; }
+
+    /// <summary>
+    /// 维修结束时间
+    /// </summary>
+    public DateTime? modify_end_time { get; set; }
+    /// <summary>
+    /// 维修单状态 
+    /// </summary>
+    public string status { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMolds.part.cs

@@ -0,0 +1,22 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具信息表
+/// </summary>
+public partial class ToolMolds 
+{
+    /// <summary>
+    /// 库房编码
+    /// </summary>
+    [SugarColumn(IsIgnore = true)]
+    public string whcode { get; set; }
+    /// <summary>
+    /// 库位编码
+    /// </summary>
+    [SugarColumn(IsIgnore =true)]
+    public string location_code { get; set; }
+}

EquipMgr/Tnb.EquipMgr.Entities/Enums/MaintainStatus.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.EquipMgr.Entities.Enums
+{
+    public enum MaintainStatus
+    {
+        /// <summary>
+        /// 待维修
+        /// </summary>
+        DWX=1,
+        /// <summary>
+        /// 维修中
+        /// </summary>
+        WXZ=2,
+        /// <summary>
+        /// 已完成 
+        /// </summary>
+        YWC=4,
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Mapper/Mapper.cs

@@ -12,6 +12,9 @@ namespace Tnb.EquipMgr.Entities.Mapper
                   .Map(dest => dest.item_id, src => src.id);
             config.ForType<ToolMolds, RelevanceMoldListOutput>()
                   .Map(dest => dest.mold_id, src => src.id);
+            config.ForType<ToolMolds, MaintainPlanMoldLstOutput>()
+                  .Map(dest => dest.mold_id, src => src.id);
+                  //.Map(dest=>dest.mold_name,src=>src.mold_name);
         }
     }
 }