From e5c56a0626329f446547c3dce836c88e15dfc549 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 19 十一月 2025 14:32:30 +0800
Subject: [PATCH] agv回调接口
---
src/main/java/com/zy/asrs/entity/AgvCallbackDto.java | 80 ++++++++++++++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 10 +++
src/main/java/com/zy/asrs/entity/Task.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 24 ++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 7 ++
5 files changed, 122 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f1a90fe..aed3211 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,6 +4,7 @@
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.AgvCallbackDto;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
@@ -38,6 +39,15 @@
@Autowired
private OpenService openService;
+ @PostMapping("/api/agv_callback")
+ @AppAuth(memo = "agv浠诲姟鍥炶皟")
+ public synchronized R agvCallback(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) AgvCallbackDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.agvCallback(param);
+ }
+
// 鍏ュ簱瀹屾垚涓婃姤娴嬭瘯鎺ュ彛
@PostMapping("/inOrderFinishReport")
public synchronized R inOrderFinishReport(@RequestHeader(required = false) String appkey,
diff --git a/src/main/java/com/zy/asrs/entity/AgvCallbackDto.java b/src/main/java/com/zy/asrs/entity/AgvCallbackDto.java
new file mode 100644
index 0000000..dfd2c49
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/AgvCallbackDto.java
@@ -0,0 +1,80 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description agv浠诲姟鍥炶皟dto
+ * @createDate 2025/11/19 14:14
+ */
+@Data
+public class AgvCallbackDto {
+ /**
+ * 杩愬崟缂栧彿
+ */
+ private String id;
+
+ /**
+ * 杩愬崟绫诲瀷
+ */
+ private String kind;
+
+ /**
+ * 杩愬崟鐘舵��
+ * - Failed锛氬け璐ワ紙娉ㄦ剰澶辫触鍙互涓嶆槸缁堟�併�傚湪鏁呴殰琚В鍐冲悗锛屽け璐ョ殑杩愬崟鍏佽鍙樹负瀹屾垚銆傛垨鑰呭彇娑堟帀澶辫触鐨勮繍鍗曘�傚鏋滀笉闇�瑕佸鐞嗭紝澶辫触灏辨槸缁堟�侊級
+ * - Assigned锛氬凡娲捐溅
+ * - Done锛氬畬鎴愶紙缁堟�侊紝杩愬崟鎴愬姛锛�
+ * - Cancelled锛氬彇娑堬紙缁堟�侊紝浜哄伐鏍囪鍙栨秷锛�
+ */
+ private String status;
+
+ /**
+ * 璧峰搴撲綅
+ */
+ private String fromBin;
+
+ /**
+ * 鐩爣搴撲綅
+ */
+ private String toBin;
+
+ /**
+ * 鍒嗛厤AGV
+ */
+ private String robotName;
+
+ /**
+ * 鍦ㄥ簱鍙�
+ */
+ private Boolean atPort;
+
+ /**
+ * 宸插彇璐�
+ */
+ private Boolean loaded;
+
+ /**
+ * 宸叉斁璐�
+ */
+ private Boolean unloaded;
+
+ /**
+ * 鏁呴殰缂栫爜
+ */
+ private String errCode;
+
+ /**
+ * 鏁呴殰淇℃伅
+ */
+ private String errMsg;
+
+ /**
+ * 鏈�鍚庝慨鏀规椂闂�
+ */
+ private String modifiedOn;
+
+ /**
+ * 杩愬崟瀹屾垚鏃堕棿
+ */
+ private String doneOn;
+}
diff --git a/src/main/java/com/zy/asrs/entity/Task.java b/src/main/java/com/zy/asrs/entity/Task.java
index 24d91fe..9e2825a 100644
--- a/src/main/java/com/zy/asrs/entity/Task.java
+++ b/src/main/java/com/zy/asrs/entity/Task.java
@@ -78,7 +78,7 @@
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value = "")
+ @ApiModelProperty(value = "rgv")
@TableField("sheet_no")
private String sheetNo;
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 6e85104..d21fbb9 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,7 @@
package com.zy.asrs.service;
+import com.core.common.R;
+import com.zy.asrs.entity.AgvCallbackDto;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.OpenOrderCompeteResult;
import com.zy.asrs.entity.result.StockVo;
@@ -44,4 +46,9 @@
* @param param
*/
void syncMat(MatSyncParam param);
+
+ /**
+ * agv浠诲姟鍥炶皟
+ */
+ R agvCallback(AgvCallbackDto param);
}
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..f101f9c 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,28 @@
@Autowired
private TagMapper tagMapper;
+ @Resource
+ private TaskService taskService;
+
+ @Override
+ public R agvCallback(AgvCallbackDto param) {
+ String id = param.getId();
+ Task task = taskService.selectById(id);
+ if (task == null) {
+ return R.parse(id +":id涓嶅瓨鍦�");
+ }
+
+ switch (param.getStatus()) {
+ case "Assigned":task.setSheetNo(param.getRobotName());break;
+ case "Done":task.setWrkSts(9L);break;
+ case "Failed":
+ case "Cancelled":
+ default:
+ }
+ taskService.updateById(task);
+ return R.ok();
+ }
+
@Override
@Transactional
public void pakinOrderCreate(OpenOrderPakinParam param) {
--
Gitblit v1.9.1