From 409bad5fcb018e32cc2ab5c4efcf0c498295520f Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Fri, 13 Jun 2025 15:20:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=86=99=E6=AD=BB=E7=9A=84=E7=AE=A1=E5=88=B6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/first_floor_area/auto/AutoSendGzqToDjq.java  |  2 +-
 .../first_floor_area/auto/AutoSendVehicleToDjq.java    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 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 7718b73ec..f20031bd1 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
@@ -68,7 +68,7 @@ public class AutoSendGzqToDjq extends Prun{
                 //todo 新增NG卷放置临时管制区135136，只取空不补空
                 List<BstIvtPackageinfoivt> ivtLists =
                         gzqIvtList.stream()
-                                .filter(r -> r.getPoint_status().equals("4"))
+                                .filter(r -> PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status()))
                                 .collect(Collectors.toList());
                 if (ObjectUtils.isNotEmpty(ivtLists)) {
                     pointCode3 = ivtLists.get(0).getPoint_code();
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
index e4adda0cf..92a6a937b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 @RequiredArgsConstructor
-public class AutoSendVehicleToDjq extends Prun{
+public class AutoSendVehicleToDjq extends Prun {
     private final String THIS_CLASS = AutoSendVehicleToDjq.class.getName();
     @Resource
     private IschBaseTaskService taskService;
@@ -54,8 +54,8 @@ public class AutoSendVehicleToDjq extends Prun{
     @Autowired
     public void run() {
         try {
-            this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"),null);
-        }catch (Exception ex){
+            this.sendVehicleToDjqOrGzq(IOSEnum.IS_NOTANDYES.code("否"), null);
+        } catch (Exception ex) {
             log.error(ex.getMessage());
         }
 
@@ -111,7 +111,7 @@ public class AutoSendVehicleToDjq extends Prun{
                 //todo 新增NG卷放置临时管制区135136，只取空不补空
                 packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
                 packageList = packageList.stream()
-                        .filter(r -> !r.getPoint_status().equals("4"))
+                        .filter(r -> !PackageInfoIvtEnum.POINT_STATUS.code("管制区").equals(r.getPoint_status()))
                         .collect(Collectors.toList());
                 task.put("task_type", PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));
             } else {
@@ -120,7 +120,7 @@ public class AutoSendVehicleToDjq extends Prun{
         } else {
             packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)"));
             packageList = packageList.stream()
-                    .filter(r -> !r.getPoint_status().equals("4"))
+                    .filter(r -> !r.getPoint_status().equals(PackageInfoIvtEnum.POINT_STATUS.code("管制区")))
                     .collect(Collectors.toList());
             if (ObjectUtils.isEmpty(packageList)) {
                 packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)"));