From 955fef9ba80fda70582d926a2c6f2af527447bb5 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 22 十一月 2025 08:21:26 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cff1c14..5d4837d 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -252,7 +252,11 @@
if (Cools.isEmpty(param.getBindingTags())) {
return R.error("鍒嗘嫞缁戝畾绫诲埆[bindingTags]涓嶈兘涓虹┖");
}
- openService.taskArmReport(param);
+ try{
+ openService.taskArmReport(param);
+ } catch (Exception e){
+ return R.error(e.getMessage()).add(e.getMessage());
+ }
return R.ok();
}
@@ -404,7 +408,7 @@
/**
* 鍒嗘嫞绾夸笂鎶ユ帴鏀�
*/
- @PostMapping("/agv/task/v1")
+ @PostMapping("/agv/task/v1/agvCallback")
@AppAuth(memo = "AGV涓婃姤鎺ユ敹")
public synchronized R TaskAgvReport(@RequestHeader(required = false) String appkey,
@RequestBody TaskAgvReportParam param,
@@ -413,9 +417,12 @@
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("WMS浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getReqCode())) {
+ return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
}
+ String reqCode = param.getReqCode();
+ String[] split = reqCode.split("-");
+ param.setTaskNo(Integer.parseInt(split[0]));
// if (Cools.isEmpty(param.getTimestamp())) {
// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
// }
--
Gitblit v1.9.1