root/whxr_acs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增日志

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-09-16 17:30:58 +08:00
parent 9c90c55c2a
commit c5c0a5cda6
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -965,6 +965,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
if (StrUtil.equals(jo.get("result").toString(), "1")) { if (StrUtil.equals(jo.get("result").toString(), "1")) {
log.info("AGV取货完成请求请求立库：{}", jo.toString());
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
} else { } else {
log.info("AGV取货完成反馈设备{},{}", device_code, jo.getString("message")); log.info("AGV取货完成反馈设备{},{}", device_code, jo.getString("message"));
@@ -1120,6 +1121,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口 //如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) { if (!tag) {
HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code()); HttpResponse response = acsToXrlkService.isPutPermission(device.getDevice_code());
log.info("AGV请求放货请求立库：{}", response.toString());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
if (StrUtil.equals(jo.get("result").toString(), "1")) { if (StrUtil.equals(jo.get("result").toString(), "1")) {
@@ -1298,8 +1300,11 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口 //如果为acs创建的任务并且任务类型为3，那么就不需要调用立库接口
if (!tag) { if (!tag) {
HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "1"); HttpResponse response = acsToXrlkService.AGVWorkStatus(device.getDevice_code(), "1");
log.info("AGV放货完成请求请求立库：{}", response.toString());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
log.info("AGV放货完成请求请求立库：{}", jo.toString());
if (StrUtil.equals(jo.get("result").toString(), "1")) { if (StrUtil.equals(jo.get("result").toString(), "1")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
} else { } else {
@@ -1368,6 +1373,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
HttpResponse response = acsToXrlkService.invokeDoor(device.getDevice_code()); HttpResponse response = acsToXrlkService.invokeDoor(device.getDevice_code());
if (response.getStatus() == 200) { if (response.getStatus() == 200) {
JSONObject jo = JSONObject.fromObject(response.body()); JSONObject jo = JSONObject.fromObject(response.body());
log.info("AGV请求进入立库反馈{}", jo.toString());
if (StrUtil.equals(jo.get("result").toString(), "1")) { if (StrUtil.equals(jo.get("result").toString(), "1")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
} else { } else {
@@ -1424,12 +1430,12 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
if (arr[18] * 256 + arr[19] == 0) { if (arr[18] * 256 + arr[19] == 0) {
dto.setState("IDLE"); dto.setState("IDLE");
} else { } else {
StringBuffer errbs = new StringBuffer(); // StringBuffer errbs = new StringBuffer();
for (int i = 0; i < ERROR.length; i++) { // for (int i = 0; i < ERROR.length; i++) {
if (((arr[18] * 256 + arr[19]) & (1 << i)) > 0) // if (((arr[18] * 256 + arr[19]) & (1 << i)) > 0)
errbs.append("," + ERROR[i]); // errbs.append("," + ERROR[i]);
//反馈故障 // //反馈故障
} // }
dto.setState("ERROR"); dto.setState("ERROR");
} }
} }