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

立讯更新

Browse Source
This commit is contained in:
loujf
2022-07-29 14:52:21 +08:00
parent 9f7e4ac78e
commit 75408cdfec
2 changed files with 41 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
hd/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/AgvServiceImpl.java
View File

@@ -550,21 +550,46 @@ public class AgvServiceImpl implements AgvService {
String state = arm_info.getString("task_status");
String state_name = null;
if(StrUtil.equals(state,"0")){
state_name = "NONE";
} else if(StrUtil.equals(state,"1")){
state_name = "WAITING";
} else if(StrUtil.equals(state,"2")) {
state_name = "RUNNING";
} else if(StrUtil.equals(state,"3")){
state_name = "SUSPENDED";
} else if(StrUtil.equals(state,"4")){
state_name = "COMPLETED";
} else if(StrUtil.equals(state,"5")){
state_name = "FAILED";
} else if(StrUtil.equals(state,"6")){
state_name = "CANCELED";
//连接状态
int connection_status = jo.getInt("connection_status");
String is_error = jo.getString("is_error");
//是否在执行任务
String procBusiness = jo.getString("procBusiness");
//是否在充电
String charging = rbk_report.getString("charging");
if (connection_status == 0) {
state_name = "UNAVAILABLE";
} else {
if (is_error.equals("true")) {
state_name = "ERROR";
} else {
if (charging.equals("true")) {
state_name = "CHARGING";
} else {
if (procBusiness.equals("true")){
state_name = "EXECUTING";
} else {
state_name = "IDLE";
}
}
}
}
// if(StrUtil.equals(state,"0")){
// state_name = "NONE";
// } else if(StrUtil.equals(state,"1")){
// state_name = "WAITING";
// } else if(StrUtil.equals(state,"2")) {
// state_name = "RUNNING";
// } else if(StrUtil.equals(state,"3")){
// state_name = "SUSPENDED";
// } else if(StrUtil.equals(state,"4")){
// state_name = "COMPLETED";
// } else if(StrUtil.equals(state,"5")){
// state_name = "FAILED";
// } else if(StrUtil.equals(state,"6")){
// state_name = "CANCELED";
// }
//本次运行时间(开机后到当前的时间)
String time = rbk_report.getString("time");
//累计运行时间
@@ -585,7 +610,7 @@ public class AgvServiceImpl implements AgvService {
String angle = rbk_report.getString("angle");
String blocked = rbk_report.getString("blocked");
String brake = rbk_report.getString("brake");
String charging = rbk_report.getString("charging");
// String charging = rbk_report.getString("charging");
String controller_humi = basic_info.getString("controller_humi");
String controller_temp = basic_info.getString("controller_temp");
String controller_voltage = basic_info.getString("controller_voltage");

1
hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java
View File

@@ -57,6 +57,7 @@ public class ToAgvDevice {
row.put("today_odo", agvDto.getToday_odo());
row.put("total_time", agvDto.getTotal_time());
row.put("time", agvDto.getTime());
row.put("state", agvDto.getState());
agv_rows.add(row);
}