From 4696a0be1e0235e4a9e5077c3f42e038da8c6809 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 14 八月 2025 16:30:37 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 2eb63f7..451bc83 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
@@ -132,7 +132,7 @@
if (!busService.save(bus)) {
throw new BusinessException("Internal Server Error!");
}
- Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, false);
+ Boolean locStaStatusCheck = configService.getVal("LOC_STA_STATUS_CHECK", Boolean.class, true);
// 淇濆瓨浠诲姟
@@ -279,7 +279,7 @@
if (!taskService.updateById(task)) {
throw new BusinessException("seqNum: " + task.getSeqNum() + " failed to update");
}
- report(task, TaskReportStsType.START);
+ report(task,null, TaskReportStsType.START);
}
} catch (Exception e) {
log.error("mainService.infuseAgvForTask", e);
@@ -1468,7 +1468,7 @@
List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
for (Long taskId : taskIds) {
Task task = taskService.getById(taskId);
- report(task, TaskReportStsType.END);
+ report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
}
}
@@ -1506,7 +1506,7 @@
List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
for (Long taskId : taskIds) {
Task task = taskService.getById(taskId);
- report(task, TaskReportStsType.OTBIN);
+ report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
}
}
@@ -1516,7 +1516,7 @@
List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
for (Long taskId : taskIds) {
Task task = taskService.getById(taskId);
- report(task, TaskReportStsType.OTBIN);
+ report(task, agv_11_up.getQrCode(), TaskReportStsType.OTBIN);
}
}
//寰�杈撻�佺嚎鏀捐揣瀹屾垚
@@ -1525,7 +1525,7 @@
List<Long> taskIds = actionService.selectTaskIdsByGroupId(serialNo);
for (Long taskId : taskIds) {
Task task = taskService.getById(taskId);
- report(task, TaskReportStsType.END);
+ report(task, agv_11_up.getQrCode(), TaskReportStsType.END);
}
}
@@ -1641,12 +1641,21 @@
/**
* 涓婃姤缁欎笂娓哥郴缁燂紝灏辨槸鎻掑叆涓�鏉℃暟鎹埌涓婃姤琛�
*/
- private void report(Task task, TaskReportStsType taskReportStsType) {
+ private void report(Task task, String qrCode, TaskReportStsType taskReportStsType) {
// TODO 鎻掑叆涓�鏉′笂鎶ヨ褰�
+ if (task.getBusId() == null) {
+ return;
+ }
+ 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));
+ return;
+ }
TaskReport taskReport = new TaskReport();
taskReport.setAgvId(task.getAgvId());
taskReport.setBusNo(task.getBusId$());
taskReport.setCreateTime(new Date());
+ taskReport.setQrCode(qrCode);
taskReport.setReportTimes(0);
taskReport.setTaskSts(taskReportStsType.status);
taskReport.setSeqNum(task.getSeqNum());
--
Gitblit v1.9.1