From 6b3b0bbef242997de2f6665dce91964c4ca4a92e Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 10:44:00 +0800
Subject: [PATCH] 单据数据传递给u8通了；代码中//TODO 张超注释的，上线时需要打开注释
---
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
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 b226a86..a176161 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -375,6 +375,7 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(9527L);
wrkMast.setModiTime(now);
+ wrkMast.setPltType(agvWrkMast.getPltType());
wrkMast.setLogErrMemo("completedCarryWrk");
if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
@@ -425,6 +426,7 @@
reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
+
@Transactional
public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
@@ -479,7 +481,8 @@
} catch (Exception e) {
log.error("" + e.getMessage());
}
- reportMes(agvWrkMast, agvWrkDetlListOld);
+ //TODO 寮犺秴
+ //reportMes(agvWrkMast, agvWrkDetlListOld);
return SUCCESS;
}
@@ -826,18 +829,13 @@
boolean success = false;
try {
- response = new HttpHandler.Builder()
- .setUri(url)
- .setPath(path)
- .setHeaders(headParam)
- .setJson(JSONObject.toJSONString(requestParam))
- .setHttps(true)
- .build()
- .doPost();
+ response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
- throw new CoolException(jsonObject.get("dsc").toString());
+ log.info("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭細" + jsonObject);
+ //TODO 寮犺秴
+ //throw new CoolException("mes鎺ュ彛璋冪敤澶辫触锛岃繑鍥炰俊鎭�:" + jsonObject);
}
success = true;
return jsonObject;
@@ -854,15 +852,7 @@
log.error(e.getMessage());
throw new CoolException(e.getMessage());
} finally {
- apiLogService.save(
- namespace,
- url + path,
- appkey,
- ip,
- JSON.toJSONString(JSONObject.toJSONString(requestParam)),
- response,
- success
- );
+ apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
}
}
--
Gitblit v1.9.1