From f126a51e48410e2dc4ead6d340fd3ece0d934575 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 六月 2025 17:24:56 +0800
Subject: [PATCH] 测试,xiug bug
---
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java | 1 +
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 15 +++++++++++++--
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 8 +++++---
src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java | 3 +++
4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 80b3fe2..d531487 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -44,7 +44,7 @@
* 飦� robot_reach锛氭満鍣ㄤ汉鍒拌揪宸ヤ綔绔欍��
* 飦� weight锛氱О閲嶄簨浠跺洖璋冦��
* 飦� rfid锛歊FID璇嗗埆浜嬩欢鍥炶皟銆�
- *
+ * <p>
* 浠诲姟鐘舵�侊紙status锛夛細
* 飦� success锛氭垚鍔熴��
* 飦� fail锛氬け璐ャ��
@@ -173,8 +173,17 @@
end {
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
+ try {
+ if (!Cools.isEmpty(agvWrkMast.getBarcode()) && !Cools.isEmpty(param.getPodCode())) {
+ if (!agvWrkMast.getBarcode().equals(param.getPodCode())) {
+ agvWrkMast.setTakeNone(agvWrkMast.getBarcode() + "!=" + param.getPodCode());
+ log.info("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗ｆ墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
+ log.error("AGV鍥炶皟鐨勮繑鍥炵殑鎵樼洏鐮佸拰宸ヤ綔妗ｆ墭鐩樹笉涓�鑷�,{}{}", agvWrkMast.getBarcode(), param.getPodCode());
+ }
+ }
+ } catch (Exception e) {
-
+ }
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
agvWrkMast.setWrkSts(205L);
@@ -195,6 +204,8 @@
}
agvWrkMast.setModiTime(new Date());
agvWrkMastService.updateById(agvWrkMast);
+
+
}
},
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
index 3bf229d..a91dcdd 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
@@ -16,6 +16,9 @@
//浠诲姟鍙�
private String taskCode;
+ //璐ф灦鐮�
+ private String podCode;
+
//浠诲姟绫诲瀷
private String taskTyp;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index b59aa03..da569a5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -16,7 +16,6 @@
import com.zy.asrs.service.*;
import com.zy.common.service.AgvCommonService;
import com.zy.common.utils.HttpHandler;
-import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -276,6 +275,9 @@
}
break;
}
+ if (!Cools.isEmpty(agvWrkMast.getBarcode())) {
+ agvTaskCreateParam.setPodCode(agvWrkMast.getBarcode());
+ }
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
}
@@ -299,7 +301,7 @@
} else if (sourceLocNo.endsWith("01F1") && !locNo.startsWith("YZ") && locNo.endsWith("F4")) {
// 浠庡惛濉戜竴妤肩殑搴撲綅鍒板惛濉戜簩妤肩殑鐐逛綅涓�
return true;
- }else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
+ } else if (sourceLocNo.endsWith("02F1") && !locNo.startsWith("YZ") && locNo.endsWith("F1")) {
// 浠庡惛濉慹r妤肩殑kuwei鍒板惛濉戜竴妤肩殑dianwei
return true;
}
@@ -313,7 +315,7 @@
} else if (sourceLocNo.endsWith("F4") && locNo.startsWith("YZ") && locNo.endsWith("01F1")) {
// 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
return true;
- }else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
+ } else if (sourceLocNo.endsWith("F1") && locNo.startsWith("YZ") && locNo.endsWith("02F1")) {
// 浠庡惛濉戜簩妤肩殑鐐逛綅鍒板惛濉戜竴妤肩殑搴撲綅
return true;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
index 4dff4fc..d295832 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.WrkMastExecute;
import com.zy.asrs.entity.param.AgvTaskCreateParam;
--
Gitblit v1.9.1