From 68f7ceac8778b967b0280dc95bc1483043468a51 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Thu, 11 Aug 2022 08:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceScreenServiceImpl.java | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
index 20158ffb..95ff42b1 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/service/impl/DeviceScreenServiceImpl.java
@@ -40,30 +40,34 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
         //查询暂未生产设备
         int prepare_device = task_rows.size() - run_device;
 
+        if (prepare_device < 0) {
+            prepare_device = 0;
+        }
+
         //空闲设备
         int free_device = total_num - task_rows.size() - err_device;
 
 
         JSONArray result = new JSONArray();
         JSONObject run = new JSONObject();
-        run.put("name","正常运行");
-        run.put("value",run_device);
+        run.put("name", "正常运行");
+        run.put("value", run_device);
         result.add(run);
         JSONObject pre = new JSONObject();
-        pre.put("name","暂未生产");
-        pre.put("value",prepare_device);
+        pre.put("name", "暂未生产");
+        pre.put("value", prepare_device);
         result.add(pre);
         JSONObject free = new JSONObject();
-        free.put("name","空闲设备");
-        free.put("value",free_device);
+        free.put("name", "空闲设备");
+        free.put("value", free_device);
         result.add(free);
         JSONObject err = new JSONObject();
-        err.put("name","故障设备");
-        err.put("value",err_device);
+        err.put("name", "故障设备");
+        err.put("value", err_device);
         result.add(err);
         JSONObject jo = new JSONObject();
-        jo.put("ja",result);
-        jo.put("total_num",total_num);
+        jo.put("ja", result);
+        jo.put("total_num", total_num);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");
@@ -106,7 +110,7 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
     @Override
     public JSONObject deviceErrorNum(JSONObject param) {
         String today = DateUtil.today() + "%";
-        JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "2").addParam("today",today).process().getResultJSONArray(0);
+        JSONArray result = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "2").addParam("today", today).process().getResultJSONArray(0);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");
         returnjo.put("desc", "查询成功！");
@@ -411,9 +415,9 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
         for (int i = 0; i < device_rows.size(); i++) {
             int product_qty = 0;
             JSONObject device = device_rows.getJSONObject(i);
-            device.put("start_time","");
-            device.put("end_time","");
-            device.put("product_time","");
+            device.put("start_time", "");
+            device.put("end_time", "");
+            device.put("product_time", "");
             String device_id = device.getString("device_id");
             /*JSONArray order_rows = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND produce_date like '" + date + "' AND is_delete = '0'").getResultJSONArray(0);
             for (int j = 0; j < order_rows.size(); j++) {