From 5d8216a8d79aeb7b22a86478580018a3d9628406 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 08 四月 2026 11:14:08 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MainService.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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 b871092..7079caa 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
@@ -98,8 +98,7 @@
private StaReserveService staReserveService;
@Autowired
private ConveyorStationService conveyorStationService;
- @Autowired
- private FuncTaskService funcTaskService;
+
@SuppressWarnings("all")
@Transactional
@@ -1989,14 +1988,12 @@
if (taskComplete) {
// 鍦ㄥ厖鐢典换鍔¤璧板埌缁堢偣锛屽悓鏃跺垽鏂厖鐢垫々鐨勭被鍨�
if (segment.getPosType().equals(TaskPosDto.PosType.TO_CHARGE)){
- // 淇濆瓨涓�鏉℃暟鎹�
- FuncTask funcTask = new FuncTask();
FuncSta destFuncSta = funcStaService.getByCodeAndType(task.getDestCode(), FuncStaType.CHARGE.toString());
- funcTask.setFuncStaId(destFuncSta.getId());
- funcTask.setAgvId(segment.getAgvId());
- funcTask.setTaskId(segment.getTaskId());
- funcTask.setFuncTaskSts(TaskStsType.INIT.val());
- funcTaskService.save(funcTask);
+ if (destFuncSta != null) {
+ if (Cools.isEmpty(destFuncSta.getProtocol()) && destFuncSta.getProtocol().equalsIgnoreCase(ProtocolType.MODBUS.toString())) {
+ redis.setMap(RedisConstant.AGV_CHARGE_FLAG,segment.getAgvId$(),1);
+ }
+ }
}
task.setTaskSts(TaskStsType.COMPLETE.val());
task.setEndTime(now);
--
Gitblit v1.9.1