From 34aa40fffdda9155e77a7991ca8c7691102bb0b8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 26 四月 2026 11:29:05 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java b/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
index d4f13a8..040ccf9 100644
--- a/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/AgvScheduleServiceImpl.java
@@ -9,6 +9,7 @@
import com.zy.api.controller.params.AgvCarriesParam;
import com.zy.api.controller.params.AgvRequestParam;
import com.zy.api.entity.CallAgvParams;
+import com.zy.api.entity.dto.HKR;
import com.zy.api.enums.OrderType;
import com.zy.api.service.AgvScheduleService;
import com.zy.asrs.entity.LocCache;
@@ -74,6 +75,10 @@
task.setWrkSts(TaskStatusType.AGV_TASK_ISSUED_OUT.type);
}
+ if (!task.getIsNewIn().equals("M2")) {
+ params.setTaskType(task.getIsNewIn());
+ }
+
HIKResultDTO hikResultDTO = sendAgvTask(params, HIKApiConstant.TASK_SUBMIT);
if (hikResultDTO.isSuccess()) {
@@ -81,7 +86,6 @@
throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
}
}
-
return R.ok();
}
@@ -101,16 +105,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public R callback(AgvCallBackParam params) {
+ public HKR callback(AgvCallBackParam params) {
if (Objects.isNull(params)) {
- return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ return HKR.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(params.getRobotTaskCode())) {
- return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ return HKR.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
Task task = taskService.selectOne(new EntityWrapper<Task>().eq("wrk_no", params.getRobotTaskCode()));
if (Objects.isNull(task)) {
- return R.error("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
+ return HKR.error("浠诲姟淇℃伅涓嶅瓨鍦紒锛�");
}
if (Arrays.asList(TaskIOType.ALL_IN.type, TaskIOType.PICK_IN.type, TaskIOType.MERGE_IN.type)
@@ -130,11 +134,10 @@
task.setWrkSts(TaskStatusType.AGV_TASK_FINISHED_OUT.type);
}
}
-
if (!taskService.updateById(task)) {
throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- return R.ok("鎵ц瀹屾垚 锛侊紒");
+ return HKR.ok("鎵ц瀹屾垚 锛侊紒");
}
public HIKResultDTO sendAgvTask(CallAgvParams param, String path) {
@@ -169,6 +172,8 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
+ log.error("鍙戦�乤gv鍙傛暟锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", HIKApiConstant.AGV_IP + path, body, response);
+
if (jsonObject.getString("code").equals("SUCCESS")) {
result.setSuccess(true);
} else {
--
Gitblit v1.9.1