From 3fa7cdec6ce44f07a0dc7e1910511ead606990f3 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 11 九月 2025 08:19:53 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 53 insertions(+), 30 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
index de1bcc9..545ea54 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java
@@ -137,6 +137,7 @@
throw new BusinessException("Internal Server Error!");
}
Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
+ Integer locStaTaskNum = configService.getVal("LOC_STA_TASK_NUM", Integer.class, 2);
// 淇濆瓨浠诲姟
@@ -190,6 +191,11 @@
if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
}
+ } else {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
+ if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
+ throw new BusinessException("destSta锛�" + task.getDestSta$() + " task more");
+ }
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
destSta.setUpdateTime(now);
@@ -237,6 +243,11 @@
if (destSta.getStaTypeIsCheck() != 1) {
if (locStaStatusCheck && !destSta.getStaSts().equals(StaStsType.IDLE.val())) {
throw new BusinessException("destSta锛�" + task.getDestSta$() + " is not in IDLE status");
+ }
+ } else {
+ List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getDestSta, destSta.getId()).in(Task::getTaskSts, TaskStsType.INIT.val(), TaskStsType.WAITING.val(), TaskStsType.ASSIGN.val(), TaskStsType.PROGRESS.val()));
+ if (!Cools.isEmpty(list) && list.size() >= locStaTaskNum) {
+ throw new BusinessException("destSta锛�" + task.getDestSta$() + " task more");
}
}
destSta.setStaSts(StaStsType.READY_RELEASE.val());
@@ -1491,11 +1502,11 @@
// }
// }
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
- }
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
+// }
}
// 鍑哄簱鍙栬揣
@@ -1529,31 +1540,31 @@
// }
// }
// }
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
- }
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
+// }
}
//浠庤緭閫佺嚎鍙栬揣瀹屾垚
- if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE)) {
- WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
- }
- }
+// if (agv_11_up.getCompleteType().equals(AgvCompleteType.TAKE_FROM_STA_COMPLETE)) {
+// WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
+// }
+// }
//寰�杈撻�佺嚎鏀捐揣瀹屾垚
- if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE)) {
- WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
- List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
- for (Long taskId : taskIds) {
- Task task = taskService.getById(taskId);
- report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
- }
- }
+// if (agv_11_up.getCompleteType().equals(AgvCompleteType.RELEASE_FROM_STA_COMPLETE)) {
+// WebsocketServiceImpl.taskShelfBarcode = agv_11_up.getLocCode();
+// List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
+// for (Long taskId : taskIds) {
+// Task task = taskService.getById(taskId);
+// report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
+// }
+// }
// 璺緞瀹屾垚 || 鍏呯數瀹屾垚
if (agv_11_up.getCompleteType().equals(AgvCompleteType.ENTIRE_PATH_COMPLETE)
@@ -1593,6 +1604,8 @@
// task
for (Segment segment : segmentList) {
boolean taskComplete = false;
+ boolean otbin = false;
+
Task task = taskService.getById(segment.getTaskId());
assert null != task;
@@ -1603,6 +1616,7 @@
switch (Objects.requireNonNull(posType)) {
case ORI_STA:
case ORI_LOC:
+ otbin = true;
break;
case DEST_STA:
case DEST_LOC:
@@ -1623,16 +1637,24 @@
break;
}
+ if (otbin) {
+ locService.taskCallBackOtbin(task);
+ report(task, null, TaskReportStsType.OTBIN);
+ }
+
+
if (taskComplete) {
- locService.taskCallBack(task);
+ locService.taskCallBackEnd(task);
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setEndTime(now);
task.setUpdateTime(now);
if (!taskService.updateById(task)) {
log.error("Task [{}] 鏇存柊澶辫触 锛侊紒锛�", task.getSeqNum());
- } else {
- report(task, null, TaskReportStsType.END);
+ }
+ report(task, null, TaskReportStsType.END);
+ if (task.getSeqNum() != null && task.getSeqNum().contains("SSX-CK")) {
+ report(task, "1001", TaskReportStsType.COMPLETED);
}
}
}
@@ -1676,7 +1698,7 @@
}
List<TaskReport> list = taskReportService.list(new LambdaQueryWrapper<TaskReport>().eq(TaskReport::getSeqNum, task.getSeqNum()).eq(TaskReport::getBusNo, task.getBusId$()).eq(TaskReport::getTaskSts, taskReportStsType.status));
if (!Cools.isEmpty(list)) {
- log.info("TaskReport [{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", JSON.toJSONString(task));
+ log.info("TaskReport [{},{}] 宸查噸澶嶏紝涓嶅啀鎻掑叆 ==========>> ", taskReportStsType, JSON.toJSONString(task));
return;
}
TaskReport taskReport = new TaskReport();
@@ -1691,6 +1713,7 @@
taskReport.setEventType(taskReportStsType.name);
taskReport.setSeqNum(task.getSeqNum());
taskReport.setZpallet(task.getZpallet());
+
if (!taskReportService.save(taskReport)) {
log.info("TaskReport [{}] 鎻掑叆澶辫触 ==========>> ", JSON.toJSONString(taskReport));
} else {
--
Gitblit v1.9.1