From b7bbb981103d865be75a16b95d188326015b8aa6 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:54:28 +0800
Subject: [PATCH] 1、系统配置表新增钢化/中空间隙配置 2、钢化/中空新增厚度选择，按照厚度自动匹配对应的间隙，完成进入格子的片数的要求
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
index 3d06990..e53a18c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -36,11 +36,10 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 10000)
+// @Scheduled(fixedDelay = 10000)
public void screenHome() {
JSONObject jsonObject = new JSONObject();
Reportingdamage reportingdamage = new Reportingdamage();
- //reportingdamage.setReportingWorkTime("2024-05-11");
// 鑾峰彇褰撳墠鏃ユ湡
LocalDate today = LocalDate.now();
// 璁＄畻鏈�杩戜竷澶╃殑寮�濮嬫棩鏈�
@@ -52,15 +51,16 @@
String startOfPeriodStr = startOfPeriod.format(formatter);
String endOfPeriodStr = endOfPeriod.format(formatter);
// 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime("2024-05-11" + " to " + endOfPeriodStr);
- //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
+// reportingdamage.setReportingWorkTime("2024-05-11");
+ reportingdamage.setReportingWorkTime(startOfPeriodStr);
+ reportingdamage.setReportingWorkTime2(endOfPeriodStr);
//鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
- List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("device", device);
+// List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
+// jsonObject.append("device", device);
//鑾峰彇娆＄牬鏈ˉ淇℃伅
- List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
- jsonObject.append("awaitingRepairs", awaitingRepairs);
+// List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
+// jsonObject.append("awaitingRepairs", awaitingRepairs);
//鑾峰彇姝ｅ湪杩涜鐨勫伐绋�
List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
jsonObject.append("DoingTask", optimizeProjects);
--
Gitblit v1.8.0