update

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

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