root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master_merge' into master_merge

Browse Source
This commit is contained in:
liyongde
2024-07-16 15:53:24 +08:00
parent d9ad4a476a 9a89e6e6a3
commit b849ba5d32
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToKzj.java
View File

@@ -92,7 +92,6 @@ public class AutoSendVehicleToKzj {
boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS); boolean tryLock = lock.tryLock(0, TimeUnit.SECONDS);
try { try {
if (tryLock) { if (tryLock) {
JSONObject task = new JSONObject(); JSONObject task = new JSONObject();
String pointCode1; String pointCode1;
String pointCode2; String pointCode2;
@@ -112,8 +111,8 @@ public class AutoSendVehicleToKzj {
return; return;
} }
if (existTask.size() % 2 != 0) { if (existTask.size() % 2 != 0) {
//优先去待检区 //优先去管制区
pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区待检区->空载具缓存位)")); pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(管制区->空载具缓存位)"));
} else { } else {
pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)")); pointCode1 = getPointCode(task, PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"));
} }
@@ -142,7 +141,7 @@ public class AutoSendVehicleToKzj {
private String getPointCode(JSONObject task, String taskType) { private String getPointCode(JSONObject task, String taskType) {
String pointCode1 = null; String pointCode1 = null;
List<BstIvtPackageinfoivt> packageList = null; List<BstIvtPackageinfoivt> packageList ;
if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) { if (taskType.equals(PackageInfoIvtEnum.TASK_TYPE.code("补空(待检区->空载具缓存位)"))) {
packageList = packageinfoivtService.checkEndPointTask( packageList = packageinfoivtService.checkEndPointTask(
PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.POINT_STATUS.code("待检区"),