From aa16d2c2d23dfe32352343104b8df4be057dfd71 Mon Sep 17 00:00:00 2001 From: zds <2388969634@qq.com> Date: Fri, 8 Jul 2022 15:41:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java | 3 +-- .../src/main/java/org/nl/wms/st/core/task/OutTask.java | 2 +- .../nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index a5baf91e..29d77510 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -843,9 +843,8 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService { AbstractAcsTask intask = new InTask(); //调用ACS接受任务接口 WQLObject taskTable = WQLObject.getWQLObject("sch_base_task"); - JSONArray taskObjja = taskTable.query("vehicle_code='" + storagevehicle_code + "' ").getResultJSONArray(0); - JSONObject taskObj = taskTable.query("vehicle_code='" + storagevehicle_code + "' and task_status='01' is_delete = '0'").uniqueResult(0); + JSONObject taskObj = taskTable.query("vehicle_code='" + storagevehicle_code + "' and task_status='01' and is_delete ='0'").uniqueResult(0); if (ObjectUtil.isEmpty(taskObj)) { throw new PdaRequestException("托盘为【'" + storagevehicle_code + "'】指令未找到"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/task/OutTask.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/task/OutTask.java index 0a070532..3363b0a8 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/task/OutTask.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/task/OutTask.java @@ -149,7 +149,7 @@ public class OutTask extends AbstractAcsTask { //任务表 WQLObject wo_Task = WQLObject.getWQLObject("SCH_BASE_Task"); - JSONObject task = wo_Task.query("task_status='01' and taskdtl_id='"+taskdtl_id+"'").uniqueResult(0); + JSONObject task = wo_Task.query("is_delete ='0' and task_status='01' and taskdtl_id='"+taskdtl_id+"'").uniqueResult(0); if(task==null){ throw new BadRequestException("只能取消生成状态的任务！"); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java index 927354f6..5189331e 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java @@ -946,7 +946,7 @@ public class HandMoveStorServiceImpl implements HandMoveStorService { map.put("update_optid", currentUserId + ""); map.put("update_optname", nickName); map.put("update_time", now); - wo_Task.update(map, "task_status='01' and taskdtl_id='" + taskdtl_id + "'"); + wo_Task.update(map, "is_delete ='0' and task_status='01' and taskdtl_id='" + taskdtl_id + "'"); } else { throw new BadRequestException("任务下发失败，请稍后重试！"); }