From 46168fbb7c925b0ec04def176095e967720e684a Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期五, 16 一月 2026 15:22:07 +0800
Subject: [PATCH] agv查询修复
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 109 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index ce9be2c..c4c7790 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -19,6 +20,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -53,6 +55,113 @@
@Autowired
private TagMapper tagMapper;
+ @Resource
+ private TaskService taskService;
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R agvCallback(AgvCallbackDto param) {
+ log.debug("agv鍥炶皟 param:{}", param);
+ // 浼樺厛浣跨敤taskId锛屽鏋滄病鏈夊垯浣跨敤id锛堝悜鍚庡吋瀹癸級
+ String taskId = Cools.isEmpty(param.getTaskId()) ? param.getId() : param.getTaskId();
+ if (Cools.isEmpty(taskId)) {
+ return R.error("浠诲姟id涓嶈兘涓虹┖");
+ }
+
+ log.info("鏀跺埌AGV浠诲姟鍥炶皟璇锋眰锛宼askId锛歿}锛宖romBin锛歿}锛宼oBin锛歿}锛宺obotGroup锛歿}锛宬ind锛歿}",
+ taskId, param.getFromBin(), param.getToBin(),
+ Cools.isEmpty(param.getRobotGroup()) ? param.getRobotName() : param.getRobotGroup(),
+ param.getKind());
+
+ // 鏍规嵁taskId鏌ヨ浠诲姟
+ Task task = null;
+ try {
+ // 澶勭悊"T"鍓嶇紑鏍煎紡锛堝"T130"锛夛紝杩欐槸AGV浠诲姟鍒涘缓鏃剁殑鏍煎紡
+ String numericId = taskId;
+ if (taskId.startsWith("T") && taskId.length() > 1) {
+ numericId = taskId.substring(1);
+ log.debug("妫�娴嬪埌T鍓嶇紑鏍煎紡鐨則askId锛屾彁鍙栨暟瀛桰D锛歿}", numericId);
+ }
+ // 灏濊瘯灏唗askId瑙ｆ瀽涓篖ong绫诲瀷鐨刬d
+ Long taskIdLong = Long.parseLong(numericId);
+ task = taskService.selectById(taskIdLong);
+ } catch (NumberFormatException e) {
+ // 濡傛灉涓嶆槸鏁板瓧锛屽皾璇曢�氳繃鍏朵粬瀛楁鏌ヨ锛堝sheetNo绛夛級
+ log.debug("taskId涓嶆槸鏁板瓧鏍煎紡锛屽皾璇曢�氳繃鍏朵粬瀛楁鏌ヨ锛宼askId锛歿}", taskId);
+ task = taskService.selectOne(
+ new EntityWrapper<Task>().eq("sheet_no", taskId)
+ );
+ }
+
+ if (task == null) {
+ log.warn("鏈壘鍒板搴旂殑浠诲姟锛宼askId锛歿}", taskId);
+ return R.error("浠诲姟涓嶅瓨鍦紝taskId锛�" + taskId);
+ }
+
+ // 鏇存柊浠诲姟淇℃伅
+ if (!Cools.isEmpty(param.getFromBin())) {
+ task.setSourceStaNo(param.getFromBin());
+ }
+ if (!Cools.isEmpty(param.getToBin())) {
+ task.setLocNo(param.getToBin());
+ }
+
+ // 浼樺厛浣跨敤robotGroup锛屽鏋滄病鏈夊垯浣跨敤robotName锛堝悜鍚庡吋瀹癸級
+ String robotGroup = Cools.isEmpty(param.getRobotGroup()) ? param.getRobotName() : param.getRobotGroup();
+ if (!Cools.isEmpty(robotGroup)) {
+ task.setInvWh(robotGroup);
+ }
+
+ task.setModiTime(new Date());
+
+ // 濡傛灉鏈塻tatus瀛楁锛屾寜鍘熸湁閫昏緫澶勭悊锛堝悜鍚庡吋瀹癸級
+ if (!Cools.isEmpty(param.getStatus())) {
+ switch (param.getStatus()) {
+ case "Assigned":
+ if (Cools.isEmpty(robotGroup)) {
+ task.setInvWh(param.getRobotName());
+ }
+ break;
+ case "Done":
+ task.setWrkSts(9L);
+ break;
+ case "Failed":
+ case "Cancelled":
+ default:
+ break;
+ }
+ }
+
+ // 鏍规嵁浠诲姟绫诲瀷杩涜鐩稿簲澶勭悊
+ if (!Cools.isEmpty(param.getKind())) {
+ String kind = param.getKind();
+ if ("璐х墿杞繍".equals(kind)) {
+ log.info("澶勭悊璐х墿杞繍浠诲姟锛宼askId锛歿}", taskId);
+ } else if ("瀹炴墭鍏ュ簱".equals(kind) || "绌烘墭鍏ュ簱".equals(kind)) {
+ log.info("澶勭悊鍏ュ簱浠诲姟锛宼askId锛歿}", taskId);
+ // 鍏ュ簱浠诲姟锛氬鏋滄敹鍒扮‘璁ゅ彇璐у洖璋冿紙loaded=true锛夛紝瀹岀粨AGV鍛煎彨鍗�
+ if (Boolean.TRUE.equals(param.getLoaded())) {
+ // 濡傛灉浠诲姟鐘舵�佹槸8锛堝凡鍛煎彨AGV锛夛紝鏇存柊涓�9锛堜换鍔″畬鎴愶級
+ if (task.getWrkSts() != null && task.getWrkSts() == 8L) {
+ task.setWrkSts(9L);
+ log.info("鍏ュ簱浠诲姟鏀跺埌纭鍙栬揣鍥炶皟锛屽畬缁揂GV鍛煎彨鍗曪紝taskId锛歿}", taskId);
+ }
+ }
+ } else if ("瀹炴墭鍑哄簱".equals(kind)) {
+ log.info("澶勭悊瀹炴墭鍑哄簱浠诲姟锛宼askId锛歿}", taskId);
+ }
+ }
+
+ // 淇濆瓨浠诲姟鏇存柊
+ if (!taskService.updateById(task)) {
+ log.error("鏇存柊浠诲姟澶辫触锛宼askId锛歿}", taskId);
+ return R.error("鏇存柊浠诲姟澶辫触");
+ }
+
+ log.info("AGV浠诲姟鍥炶皟澶勭悊鎴愬姛锛宼askId锛歿}", taskId);
+ return R.ok();
+ }
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
--
Gitblit v1.9.1