From 75d1a7509da4a134e5a59d423ac9ea762724cf5e Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 28 Nov 2022 10:13:33 +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/modules/quartz/task/QTASK_01.wql | 16 +++++++++++----- .../acs/service/impl/AcsToWmsServiceImpl.java | 1 - .../main/java/org/nl/wms/sch/tasks/InTask.java | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QTASK_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QTASK_01.wql index a45ffd7..a8bc31d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QTASK_01.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/QTASK_01.wql @@ -40,12 +40,18 @@ IF 输入.flag = "1" QUERY - SELECT point_code,point_uuid from sch_base_point WHERE lock_type='01' and point_code not in ( + SELECT point_code,point_uuid from sch_base_point WHERE lock_type='01' and point_code not in ( - SELECT start_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' - union - SELECT next_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' - ) + SELECT start_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' + union + SELECT next_point_code as point_code from sch_base_task task WHERE is_delete='0' and task_status <>'06' + ) + and point_uuid not in ( + SELECT turnin_struct_uuid as point_uuid from st_buss_dumpinv dump WHERE is_delete='0' and bill_status <>'04' + union + SELECT turnout_struct_uuid as point_uuid from st_buss_dumpinv dump WHERE is_delete='0' and bill_status <>'04' + + ) ENDSELECT ENDQUERY ENDIF diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 02a0797..ce68cc7 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -32,7 +32,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { * task_code：任务编码 * task_status：1:执行中,2:完成 ,3:acs取消 * - * @param jsonObject 条件 * @return */ public static void main(String[] args) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index d0f4d6e..d15e21f 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -242,7 +242,7 @@ public class InTask extends AbstractAcsTask { } JSONObject taskjo = WQLObject.getWQLObject("sch_base_task").query("task_uuid='" + task_uuid + "'").uniqueResult(0); taskjo.optString("taskfinish_mode", "02"); - this.updateTaskStatus(taskjo, TaskStatusEnum.FINISHED.getCode()); + this.updateTaskStatus(taskjo, TaskStatusEnum.EXECUTING.getCode()); } @Override