From f19562afb2d05564a895942ca8b185f4f4f7471f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Tue, 21 Nov 2023 15:26:53 +0800 Subject: [PATCH] update --- .../java/org/nl/wms/dashboard/service/DashboardService.java | 3 +-- .../src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java index 6e67758..7ef6f77 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/service/DashboardService.java @@ -11,7 +11,6 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -158,7 +157,7 @@ public class DashboardService { // 设备产能利用 -------------------------------------------------------------------------------------------------- JSONObject capacityRate = new JSONObject(); - result.put("capacityRate", capacityRate); + result.put("capacityRate", capacityRate); capacityRate.put("mix", Math.random() * (90 - 50) + 50); capacityRate.put("press", Math.random() * (90 - 50) + 50); capacityRate.put("dry", Math.random() * (90 - 50) + 50); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql index 59036fa..3099fc2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/dashboard/wql/DASHBOARD.wql @@ -81,7 +81,7 @@ IF 输入.flag = "3" QUERY SELECT - dn.device_code, + d.device_name AS "deviceName", COUNT(dn.device_code) AS "count" FROM das_device_number dn LEFT JOIN pdm_bi_device d ON dn.device_code = d.device_code