From e31a077927d47bd05bcfdc3367deafb8c4069c6d Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 26 十二月 2024 23:57:34 +0800
Subject: [PATCH] 1、卧式理片玻璃替换仅替换版图信息 2、指定钢化、指定工程fixbug:膜系字段修改为filmsId 3、移除大理片笼向前端推送钢化历史任务数据 4、中空领取任务界面接口改造:新增开始/暂停/结束任务按钮,流程卡列表、预览任务、删除任务接口 5、领取/强制任务接口改造:新增除膜信息、李赛克文件需要的数据信息

---
 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