From 1018503567c87bd970f6136cfbe1c2003b85adc5 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Mon, 9 Jan 2023 12:32:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/sch/tasks/OutTask.java    |  6 +-
 .../java/org/nl/wms/sch/tasks/wql/TASK01.wql  | 60 +++++++++++++++++++
 .../service/impl/CheckOutBillServiceImpl.java |  1 -
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/wql/TASK01.wql

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
index a24390f03..b9e432aa3 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java
@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.system.util.CodeUtil;
+import org.nl.modules.wql.WQL;
 import org.nl.modules.wql.core.bean.WQLObject;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
@@ -46,7 +47,10 @@ public class OutTask extends AbstractAcsTask {
         WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task");
         WQLObject dis_tab = WQLObject.getWQLObject("ST_IVT_IOStorInvDis");
 
-        JSONArray arr = WQLObject.getWQLObject("SCH_BASE_Task").query("handle_class = '" + THIS_CLASS + "' and task_status = '" + TaskStatusEnum.START_AND_POINT.getCode() + "' and is_delete ='0'").getResultJSONArray(0);
+        JSONObject map = new JSONObject();
+        map.put("flag", "1");
+        map.put("handle_class", THIS_CLASS);
+        JSONArray arr = WQL.getWO("TASK01").addParamMap(map).process().getResultJSONArray(0);
 
         ArrayList<AcsTaskDto> resultList = new ArrayList<>();
         for (int i = 0; i < arr.size(); i++) {
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/wql/TASK01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/wql/TASK01.wql
new file mode 100644
index 000000000..7813286f2
--- /dev/null
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/wql/TASK01.wql
@@ -0,0 +1,60 @@
+[交易说明]
+	交易名：	出库任务
+	所属模块：
+	功能简述：
+	版权所有：
+	表引用：
+	版本经历：
+
+[数据库]
+	--指定数据库，为空采用默认值，默认为db.properties中列出的第一个库
+
+[IO定义]
+	#################################################
+	##			表字段对应输入参数
+	#################################################
+	输入.flag					                 TYPEAS s_string
+	输入.handle_class					         TYPEAS s_string
+
+[临时表]
+	--这边列出来的临时表就会在运行期动态创建
+
+[临时变量]
+	--所有中间过程变量均可在此处定义
+
+[业务过程]
+
+	##########################################
+	#			1、输入输出检查				 #
+	##########################################
+
+
+	##########################################
+	#			2、主过程前处理				 #
+	##########################################
+
+
+	##########################################
+	#			3、业务主过程			 	 #
+	##########################################
+
+    IF 输入.flag = "1"
+		QUERY
+           SELECT
+                max(task_group_id) AS task_group_id,
+                max(task_type) AS task_type
+           FROM
+                sch_base_task
+           WHERE
+                task_status = '04'
+                AND is_delete = '0'
+
+               OPTION 输入.handle_class <> ""
+                    handle_class = 输入.handle_class
+               ENDOPTION
+
+               group by task_group_id
+
+			ENDSELECT
+		ENDQUERY
+	ENDIF
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 1c9880db9..0cadccf54 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -2499,7 +2499,6 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             jsonRow.put("point_id", jsonPoint2.getString("point_id"));
             this.rowDispose(jsonRow);
         }
-        outTask.immediateNotifyAcs(null);
     }
 
     @Transactional(rollbackFor = Exception.class)