From e237f855c1ebcd3f0713bdc21a9578e0f12be569 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期四, 12 十二月 2024 09:01:22 +0800 Subject: [PATCH] 1、最新代码包括义乌配置提交 --- hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 fc33a18..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 @@ -55,12 +55,12 @@ 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); //鑾峰彇姝e湪杩涜鐨勫伐绋� List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask(); jsonObject.append("DoingTask", optimizeProjects); -- Gitblit v1.8.0