From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
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 b42f5b7..1e4e397 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -283,13 +283,17 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //TODO 寮犺秴
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
- throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //TODO 寮犺秴
+ //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ return 1;
}finally {
apiLogService.save(
namespace,
--
Gitblit v1.9.1