From f080a9fe7b397b425647e6fcd5e13e17eded3550 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Thu, 20 Mar 2025 15:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E5=85=BB=E5=92=8C?= =?UTF-8?q?=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DOAN.Admin.WebApi/appsettings.Development.json | 4 ++-- DOAN.Model/MES/dev/DeviceTaskExecute.cs | 6 ++++++ DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs | 5 +++++ DOAN.Service/MES/dev/DeviceTaskExecuteService.cs | 2 ++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 5e8a047..17bdeba 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -8,9 +8,9 @@ }, "dbConfigs": [ { - //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=GXAssembly;Port=3308", + "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=GXAssembly;Port=3308", // "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306;AllowLoadLocalInfile=true", - "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306", + //"Conn": "Data Source=139.224.232.211;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306", //"Conn": "Data Source=192.168.50.163;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306", "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4 "ConfigId": "0", //多租户唯一标识 diff --git a/DOAN.Model/MES/dev/DeviceTaskExecute.cs b/DOAN.Model/MES/dev/DeviceTaskExecute.cs index 2a261dc..78a546d 100644 --- a/DOAN.Model/MES/dev/DeviceTaskExecute.cs +++ b/DOAN.Model/MES/dev/DeviceTaskExecute.cs @@ -36,6 +36,12 @@ namespace DOAN.Model.MES.dev /// public int Type { get; set; } + /// + /// 1是检查 2是保养 + /// + [SugarColumn(ColumnName = "inner_type")] + public int? InnerType { get; set; } + /// /// 任务派发时间 /// diff --git a/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs index 11be306..e955d10 100644 --- a/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs +++ b/DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs @@ -23,6 +23,11 @@ namespace DOAN.Model.MES.dev.Dto /// public int Type { get; set; } + /// + /// 1是检查 2是保养 + /// + public int InnerType { get; set; } + /// /// 状态 /// diff --git a/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs index d872135..aa5e8a4 100644 --- a/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs +++ b/DOAN.Service/MES/dev/DeviceTaskExecuteService.cs @@ -183,6 +183,7 @@ namespace DOAN.Service.MES.dev /// /// 任务计划调度 扫描每日巡检任务 + /// 保养和检查 /// /// public int ScanEveryTask() @@ -340,6 +341,7 @@ namespace DOAN.Service.MES.dev taskExecute.TaskName = item.Name; taskExecute.PlanId = item.Id; taskExecute.Type = 1; + taskExecute.InnerType = item.InnerType; taskExecute.DistributedTime = DateTime.Now; taskExecute.Status = 0; taskExecute.CreatedTime = DateTime.Now;