设备管理

ZR.Model/MES/Device/Dto/DeviceAccountDto.cs

@@ -0,0 +1,128 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 设备台账查询对象
+    /// </summary>
+    public class DeviceAccountQueryDto : PagerInfo 
+    {
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public int FkDeviceType { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceSpecification { get; set; }
+        public int? Status { get; set; }
+    }
+    public class DeviceAccount_routeinspect_Dto
+    {
+        /// <summary>
+        /// 设备巡检id
+        /// </summary>
+        public string FkRouteInspectionPlanId { get; set; }
+        /// <summary>
+        /// 设备台账id
+        /// </summary>
+        public int[] FkDeviceAccountIdList { get; set; }
+
+    }
+
+    public class DeviceAccount_pointinspect_Dto
+    {
+        /// <summary>
+        /// 设备点检id
+        /// </summary>
+        public string FkPointInspectionPlanId { get; set; }
+        /// <summary>
+        /// 设备台账id
+        /// </summary>
+        public int[] FkDeviceAccountIdList { get; set; }
+
+    }
+
+
+    /// <summary>
+    /// 适配设备巡检项
+    /// </summary>
+    public class DeviceAccountQueryDto2 : PagerInfo
+    {
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public int FkDeviceType { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceSpecification { get; set; }
+
+        /// <summary>
+        /// 巡检id
+        /// </summary>
+        public  string fkRouteInspectionPlanId { get; set; }
+
+        /// <summary>
+        /// 是否绑定标志位：1 绑定  0 未绑定
+        /// </summary>
+        public int Flag { get; set; }
+    }
+    /// <summary>
+    /// 适配设备点检项
+    /// </summary>
+    public class DeviceAccountQueryDto3 : PagerInfo
+    {
+        /// <summary>
+        /// 设备类型
+        /// </summary>
+        public int FkDeviceType { get; set; }
+        public string DeviceName { get; set; }
+        public string DeviceSpecification { get; set; }
+
+        /// <summary>
+        /// 点检id
+        /// </summary>
+        public string fkPointInspectionPlanId { get; set; }
+
+        /// <summary>
+        /// 是否绑定标志位：1 绑定  0 未绑定
+        /// </summary>
+        public int Flag { get; set; }
+    }
+
+    /// <summary>
+    /// 设备台账输入输出对象
+    /// </summary>
+    public class DeviceAccountDto
+    {
+        public int Id { get; set; }
+        public int FkDeviceType { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public string DeviceCode { get; set; }
+
+        public string Workshop { get; set; }
+
+        public string Workline { get; set; }
+
+        public int? Status { get; set; }
+
+        public string DeviceImage { get; set; }
+
+        public string DeviceFile { get; set; }
+
+        public string DeviceSpecification { get; set; }
+
+        public string ResponsiblePerson { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceDefaultDto.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    public class DeviceDefaultDto
+    {
+        /// <summary>
+        /// 设备类型id
+        /// </summary>
+        public  int? DevicetTypeId { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// 设备代码
+        /// </summary>
+        public  string DeviceCode { get; set; }
+
+        /// <summary>
+        /// 搜索时间
+        /// </summary>
+        public DateTime[]  searchTime { get; set; }
+
+        /// <summary>
+        /// 1-发布时间与开始时间 2-开始时间与结束时间
+        /// </summary>
+        public int searchType { get; set; }
+
+
+    }
+
+    /// <summary>
+    /// 人员响应
+    /// </summary>
+    public class PersonnelResponseDto
+    {
+        public  string TaskName { get; set; }
+        public string Id { get; set; }
+        /// <summary>
+        /// 接受响应时间戳
+        /// </summary>
+        public TimeSpan  Accept_response {  get; set; }
+        /// <summary>
+        /// 处理响应时间戳
+        /// </summary>
+        public TimeSpan  Action_response {  get; set; }
+
+    }
+   
+
+
+}

ZR.Model/MES/Device/Dto/DeviceFormConfigDto.cs

@@ -0,0 +1,43 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+
+{
+    /// <summary>
+    /// 设备检查项表单配置表查询对象
+    /// </summary>
+    public class DeviceFormConfigQueryDto : PagerInfo 
+    {
+        public int FkDeviceInspectId { get; set; }
+    }
+
+    /// <summary>
+    /// 设备检查项表单配置表输入输出对象
+    /// </summary>
+    public class DeviceFormConfigDto
+    {
+       //[Required(ErrorMessage = "id 雪花不能为空")]
+        public string Id { get; set; }
+
+        public int FkDeviceInspectId { get; set; }
+
+        public int? Type { get; set; }
+
+        public string Content { get; set; }
+
+  
+        public string Title { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceInspectDto.cs

@@ -0,0 +1,75 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+
+{
+    /// <summary>
+    /// 设备检查项查询对象
+    /// </summary>
+    public class DeviceInspectQueryDto : PagerInfo 
+    {
+
+        public string Name { get; set; }
+
+        public int Status { get; set; }
+
+        public  int Type { get; set; }
+    }
+    public class DeviceInspectQueryDto2 : PagerInfo
+    {
+        /// <summary>
+        /// 设备台账ID
+        /// </summary>
+        public int FkAccountId { get; set; }
+        /// <summary>
+        /// 检查项名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 绑定/未绑定
+        /// </summary>
+        public int Isbind { get; set; }
+
+        public int Type { get; set; }
+
+    }
+    public class DeviceInspectQueryDto3
+    { 
+        public int account_id { get; set; }
+        public List<int> inspect_ids { get; set; }
+    }
+
+
+    /// <summary>
+    /// 设备检查项输入输出对象
+    /// </summary>
+    public class DeviceInspectDto
+    {
+       // [Required(ErrorMessage = "id不能为空")]
+        public int Id { get; set; }
+        public string Image { get; set; }
+
+        public int? Type { get; set; }
+
+        public string Remark { get; set; }
+
+        public int Status { get; set; }
+
+        public string Descride { get; set; }
+
+        public string Name { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceMaintenanceRecordDto.cs

@@ -0,0 +1,42 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 维修记录查询对象
+    /// </summary>
+    public class DeviceMaintenanceRecordQueryDto : PagerInfo 
+    {
+    }
+
+    /// <summary>
+    /// 维修记录输入输出对象
+    /// </summary>
+    public class DeviceMaintenanceRecordDto
+    {
+      //  [Required(ErrorMessage = "id不能为空")]
+        public string Id { get; set; }
+
+        public string FkRepairId { get; set; }
+
+        public string MaintanancePerson { get; set; }
+
+        public string Phone { get; set; }
+
+        public int? Result { get; set; }
+
+        public DateTime? MaintenanceTime { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DevicePointInspectionPlanDto.cs

@@ -0,0 +1,47 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 点检任务查询对象
+    /// </summary>
+    public class DevicePointInspectionPlanQueryDto : PagerInfo 
+    {
+        public string Name { get; set; }
+        public int? Status { get; set; }
+        public DateTime? Starttime { get; set; }
+        public DateTime? Endtime  { get; set; }
+        public int? InnerType { get; set; }
+    }
+
+    /// <summary>
+    /// 点检任务输入输出对象
+    /// </summary>
+    public class DevicePointInspectionPlanDto
+    {
+      //  [Required(ErrorMessage = "id不能为空")]
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string FkPersonId { get; set; }
+
+        public int? Status { get; set; }
+
+        public int? InnerType { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceRepairDto.cs

@@ -0,0 +1,79 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 报修单查询对象
+    /// </summary>
+    public class DeviceRepairQueryDto : PagerInfo 
+    {
+        public string RepairOrder { get; set; }
+        public int FkDeviceId { get; set; }
+        public string RepairPeron { get; set; }
+        public string Phone { get; set; }
+        public string Type { get; set; }
+        public int? Status { get; set; }
+
+        /// <summary>
+        /// 时间范围
+        /// </summary>
+        public DateTime[] TimeRange { get; set; }
+    }
+
+    public class DeviceRepair_chart
+    {
+        public string Id { get; set; }
+        public string Type { get; set; }
+        public string TypeName { get; set; }
+        public DateTime CreatedTime { get; set; }
+        /// <summary>
+        /// 累加值
+        /// </summary>
+        public int AccValue_SameType  { get; set; }
+
+        public int Status {  get; set; }
+
+
+    }
+
+    /// <summary>
+    /// 报修单输入输出对象
+    /// </summary>
+    public class DeviceRepairDto
+    {
+      //  [Required(ErrorMessage = "雪花id不能为空")]
+        public string Id { get; set; }
+
+        public string RepairOrder { get; set; }
+
+        public string FkDeviceId { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public string DeviceCode { get; set; }
+
+        public string Type { get; set; }
+
+        public string RepairPeron { get; set; }
+
+        public string Phone { get; set; }
+
+        public string FaultDescription { get; set; }
+
+        public string File { get; set; }
+
+        public int? Status { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceRouteInspectionPlanDto.cs

@@ -0,0 +1,62 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 巡检计划查询对象
+    /// </summary>
+    public class DeviceRouteInspectionPlanQueryDto : PagerInfo 
+    {
+        public string Name { get; set; }
+        public DateTime? LifeCycleStart { get; set; }
+
+        public DateTime? LifeCycleEnd { get; set; }
+        public int? ExcuteCycleType { get; set; }
+        public int? InnerType { get; set; }
+    }
+
+    /// <summary>
+    /// 巡检计划输入输出对象
+    /// </summary>
+    public class DeviceRouteInspectionPlanDto
+    {
+      //  [Required(ErrorMessage = "id不能为空")]
+        public string Id { get; set; }
+
+        public string Name { get; set; }
+
+        public string FkPersonId { get; set; }
+
+        public int? Status { get; set; }
+
+
+        public int? InnerType { get; set; }
+
+        public DateTime? LifeCycleStart { get; set; }
+
+        public DateTime? LifeCycleEnd { get; set; }
+
+        public int? ExcuteCycleType { get; set; }
+
+        public int? DayNum { get; set; }
+
+        public string WeekList { get; set; }
+
+        public string MonthDayList { get; set; }
+
+     
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceStatusAnalysisDto.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 设备状态分析
+    /// </summary>
+    public class DeviceStatusAnalysisDto
+    {
+        /// <summary>
+        /// 设备总数：存在设备
+        /// </summary>
+        public int AllTotal { get; set; }
+
+        /// <summary>
+        ///  正常设备总数
+        /// </summary>
+        public int NormalTotal { get; set; }
+
+       /// <summary>
+       /// 未点/巡总数
+       /// </summary>
+       public int UnmaintainedTotal { get; set; }
+
+        /// <summary>
+        /// 报修中总数
+        /// </summary>
+        public int DamageTotal { get; set; }
+
+       /// <summary>
+       /// 停用总数
+       /// </summary>
+       public int  NoUseTotal { get; set; }
+
+
+       /// <summary>
+       /// 设备详情
+       /// </summary>
+       public  List<LineDetail> LineDetailList { get; set; }
+
+    }
+    /// <summary>
+    /// 设备详情
+    /// </summary>
+    public class LineDetail
+    { 
+        /// <summary>
+        /// 车间
+        /// </summary>
+        public string Workshop {  get; set; }
+
+        /// <summary>
+        /// 产线
+        /// </summary>
+        public string Workline { get; set; }
+
+        /// <summary>
+        /// 总计
+        /// </summary>
+        public int Total { get; set; }
+
+        /// <summary>
+        /// 设备信息
+        /// </summary>
+        public  List<DeviceInfo> Children { get; set; }
+    }
+    /// <summary>
+    /// 设备信息
+    /// </summary>
+    public class DeviceInfo
+    {
+        /// <summary>
+        /// 设备id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 设备名称
+        /// </summary>
+        public string DeviceName { get; set; }
+
+        /// <summary>
+        /// 设备code
+        /// </summary>
+        public string DeviceCode    { get; set; }
+
+
+        /// <summary>
+        /// 设备状态 ：1（正常）2（未维护） 3（报修中）4（停用中）
+        /// </summary>
+        public int DeviceStatus { get; set; }
+
+    }
+
+
+
+}

ZR.Model/MES/Device/Dto/DeviceStatusAnalysisResultDto.cs

@@ -0,0 +1,218 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    public class DeviceStatusAnalysisResultDto
+    {
+
+        /// <summary>
+        /// 横坐标数据
+        /// </summary>
+        public string name { get; set; }
+        /// <summary>
+        /// 值
+        /// </summary>
+        public int value { get; set; }
+    }
+    /// <summary>
+    /// 设备故障饼图返回结果
+    /// </summary>
+    public class DeviceFaultBarResultDto
+    {
+        public string[] XData { get; set; }
+
+        public List<SeriesData_Item> SeriesData { get; set; }
+
+
+    }
+    /// <summary>
+    /// 设备折线饼图返回结果
+    /// </summary>
+    public class DeviceFaultLineResultDto
+    {
+        public string[] XData { get; set; }
+
+        public List<SeriesData_Item_line> SeriesData { get; set; }
+
+
+    }
+    /// <summary>
+    /// 设备维修柱状图返回结果
+    /// </summary>
+    public class DeviceRepairBarResultDto
+    {
+        public string[] XData { get; set; }
+
+        public List<SeriesData_Item_line2> SeriesData { get; set; }
+
+
+    }
+
+    /// <summary>
+    /// 点、巡检 任务 结果
+    /// </summary>
+    public class TaskLineResultDto
+    {
+        public string[] XData { get; set; }
+
+        public List<SeriesData_Item_line3> SeriesData { get; set; }
+
+        public string msg { get; set; }
+    }
+
+    /// <summary>
+    /// 人员响应请求
+    /// </summary>
+    public class PersonnelResponseResultDto
+    {
+        /// <summary>
+        /// 总数
+        /// </summary>
+        public int TaskTotal { get; set; }
+        /// <summary>
+        /// 与上周对比 总数
+        /// </summary>
+        public double lastTotalPer {  get; set; }
+        /// <summary>
+        /// 最大
+        /// </summary>
+        public TimeSpan TaskMax { get; set; }
+        /// <summary>
+        /// 与上周对比 最大
+        /// </summary>
+        public double lastMaxPer { get; set; }
+
+        /// <summary>
+        /// 最小
+        /// </summary>
+        public TimeSpan TaskMin { get; set; }
+
+        /// <summary>
+        /// 与上周对比  最小
+        /// </summary>
+        public double lastMinPer { get; set; }
+  
+        /// <summary>
+        /// 任务平均
+        /// </summary>
+        public TimeSpan TaskAvg { get; set; }
+
+        /// <summary>
+        /// 与上周对比 任务平均
+        /// </summary>
+        public double lastAvgPer { get; set; }
+
+
+        public string[] XData { get; set; }
+
+        public PersonnelResponse_Series SeriesData { get; set; }
+    }
+
+    public class FullScreenTotal
+    { 
+        /// <summary>
+        /// 设备可用数量
+        /// </summary>
+        public int UseDeviceTotal { get; set; }
+        /// <summary>
+        /// 设备停机中
+        /// </summary>
+        public int UnUseDeviceTotal { get; set; }
+
+        /// <summary>
+        /// 累计任务数
+        /// </summary>
+        public int TaskTotal { get; set; }
+
+        /// <summary>
+        /// 累计任务完成数
+        /// </summary>
+        public int FinishTaskTotal { get; set; }
+
+        /// <summary>
+        /// 累计报修数
+        /// </summary>
+        public  int RepairTotal { get; set; }
+
+        /// <summary>
+        /// 累计维护数
+        /// </summary>
+        public int FinishRepairTotal { get; set; }
+    }
+
+    public class PersonnelResponse_Series
+    {
+        public string Name { get; set; }
+        public string Type { get; set; } = "line";
+        public bool showBackground { get; set; } = true;
+        public MarkPoint_ markPoint { get; set; }
+        public MarkPoint_ markLine { get; set; }
+        public double[] Data { get; set; }
+    }
+
+    public  class MarkPoint_
+    {
+        public TypeName[] data { get; set; } 
+
+    }
+    public class TypeName
+    { 
+        public string Type { get; set; }
+        public string Name { get; set; }
+    }
+
+    public class SeriesData_Item { 
+        public string Name { get; set; }
+        public string Stack { get; set ; } = "Total";
+        public string Type { get; set; } = "bar";
+        public Semphasis_ Semphasis { get; set; } = new Semphasis_();
+        public int[] Data { get; set; }
+
+    }
+    public class SeriesData_Item_line2
+    {
+        public string Name { get; set; }
+
+        public string Type { get; set; } = "bar";
+        public bool ShowBackground { get; set; } = true;
+        public int[] Data { get; set; }
+
+    }
+    public class SeriesData_Item_line3
+    {
+        public string Name { get; set; } = "点检数/巡检数";
+
+        public string Type { get; set; } = "line";
+        public bool showBackground { get; set; } = true;
+        public int[] Data { get; set; }
+
+    }
+    public class SeriesData_Item_line
+    {
+        public string Name { get; set; }
+        public string Type { get; set; } = "line";
+        public int[] Data { get; set; }
+        public bool Smooth { get; set; } = true;
+
+        public AreaStyle_ areaStyle { get; set; } = new AreaStyle_();
+        public Label_line  Label { get; set; }= new Label_line();
+
+    }
+    public class Semphasis_ {
+        public string Focus { get; set; } = "series";
+
+
+    }
+
+    public class Label_line {
+        public bool Show { get; set; } = true;
+        public string Position { get; set; } = "top";
+
+    }
+
+    public  class AreaStyle_ { }
+}

ZR.Model/MES/Device/Dto/DeviceTaskExecuteDto.cs

@@ -0,0 +1,163 @@
+using System.ComponentModel.DataAnnotations;
+using MiniExcelLibs.Attributes;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 任务执行查询对象
+    /// </summary>
+    public class DeviceTaskExecuteQueryDto : PagerInfo
+    {
+        /// <summary>
+        /// 任务名称
+        /// </summary>
+        public string TaskName { get; set; }
+
+        /// <summary>
+        /// 时间范围
+        /// </summary>
+        public DateTime[] TimeRange { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public int Status { get; set; }
+    }
+
+    public class DeviceTaskExecuteQueryDto2
+    {
+        public string Id { get; set; }
+        public int Status { get; set; }
+        public string UpdatedBy { get; set; }
+
+        public DateTime UpdatedTime { get; set; }
+    }
+
+    /// <summary>
+    /// 查询表单结果
+    /// </summary>
+    public class DeviceTaskExecuteResult1QueryDto_TaskExecute
+    {
+        /// <summary>
+        ///  任务id
+        /// </summary>
+        public string FkTaskId { get; set; }
+
+        /// <summary>
+        /// 类型 （巡检、点检）
+        /// </summary>
+        public int? PlanType { get; set; }
+
+        /// <summary>
+        ///  巡检计划或者点检计划id
+        /// </summary>
+        public string FkPlanId { get; set; }
+
+        /// <summary>
+        /// 设备id
+        /// </summary>
+        public int? FkDeviceId { get; set; }
+
+        /// <summary>
+        /// 检查项id
+        /// </summary>
+        public int FkInspectId { get; set; }
+    }
+
+    /// <summary>
+    /// 生成表单结果
+    /// </summary>
+    public class DeviceTaskExecuteResult1_result
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 表单标题
+        /// </summary>
+        public string Title { get; set; }
+
+        public int? Type { get; set; }
+
+        public string Value { get; set; }
+
+        public string[] Children { get; set; }
+    }
+
+    /// <summary>
+    /// 任务执行输入输出对象
+    /// </summary>
+    public class DeviceTaskExecuteDto
+    {
+        [Required(ErrorMessage = "主键不能为空")]
+        [ExcelColumn(Name = "主键")]
+        [ExcelColumnName("主键")]
+        public string Id { get; set; }
+
+        [ExcelColumn(Name = "任务名称")]
+        [ExcelColumnName("任务名称")]
+        public string TaskName { get; set; }
+
+        [ExcelColumn(Name = "任务id")]
+        [ExcelColumnName("任务id")]
+        public string PlanId { get; set; }
+
+        [Required(ErrorMessage = "任务类型（1是巡检，2是点检）不能为空")]
+        [ExcelColumn(Name = "任务类型（1是巡检，2是点检）")]
+        [ExcelColumnName("任务类型（1是巡检，2是点检）")]
+        public int Type { get; set; }
+
+        [ExcelColumn(Name = "任务派发时间", Format = "yyyy-MM-dd HH:mm:ss")]
+        [ExcelColumnName("任务派发时间")]
+        public DateTime? DistributedTime { get; set; }
+
+        [ExcelColumn(Name = "任务执行——开始时间", Format = "yyyy-MM-dd HH:mm:ss")]
+        [ExcelColumnName("任务执行——开始时间")]
+        public DateTime? StartTime { get; set; }
+
+        [ExcelColumn(Name = "任务执行——结束时间", Format = "yyyy-MM-dd HH:mm:ss")]
+        [ExcelColumnName("任务执行——结束时间")]
+        public DateTime? EndTime { get; set; }
+
+        //耗时
+        public double ConsumeTime { get; set; }
+
+        [ExcelColumn(Name = "状态")]
+        [ExcelColumnName("状态")]
+        public int? Status { get; set; }
+
+        [ExcelColumn(Name = "执行人")]
+        [ExcelColumnName("执行人")]
+        public string Person { get; set; }
+
+        [ExcelColumn(Name = "备注")]
+        [ExcelColumnName("备注")]
+        public string Remark { get; set; }
+
+        [ExcelColumn(Name = "创建人")]
+        [ExcelColumnName("创建人")]
+        public string CreatedBy { get; set; }
+
+        [ExcelColumn(Name = "创建时间", Format = "yyyy-MM-dd HH:mm:ss")]
+        [ExcelColumnName("创建时间")]
+        public DateTime? CreatedTime { get; set; }
+
+        [ExcelColumn(Name = "更新人")]
+        [ExcelColumnName("更新人")]
+        public string UpdatedBy { get; set; }
+
+        [ExcelColumn(Name = "更新时间", Format = "yyyy-MM-dd HH:mm:ss")]
+        [ExcelColumnName("更新时间")]
+        public DateTime? UpdatedTime { get; set; }
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceTaskExecuteResultDto.cs

@@ -0,0 +1,99 @@
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 巡检/点检任务结果表查询对象
+    /// </summary>
+    //public class DeviceTaskExecuteResultQueryDto : PagerInfo
+    //{
+    //    public int? TaskType { get; set; }
+    //    public string RouteInspectionPlanName { get; set; }
+
+    //    public string DeviceName { get; set; }
+
+    //    public string InspectName { get; set; }
+    //}
+
+    public class DeviceTaskExecuteResultQueryDto : PagerInfo
+    {
+        public int? PlanType { get; set; }
+        public string PlanName { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public DateTime Starttime { get; set; }
+        public DateTime Endtime { get; set; }
+    }
+
+
+
+    /// <summary>
+    /// 巡检/点检任务结果表输入输出对象
+    /// </summary>
+    public class DeviceTaskExecuteResultDto
+    {
+
+        //public string  taskExecute_id { get; set; }
+       
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 任务id 
+        /// </summary>
+        public string FkTaskId { get; set; }
+
+        public int? PlanType { get; set; }
+
+     
+        public string FkPlanId { get; set; }
+
+        public string PlanName { get; set; }
+
+
+
+        /// <summary>
+        /// 类型(内部)  1是检查 2是保养
+        /// </summary>
+
+        public int? InnerType { get; set; }
+
+        /// <summary>
+        /// 执行周期类型（1 按天，2按周 3按月） 
+        /// </summary>
+
+        public int? ExcuteCycleType { get; set; }
+
+        public int? FkDeviceId { get; set; }
+
+        public string DeviceName { get; set; }
+
+        public int? FkInspectId { get; set; }
+
+        public string InspectName { get; set; }
+
+        public string FkFormId { get; set; }
+
+        public int? FormType { get; set; }
+
+        public string FormTitle { get; set; }
+
+        public string FormName { get; set; }
+
+        public string Person { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}

ZR.Model/MES/Device/Dto/DeviceTypeDto.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ZR.Model;
+
+namespace ZR.Model.MES.dev.Dto
+{
+    /// <summary>
+    /// 1.设备类型查询对象
+    /// </summary>
+    public class DeviceTypeQueryDto : PagerInfo
+    {
+        public string Name { get; set; }
+        public int? Status { get; set; }
+    }
+
+    /// <summary>
+    /// 1.设备类型输入输出对象
+    /// </summary>
+    public class DeviceTypeDto
+    {
+      
+        public int Id { get; set; }
+
+        [Required(ErrorMessage = "父id不能为空")]
+        public int ParentId { get; set; }
+
+        public string Name { get; set; }
+
+        public int? Status { get; set; }
+
+        public string Remark { get; set; }
+
+        public string CreatedBy { get; set; }
+
+        public DateTime? CreatedTime { get; set; }
+
+        public string UpdatedBy { get; set; }
+
+        public DateTime? UpdatedTime { get; set; }
+
+
+
+    }
+}
+