From 661a8627ae091af9ed6818829275548cb573308d Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Wed, 9 Apr 2025 12:24:47 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/sch/tasks/CoolCutTask.java | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java index 6c6c7db4f..0c4408f8d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java @@ -409,17 +409,21 @@ public class CoolCutTask extends AbstractAcsTask { String point_code2 = form.getString("point_code2"); String point_code3 = form.getString("point_code3"); String point_code4 = form.getString("point_code4"); - if (isSingleTask(point_code1)) { - throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！"); + JSONObject task1 = isSingleTask(point_code1); + if ( ObjectUtil.isNotEmpty(task1)) { + throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务:"+task1.getString("task_code")); } - if (isSingleTask(point_code2)) { - throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！"); + JSONObject task2 = isSingleTask(point_code2); + if ( ObjectUtil.isNotEmpty(task2)) { + throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务:"+task2.getString("task_code")); } - if (isSingleTask(point_code3)) { - throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！"); + JSONObject task3 = isSingleTask(point_code3); + if ( ObjectUtil.isNotEmpty(task3)) { + throw new BadRequestException("点位：" + point_code3 +"存在未完成的任务:"+task3.getString("task_code")); } - if (isSingleTask(point_code4)) { - throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务！"); + JSONObject task4 = isSingleTask(point_code4); + if ( ObjectUtil.isNotEmpty(task4)) { + throw new BadRequestException("点位：" + point_code4 + "存在未完成的任务:"+task4.getString("task_code")); } JSONObject json = new JSONObject(); json.put("task_id", IdUtil.getSnowflake(1, 1).nextId()); @@ -473,17 +477,23 @@ public class CoolCutTask extends AbstractAcsTask { } //判断该点位是否存在未完成的任务 - public boolean isSingleTask(String point_code) { + public JSONObject isSingleTask(String point_code) { JSONObject task1 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject task2 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code2 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject task3 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code3 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); JSONObject task4 = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code4 = '" + point_code + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(task1) || ObjectUtil.isNotEmpty(task2) || ObjectUtil.isNotEmpty(task3) || ObjectUtil.isNotEmpty(task4)) { - return true; - } else { - return false; + if(ObjectUtil.isNotEmpty(task1)){ + return task1; + }else if(ObjectUtil.isNotEmpty(task2)){ + return task2; + }else if(ObjectUtil.isNotEmpty(task3)){ + return task3; + }else if(ObjectUtil.isNotEmpty(task4)){ + return task4; } + + return null; } }