RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend

Browse Source
This commit is contained in:
卢江海 2025-03-20 16:16:34 +08:00
commit f391c99fe2
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DOAN.Admin.WebApi/appsettings.Development.json
View File

@ -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", //多租户唯一标识

6
DOAN.Model/MES/dev/DeviceTaskExecute.cs
View File

@ -36,6 +36,12 @@ namespace DOAN.Model.MES.dev
/// </summary>
public int Type { get; set; }
/// <summary>
/// 1是检查 2是保养
/// </summary>
[SugarColumn(ColumnName = "inner_type")]
public int? InnerType { get; set; }
/// <summary>
/// 任务派发时间
/// </summary>

5
DOAN.Model/MES/dev/Dto/DeviceTaskExecuteDto.cs
View File

@ -23,6 +23,11 @@ namespace DOAN.Model.MES.dev.Dto
/// </summary>
public int Type { get; set; }
/// <summary>
/// 1是检查 2是保养
/// </summary>
public int InnerType { get; set; }
/// <summary>
/// 状态
/// </summary>

2
DOAN.Service/MES/dev/DeviceTaskExecuteService.cs
View File

@ -183,6 +183,7 @@ namespace DOAN.Service.MES.dev
/// <summary>
/// 任务计划调度 扫描每日巡检任务
/// 保养和检查
/// </summary>
/// <returns></returns>
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;