From fc5fc7ca68282cce52c240ae5b3e69e81c27bfcb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 14:15:10 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
index 27a4948..f3c07bb 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.zy.acs.common.domain.AgvProtocol;
import com.zy.acs.common.domain.protocol.*;
+import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.common.utils.GsonUtils;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.Cools;
@@ -132,6 +133,8 @@
// 鏈夌爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_12_UP mesBody, AgvDetail detail) {
+ detail.setStatus(mesBody.getStatus());
+
Code code = codeService.selectByData(mesBody.getQrCode());
if (null != code) {
detail.setCode(code.getId());
@@ -143,8 +146,6 @@
} else {
log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
-
- detail.setStatus(mesBody.getStatus());
// 鍦伴潰鐮佸亸绉�
detail.setCodeOffsert(JSON.toJSONString(Cools
@@ -180,14 +181,22 @@
// 鏃犵爜瀹炴椂鏁版嵁鍖�
private void sync(AGV_13_UP mesBody, AgvDetail detail) {
+ detail.setStatus(mesBody.getStatus());
+
Code code = codeService.selectByData(mesBody.getQrCode());
if (null != code) {
- detail.setCode(null);
- detail.setLastCode(code.getId());
- detail.setPos(0);
-// if (!agvDetailService.updateUnPosCode(detail.getId(), code.getId())) {
-// log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛�", agvService.getById(detail.getAgvId()).getUuid());
-// }
+
+ if (!detail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
+ detail.setCode(null);
+ detail.setLastCode(code.getId());
+ detail.setPos(0);
+ } else {
+ detail.setCode(code.getId());
+ detail.setLastCode(null);
+ detail.setPos(1);
+ }
+
+
} else {
log.error("Agv [{}] 鏇存柊瀹氫綅鏁版嵁澶辫触 锛侊紒锛佷笂浼犳潯鐮侊細{}", agvService.getById(detail.getAgvId()).getUuid(), mesBody.getQrCode());
}
--
Gitblit v1.9.1