From 9c798602ef0b97290811a500b302c6efd2e3c8ca Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 16 Jul 2024 16:24:43 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E5=A4=8D=E7=A7=B0=E7=9A=84=E5=AD=90?=
 =?UTF-8?q?=E5=8D=B7=E6=90=AC=E8=BF=90=E5=BE=85=E6=A3=80=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auto/AutoSendGzqToDjq.java                | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
index efcd0fad9..fcfc0bea1 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendGzqToDjq.java
@@ -62,30 +62,26 @@ public class AutoSendGzqToDjq {
                                 .collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(ivtLists)) {
                     pointCode3 = gzqIvtList.get(0).getPoint_code();
-                    if (StringUtils.isBlank(pointCode3)) {
-                        return;
+                    if (StringUtils.isNotBlank(pointCode3)) {
+                        List<BstIvtPackageinfoivt> packageList;
+                        packageList = packageinfoivtService.checkEndPointTask(
+                                PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
+                                PackageInfoIvtEnum.IVT_STATUS.code("空"),
+                                PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
+                                PackageInfoIvtEnum.SORT_TYPE.code("升序"),
+                                ""
+                        );
+                        if (CollectionUtils.isNotEmpty(packageList)) {
+                            pointCode4 = packageList.get(0).getPoint_code();
+                            task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
+                            task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
+                            task1.put("vehicle_code", "空载具");
+                            task1.put("point_code1", pointCode3);
+                            task1.put("point_code2", pointCode4);
+                            task1.put("request_param", "98");
+                            djqTask.createTask(task1);
+                        }
                     }
-                } else {
-                    return;
-                }
-                List<BstIvtPackageinfoivt> packageList;
-                packageList = packageinfoivtService.checkEndPointTask(
-                        PackageInfoIvtEnum.POINT_STATUS.code("待检区"),
-                        PackageInfoIvtEnum.IVT_STATUS.code("空"),
-                        PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"),
-                        PackageInfoIvtEnum.SORT_TYPE.code("升序"),
-                        ""
-                );
-
-                if (CollectionUtils.isNotEmpty(packageList)) {
-                    pointCode4 = packageList.get(0).getPoint_code();
-                    task1.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("管制区->待检区"));
-                    task1.put("vehicle_code2", PackageInfoIvtEnum.AGV_ACTION_TYPE.code("普通任务"));
-                    task1.put("vehicle_code", "空载具");
-                    task1.put("point_code1", pointCode3);
-                    task1.put("point_code2", pointCode4);
-                    task1.put("request_param", "98");
-                    djqTask.createTask(task1);
                 }
                 //管制区->待检区送合格品任务
                 List<BstIvtPackageinfoivt> gzqPackageinfoivtList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("合格品"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("取货任务"), PackageInfoIvtEnum.SORT_TYPE.code("降序"), "");