From 0e68a529c77dc20d0f82bf4d3f1080a05eb85d54 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Tue, 2 Aug 2022 14:11:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceScreenServiceImpl.java          | 10 +++++-----
 .../org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql    |  2 +-
 2 files changed, 6 insertions(+), 6 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 a1d20b6e..ba6bdfe5 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
@@ -412,23 +412,23 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
             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);
+            /*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++) {
                 JSONObject order = order_rows.getJSONObject(i);
                 product_qty += order.getIntValue("real_qty");
-            }
+            }*/
 //            device.put("product_qty", product_qty);
 
             //查询最近的一条开机状态
-            JSONObject start_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '02' order by end_time desc").uniqueResult(0);
+            JSONObject start_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '01' order by end_time desc").uniqueResult(0);
             if (ObjectUtil.isNotEmpty(start_jo)) {
                 device.put("start_time", start_jo.getString("end_time"));
             }
-            if (StrUtil.isEmpty(device.getString("status_type"))) {
+            if (StrUtil.isNotEmpty(device.getString("status_type"))) {
                 //查询最近的一条关机状态
                 JSONObject end_jo = WQLObject.getWQLObject("pdm_bi_devicerunstatusrecord").query("device_id = '" + device_id + "' AND status_type = '01' order by end_time desc").uniqueResult(0);
                 if (ObjectUtil.isNotEmpty(end_jo)) {
-                    device.put("end_time", end_jo.getString("end_time"));
+                    device.put("end_time", end_jo.getString("start_time"));
                 }
             }
 
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
index 9cd4d67b..476ef6b6 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
@@ -243,7 +243,7 @@
                 	device.device_code,
                 	device.device_name,
                 	pro.workprocedure_name,
-                	(case when run.status_type is null then '关机'
+                	(case when run.status_type = '01' then '关机'
                 			 when run.status_type = '02' then '开机'
                 			 when run.status_type = '03' then '生产中'
                 			 when run.status_type = '04' then '待机'