From 3427f3210c0d1fff7471e1500e736190cde7ee31 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 16 Jul 2024 15:49:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=E8=A1=A5=E7=A9=BA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=88=B0=E7=AE=A1=E5=88=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tasks/first_floor_area/auto/AutoSendVehicleToKzj.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 5254eb09b..03ab6a0c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -92,7 +92,6 @@ public class AutoSendVehicleToKzj { boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); try { if (tryLock) { - JSONObject task = new JSONObject(); String pointCode1; String pointCode2; @@ -112,8 +111,8 @@ public class AutoSendVehicleToKzj { return; } if (existTask.size() % 2 != 0) { - //优先去待检区 - pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区待检区->空载具缓存位)")); + //优先去管制区 + pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)")); } else { pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); } From 9a89e6e6a37506e3bbbcf210f9109df06db30e62 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Tue, 16 Jul 2024 15:51:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?opt:=E8=A1=A5=E7=A9=BA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E4=BC=98=E5=85=88=E5=88=B0=E7=AE=A1=E5=88=B6=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java index 03ab6a0c3..4c55958fb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java @@ -141,7 +141,7 @@ public class AutoSendVehicleToKzj { private String getPointCode(JSONObject task, String taskType) { String pointCode1 = null; - List packageList = null; + List packageList ; if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) { packageList = packageinfoivtService.checkEndPointTask( PackageInfoIvtEnum.POINT_STATUS.code("待检区"),