From 441c5bd409702bfd9e9ad5f660229c804863ae56 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 09:20:08 +0800
Subject: [PATCH] 还原代码
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 12 ++++--------
src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 8 ++++----
src/main/resources/application.yml | 25 ++++++++++++++++---------
4 files changed, 26 insertions(+), 23 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 51a32a9..63faab5 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -285,16 +285,16 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
//TODO 寮犺秴
- //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- return code;
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return code;
}
success = true;
return code;
}catch (Exception e){
log.error(e.getMessage());
//TODO 寮犺秴
- //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- return 1;
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return 1;
}finally {
apiLogService.save(
namespace,
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index adfe4fc..15b23ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -353,11 +353,7 @@
}
//TODO
//鏆傛椂鍔犱笂trycatch
- try {
- reportMes(agvWrkMast, agvWrkDetlListOld);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
@@ -517,7 +513,7 @@
log.error("" + e.getMessage());
}
//TODO 寮犺秴
- //reportMes(agvWrkMast, agvWrkDetlListOld);
+ reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
@@ -542,7 +538,7 @@
return SUCCESS;
} catch (Exception e) {
//TODO
- //log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
+ log.error("淇敼AGV鍏ュ簱閫氱煡妗ｇ姸鎬佸叆鍑虹姸鎬佷负Y" + e.getMessage());
}
return FAIL;
}
@@ -870,7 +866,7 @@
if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
log.info("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + jsonObject);
//TODO 寮犺秴
- //throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
+ throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
return jsonObject;
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
index 82a15f8..bf93cb5 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java
@@ -131,8 +131,8 @@
int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
//TODO 寮犺秴
- //throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
- return code;
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ //return code;
}
success = true;
return code;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7bf28d0..7512ebf 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8083
+ port: 8080
servlet:
context-path: /@pom.build.finalName@
@@ -10,8 +10,8 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
- #url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
+ #url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
username: sa
password: sa@123
mvc:
@@ -87,12 +87,19 @@
u8:
url: http://192.168.9.3:8877
orderReportPath: /DBMS/U8/CM/add
-ERP:
- url: http://39.184.149.30:8877
- orderReportPath: /DBMS/U8/CM/add
-MES:
- url: http://192.168.1.55:8010
- orderReportPath: /api/RdAudit
+#ERP:
+# url: http://39.184.149.30:8877
+# orderReportPath: /DBMS/U8/CM/add
+mes:
+ url: https://v3-ali.blacklake.cn/api/openapi/domain/web/v1/route
+ orderReportPath: /inventory/open/v2/transfer_order/ordinary/_execute
+ pakinReportPath: /inventory/open/v2/inbound_order/execute/_inbound
+ buyPakinReportPath: /schedule-for-yinzuo/open/yinzuo/inboundOrder
+ pakoutReportPath: /inventory/open/v2/outbound_order/_outbound_by_suggest
+ getTokenUrl: https://v3-ali.blacklake.cn
+ getTokenPath: /api/openapi/domain/api/v1/access_token/_get_access_token
+ appKey: cli_1712644281065780
+ appSecret: 6710d24e31e64adc963d4c213b2c9b8e
agvBasDev:
maxWorkNum: 1
--
Gitblit v1.9.1