From f804a95f24647b0d129c5d199709b136afbbaf60 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Thu, 16 Apr 2026 14:36:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yudao/module/iot/service/device/DeviceServiceImpl.java | 2 +- .../controller/admin/task/vo/TaskOneClickScheduleRespVO.java | 3 ++- .../iocoder/yudao/module/mes/service/task/TaskServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java index 1aa16fc6c..8e90b0bd6 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/DeviceServiceImpl.java @@ -1279,7 +1279,7 @@ public class DeviceServiceImpl implements DeviceService { standbyCount++; } else if ("3".equals(status)) { faultCount++; - } else { + } else if ("0".equals(status)){ offlineCount++; } } diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java index e8c4f5bb7..1a1401692 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskOneClickScheduleRespVO.java @@ -70,7 +70,8 @@ public class TaskOneClickScheduleRespVO { @Schema(description = "产品名称", example = "汽车内饰件A") private String productName; - + @Schema(description = "计划状态", example = "") + private Integer planStatus; @Schema(description = "计划开始时间(yyyy-MM-dd HH:mm:ss)") private String planStartTimeStr; diff --git a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java index 3392bce58..76c324142 100644 --- a/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java +++ b/yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/service/task/TaskServiceImpl.java @@ -675,7 +675,7 @@ public class TaskServiceImpl implements TaskService { deliveryDate = taskDO.getDeliveryDate().toLocalDate(); } h.setDeliveryDateStr(deliveryDate == null ? null : deliveryDate.format(DATE_FMT)); - + h.setPlanStatus(history.getStatus()); historyItems.add(h); }