From 341feb0af3085a7090713fd9480d3c11c36983ee Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Mon, 1 Aug 2022 11:21:30 +0800
Subject: [PATCH 1/2] =?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        | 12 ++++++------
 .../org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql  |  2 +-
 2 files changed, 7 insertions(+), 7 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 8dfedbdb..a1d20b6e 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
@@ -417,7 +417,7 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
                 JSONObject order = order_rows.getJSONObject(i);
                 product_qty += order.getIntValue("real_qty");
             }
-            device.put("product_qty", product_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);
@@ -432,11 +432,11 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
                 }
             }
 
-            //查询最近的一个工单
-            JSONObject order_jo = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND is_delete = '0' order by realproducestart_date desc").uniqueResult(0);
-            if (ObjectUtil.isNotEmpty(order_jo)) {
-                device.put("product_time", order_jo.getString("produce_date"));
-            }
+//            //查询最近的一个工单
+//            JSONObject order_jo = WQLObject.getWQLObject("mps_bd_produceshiftorder").query("device_id = '" + device_id + "' AND is_delete = '0' order by realproducestart_date desc").uniqueResult(0);
+//            if (ObjectUtil.isNotEmpty(order_jo)) {
+//                device.put("product_time", order_jo.getString("produce_date"));
+//            }
             result.add(device);
         }
         JSONObject returnjo = new JSONObject();
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 82baa515..f6af1a80 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
@@ -150,7 +150,7 @@
                 	LEFT JOIN pdm_bi_device device ON device.device_id = run.device_id
                 WHERE
                 	run.status_type = '05'
-                	AND DATE_SUB( CURDATE(), INTERVAL 30 DAY ) <= date( start_time )
+                	AND DATE_SUB( CURDATE(), INTERVAL 10 DAY ) <= date( start_time )
                 GROUP BY
                 	run.device_id
                 	LIMIT 10

From 3cb3f6bab2e5e873ade97c79ce00a24f7348b55a Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Mon, 1 Aug 2022 11:34:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=B7=E4=BA=AE=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
index 9f78b382..445d5432 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
@@ -79,9 +79,13 @@
            	shiftorder.plan_qty,
            	shiftorder.real_qty,
            	(shiftorder.plan_qty - shiftorder.real_qty) AS gap_qty,
+            material.material_code,
+            material.material_name,
+            material.material_spec,
            	CONVERT ( ( shiftorder.real_qty / shiftorder.plan_qty ), DECIMAL ( 10, 3 ) ) * 100 AS finish_rate
            FROM
            	mps_bd_produceshiftorder shiftorder
+            left join md_me_materialbase material on material.material_id =shiftorder.material_id
            	where
             	 shiftorder.is_delete='0'
                  OPTION 输入.produce_date <> ""
@@ -301,7 +305,7 @@ IF 输入.flag = "12"
                  	material.material_code,
                  	material.material_spec,
                  	material.material_name
-                 ORDER BY real_qty
+                 ORDER BY real_qty desc
                  	LIMIT 0,9
         ENDSELECT
     ENDQUERY