From af698f6663a254c0a055ceb8c41139ca403238d4 Mon Sep 17 00:00:00 2001
From: baoge <751575283@qq.com>
Date: Tue, 11 Apr 2023 16:33:03 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BD=93?=
 =?UTF-8?q?=E6=9C=BA=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E8=8E=B7=E5=8F=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProduceshiftorderServiceImpl.java    | 23 ++++++++++++-------
 .../java/org/nl/wms/mps/wql/ONEPART_QUERY.wql | 22 +++++++++++++++++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
index b753ace4..b016c530 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/service/impl/ProduceshiftorderServiceImpl.java
@@ -43,6 +43,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @author qinx
@@ -217,29 +218,35 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService{
       */
      @Override
      public List<DeviceDto> getDeviceList(String param) {
-          List<DeviceDto> list = WQL.getWO("ONEPART_QUERY").addParam("flag", "1").addParam("condition", param).process().getResultJSONArray(0).toJavaList(DeviceDto.class);
-          list.forEach(r -> {
-               //状态为为关机
+          List<DeviceDto> deviceList = WQL.getWO("ONEPART_QUERY").addParam("flag", "1").addParam("condition", param).process().getResultJSONArray(0).toJavaList(DeviceDto.class);
+          List<DeviceDto> jobCountList = WQL.getWO("ONEPART_QUERY").addParam("flag", "3").process().getResultJSONArray(0).toJavaList(DeviceDto.class);
+          Optional<List<DeviceDto>> jobCountLists = Optional.of(jobCountList);
+          deviceList.forEach(r -> {
+               //获取当前工单数
+               Optional<DeviceDto> jobCount = jobCountList.stream().filter(j -> j.getDeviceCode().equals(r.getDeviceCode())).findFirst();
+               if(jobCount.isPresent()) {
+                    r.setJob_count(jobCount.get().getJob_count());
+               }
+               else{
+                    r.setJob_count("0");
+               }
+               //有对应状态
                if(StrUtil.isNotEmpty(r.getDevice_status())) {
                     //不是关机与故障状态则为运行
                     if(!Objects.equals(r.getDevice_status(), StatusEnum.DEVICE_STATUS_OFF.getCode()) && !Objects.equals(r.getDevice_status(), StatusEnum.DEVICE_STATUS_ERROR.getCode())) {
                          r.setIs_run("1");
-                         //todo 当前工单数
-                         r.setJob_count("1");
                     }
                     else{
                          r.setIs_run("0");
-                         r.setJob_count("0");
                     }
                }
                else{
                     r.setDevice_status(StatusEnum.DEVICE_STATUS_OFF.getCode());
                     r.setDevice_status_name("关机");
                     r.setIs_run("0");
-                    r.setJob_count("0");
                }
           });
-          return list;
+          return deviceList;
      }
 
      /**
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql
index d53b9c55..fa393ee7 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/mps/wql/ONEPART_QUERY.wql
@@ -69,6 +69,7 @@
                  		) r ON d.device_code = r.device_code
                  		LEFT JOIN sys_dict s ON s.`value` = r.status_type
                  		AND s.`code` = 'PDM_BI_DEVICERUNSTATUS'
+                    WHERE d.is_delete = 0
                  	ORDER BY
                  		device_code
                  		LIMIT 10
@@ -124,4 +125,23 @@
                             ENDOPTION
         			 ENDSELECT
             ENDPAGEQUERY
-    ENDIF
\ No newline at end of file
+    ENDIF
+
+     IF 输入.flag = "3"
+            	 QUERY
+                	 	SELECT
+                        	current_device_code deviceCode,
+                        	count( current_device_code ) job_count
+                        FROM
+                        	pdm_produce_workorder
+                        WHERE
+                        	is_delete = 0
+                        	AND current_device_code != ''
+                        GROUP BY
+                        	current_device_code
+                       ENDSELECT
+            	 ENDQUERY
+        ENDIF
+
+
+