Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

触摸屏修改

Browse Source
This commit is contained in:
qianhao.xu
2024-12-21 10:02:13 +08:00
parent 1e026edc8f
commit ddde4eb9d7
8 changed files with 128 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DOAN.Service/MES/Device/DeviceTaskExecuteService.cs
View File

@@ -200,6 +200,7 @@ namespace DOAN.Service.MES.dev
.Where(it => it.LifeCycleStart <= DateTime.Now)
.Where(it => it.LifeCycleEnd >= DateTime.Now)
.ToList();
// 今日时间
DateTime CurrentTime = new DateTime(
DateTime.Now.Year,
@@ -209,12 +210,11 @@ namespace DOAN.Service.MES.dev
0,
0
);
//1. 扫描巡检
List<DeviceRouteInspectionPlan> deviceRouteInspectionPlan_execute_List =
new List<DeviceRouteInspectionPlan>();
#region 1.1 每日类型处理
List<DeviceRouteInspectionPlan> RouteInspectionPlan_day_List = InitDataList
.Where(it => it.ExcuteCycleType == 1)
.ToList();
@@ -225,7 +225,7 @@ namespace DOAN.Service.MES.dev
foreach (var item in RouteInspectionPlan_day_List)
{
//开始日期
DateTime start_cal = (DateTime)item.CreatedTime;
DateTime start_cal =item.LifeCycleStart??DateTime.MinValue;
start_cal = new DateTime(
start_cal.Year,
start_cal.Month,
@@ -236,8 +236,6 @@ namespace DOAN.Service.MES.dev
);
//循环周期
int cycle_period = (int)item.DayNum;
DateTime date = start_cal;
do
{
@@ -252,7 +250,6 @@ namespace DOAN.Service.MES.dev
}
}
#endregion
#region 1.2 每周类型处理
@@ -299,7 +296,6 @@ namespace DOAN.Service.MES.dev
}
}
#endregion
#region 1.3 每月类型处理
List<DeviceRouteInspectionPlan> DeviceRouteInspectionPlan_month_list = InitDataList
@@ -333,8 +329,6 @@ namespace DOAN.Service.MES.dev
}
#endregion
// 插入数据库
List<DeviceTaskExecute> executes = new List<DeviceTaskExecute>();
if (deviceRouteInspectionPlan_execute_List.Count > 0)
@@ -357,7 +351,6 @@ namespace DOAN.Service.MES.dev
result = Context.Insertable(executes).ExecuteCommand();
}
}
return result;
}