From 54825ab491ef4275630f507a51f3f2b50232160b Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Thu, 18 Aug 2022 10:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BA=A7=E8=83=BD=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DeviceScreenServiceImpl.java | 10 ++++---
 .../wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql  | 28 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 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 b5bde262..aa3a5434 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
@@ -407,10 +407,12 @@ public class DeviceScreenServiceImpl implements DeviceScreenService {
         for (int i = 0; i < workprocedureArr.size(); i++) {
             JSONObject workprocedurejo = workprocedureArr.getJSONObject(i);
             String workprocedure_id = workprocedurejo.getString("workprocedure_id");
-            String workprocedure_name= workprocedurejo.getString("workprocedure_name");
-;            //查询每个工序下每个设备的产能
-            int Maxproductivity = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "12").addParam("workprocedure_id", workprocedure_id)
-                    .process().uniqueResult(0).getIntValue("productivity");
+            String workprocedure_name = workprocedurejo.getString("workprocedure_name");
+             //查询每个工序下每个设备(有工单)的产能
+            /*int Maxproductivity = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "12").addParam("workprocedure_id", workprocedure_id).addParam("produce_date", today)
+                    .process().uniqueResult(0).getIntValue("productivity");*/
+            int Maxproductivity = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "14").addParam("workprocedure_id", workprocedure_id).addParam("produce_date", today)
+                    .process().uniqueResult(0).getIntValue("all_productivity");
             //计算该工序下工单的实际生产数量
             int nowproductivity = WQL.getWO("QDEVICE_SCREEN").addParam("flag", "13").addParam("workprocedure_id", workprocedure_id).addParam("produce_date", today)
                     .process().uniqueResult(0).getIntValue("real_qty");
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 b336ee9f..1d76f614 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
@@ -310,4 +310,32 @@
         ENDIF
 
 
+        IF 输入.flag = "14"
+            QUERY
+             SELECT
+             	sum( a.max_productivity ) AS all_productivity
+             FROM
+             	(
+             	SELECT
+             		device.productivity,
+             		device.productivity * TIMESTAMPDIFF( HOUR, realproducestart_date, now( ) ) AS max_productivity,
+             		shiftorder.produceorder_code,
+             		shiftorder.realproducestart_date
+             	FROM
+             		pdm_bi_device device
+             		RIGHT JOIN MPS_BD_ProduceShiftOrder shiftorder ON shiftorder.device_id = device.device_id
+             	WHERE
+             		device.is_delete = '0'
+             		AND device.is_active = '1'
+             	AND ( shiftorder.realproducestart_date <> '' OR shiftorder.realproducestart_date IS NOT NULL )
+             	  OPTION 输入.workprocedure_id <> ""
+                         shiftorder.workprocedure_id = 输入.workprocedure_id
+                  ENDOPTION
+                  OPTION 输入.produce_date <> ""
+                       shiftorder.produce_date = 输入.produce_date
+                  ENDOPTION
+             	) a
 
+                ENDSELECT
+            ENDQUERY
+        ENDIF