From 8bb97124ddb2cce2d2492a8437e81e0be497f09c Mon Sep 17 00:00:00 2001
From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com>
Date: Tue, 15 Apr 2025 18:11:33 +0800
Subject: [PATCH] =?UTF-8?q?opt:B1=E5=91=BC=E5=8F=AB=E6=AF=8D=E5=8D=B7?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=AC=AC=E4=B8=89=E4=B8=AA=E7=82=B9=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E4=BB=BB=E5=8A=A1=EF=BC=8C=E8=A1=8C?=
 =?UTF-8?q?=E6=9E=B6=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=88=A4=E6=96=ADagv=E7=9B=AE=E7=9A=84=E7=82=B9=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=B7=B2=E6=9C=89=E6=AF=8D=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/wms/sch/tasks/OutHotTask.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
index c9a72b8fb..bf1be7f12 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutHotTask.java
@@ -128,6 +128,9 @@ public class OutHotTask extends AbstractAcsTask {
                     jo.put("product_area", cut_jo.getString("product_area"));
                     jo.put("task_type", "010302");
                 } else {
+                    if(ObjectUtil.isNotEmpty(cut_jo.getString("container_name"))){
+                        throw new BadRequestException("点位:"+cut_jo.getString("full_point_code")+"已存在母卷:"+cut_jo.getString("container_name")+"");
+                    }
                     jo.put("point_code1", jsonTask.getString("point_code2"));
                     jo.put("point_code2", cut_jo.getString("full_point_code"));
                     jo.put("point_code3", cut_jo.getString("empty_point_code"));
@@ -243,13 +246,19 @@ public class OutHotTask extends AbstractAcsTask {
 
         String point_code1 = form.getString("point_code1");
         String point_code2 = form.getString("point_code2");
+        String point_code3 = form.getString("point_code3");
         if (cutConveyorTask.isSingleTask(point_code1)) {
             throw new BadRequestException("点位：" + point_code1 + "存在未完成的任务！");
         }
         if (cutConveyorTask.isSingleTask(point_code2)) {
             throw new BadRequestException("点位：" + point_code2 + "存在未完成的任务！");
         }
-
+        //第三个点不空位时，判断是否存在任务
+        if (ObjectUtil.isNotEmpty(point_code3)) {
+            if (cutConveyorTask.isSingleTask(point_code3)) {
+                throw new BadRequestException("点位：" + point_code3 + "存在未完成的任务！");
+            }
+        }
         JSONObject json = new JSONObject();
         json.put("task_id", IdUtil.getSnowflake(1, 1).nextId());
         json.put("task_code", IdUtil.getSnowflake(1, 1).nextId());