From 8fd878726444afe62aa9258af31f3579b2b75db1 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 18 Feb 2023 18:20:57 +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 --- .../org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql | 2 +- .../st/instor/service/impl/HandMoveStorServiceImpl.java | 3 ++- .../org/nl/wms/st/instor/task/HandMoveStorAcsTask.java | 7 ++++--- .../java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql | 3 +-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql index 04d99776d..c51992595 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/wql/QST_IVT_RAWASSISTISTOR.wql @@ -820,7 +820,7 @@ sa.row_num, sa.placement_type ORDER BY - sa.block_num DESC + sa.block_num ASC ENDSELECT ENDQUERY ENDIF diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 3561f3d1d..f4823bccf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -242,7 +242,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { throw new BadRequestException(row.getString("turnin_struct_code") + "仓位数据异常，找不到对应点位！"); } //判断是否已生成过了任务，无未生成则插入任务 - JSONObject task = wo_Task.query("is_delete = '0' and task_status='01' and point_code1='" + jo.getString("start_point_code") + "'").uniqueResult(0); + JSONObject task = wo_Task.query("is_delete = '0' and task_status='04' and point_code1='" + jo.getString("start_point_code") + "'").uniqueResult(0); if (task != null) { jo.put("task_id", task.getString("task_id")); } else { @@ -254,6 +254,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { task.put("task_id", task_id); task.put("task_code", task_code); task.put("task_type", "010505"); + task.put("acs_task_type", "7"); task.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); task.put("point_code1", jo.getString("start_point_code")); task.put("point_code2", point.getString("point_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java index ef46ae737..0db85a0de 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/task/HandMoveStorAcsTask.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; public class HandMoveStorAcsTask extends AbstractAcsTask { - private final String THIS_CLASS = EmptyVehicleTask.class.getName(); + private final String THIS_CLASS = HandMoveStorAcsTask.class.getName(); @Override public List addTask() { @@ -152,8 +152,9 @@ public class HandMoveStorAcsTask extends AbstractAcsTask { @Override public void cancel(String task_id) { JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("task_id = '"+task_id+"'").uniqueResult(0); - if (!task_jo.getString("task_status").equals(TaskStatusEnum.START_AND_POINT)){ - throw new BadRequestException("只能对未生成状态的任务进行删除！"); + int task_status = task_jo.getIntValue("task_status"); + if (task_status > Integer.valueOf(TaskStatusEnum.START_AND_POINT.getCode())) { + throw new BadRequestException("任务已下发，不能取消！"); } this.updateTaskStatus(task_jo, "0"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql index fb016e709..39296143e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql @@ -281,8 +281,7 @@ 1 = 1 AND mst.bill_status = '10' AND dtl.work_status = '01' - AND dtl.is_issued = '0' - AND task.task_status = '01' + AND task.task_status = '04' AND mst.is_delete = '0' AND task.is_delete = '0' OPTION 输入.moveinv_id <> ""