From 8cc8dde8005b89519181f6e3bc8e28afa472b365 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 23 Mar 2023 19:49:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=BE=E5=A4=87=E6=9F=A5=E8=AF=A2sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql  | 47 ++++++++-----------
 .../nl/wms/sch/tasks/TaskScheduleService.java |  1 +
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
index 132caa09..9e48a411 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pdm/wql/QUERY_DEVICE.wql
@@ -42,31 +42,24 @@
 	##########################################
 
 	IF 输入.flag = "1"
-    		PAGEQUERY
-    			SELECT
-                	*
-                FROM
-                	PDM_BI_Device device
-                WHERE
-                    1 = 1
-                    OPTION 输入.search <> ""
-                        (device.device_code like "%" 输入.search "%" or
-                        device.device_name like "%" 输入.search "%")
-                    ENDOPTION
-                    OPTION 输入.workprocedure_id <> ""
-                        (device.workprocedure_id = 输入.workprocedure_id)
-                    ENDOPTION
-                    OPTION 输入.product_area <> ""
-                        device.product_area = 输入.product_area
-                    ENDOPTION
-    			ENDSELECT
-    		ENDPAGEQUERY
-    	ENDIF
+        PAGEQUERY
+            SELECT
+                *
+            FROM
+                PDM_BI_Device device
+            WHERE
+                1 = 1
+                OPTION 输入.search <> ""
+                    (device.device_code like "%" 输入.search "%" or
+                    device.device_name like "%" 输入.search "%")
+                ENDOPTION
+                OPTION 输入.workprocedure_id <> ""
+                    (device.workprocedure_id = 输入.workprocedure_id)
+                ENDOPTION
+                OPTION 输入.product_area <> ""
+                    device.product_area = 输入.product_area
+                ENDOPTION
+            ENDSELECT
+        ENDPAGEQUERY
+    ENDIF
 
-    	IF 输入.flag = "2"
-            PAGEQUERY
-                UPDATE pdm_bi_device
-                SET deviceoutstor_qty = deviceoutstor_qty
-                ENDSELECT
-            ENDPAGEQUERY
-        ENDIF
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/TaskScheduleService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/TaskScheduleService.java
index 34bb845a..4015bef4 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/TaskScheduleService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/TaskScheduleService.java
@@ -46,6 +46,7 @@ public class TaskScheduleService {
                 WQLObject taskTable = WQLObject.getWQLObject("sch_base_task");
                 JSONArray all = taskTable.query("task_type < '" + StatusEnum.TASK_PUBLISH + "'").getResultJSONArray(0);
                 //分区域：不同区域调用不同acs接口
+                log.info("TaskScheduleService#taskPublish all_task:{}",all.size());
                 Map<String, List<Object>> areaCollent = all.stream().collect(Collectors.groupingBy(o -> ((JSONObject) o).getString("product_area")));
                 for (String area : areaCollent.keySet()) {
                     List<Object> array = areaCollent.get(area);