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

fix: 多次更新agv状态、阻塞测试

Browse Source
This commit is contained in:
lishuai
2024-07-23 09:06:41 +08:00
parent ccfb246c98
commit 4a6c1c7af4
10 changed files with 136 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java
View File

@@ -75,36 +75,42 @@ public class QueryAGVStatus {
String carNo = json.getString("vehicle"); String carNo = json.getString("vehicle");
String instructionCode = json.getString("id"); String instructionCode = json.getString("id");
if ("RUNNING".equals(state) || "CREATED".equals(state) || "TOBEDISPATCHED".equals(state) || "WAITING".equals(state)) { if ("RUNNING".equals(state) || "CREATED".equals(state) || "TOBEDISPATCHED".equals(state) || "WAITING".equals(state)) {
instruction.setInstruction_status("1"); if (!"1".equals(instruction.getInstruction_status())) {
instruction.setCarno(carNo); instruction.setInstruction_status("1");
TaskDto task = new TaskDto(); instruction.setCarno(carNo);
instructionService.update(instruction); TaskDto task = new TaskDto();
task.setCarno(carNo); instructionService.update(instruction);
task.setTask_id(instruction.getTask_id()); task.setCarno(carNo);
instructionService.update(instruction); task.setTask_id(instruction.getTask_id());
taskService.update(task); instructionService.update(instruction);
if (StrUtil.isNotEmpty(instructionCode)){ taskService.update(task);
Device carCode = deviceAppService.findDeviceByCode(instructionCode); if (StrUtil.isNotEmpty(instructionCode)) {
XgAgvCarDeviceDriver xgAgvCarDeviceDriver; Device carCode = deviceAppService.findDeviceByCode(instructionCode);
if (null != carCode) { XgAgvCarDeviceDriver xgAgvCarDeviceDriver;
if (carCode.getDeviceDriver() instanceof XgAgvCarDeviceDriver) { if (null != carCode) {
xgAgvCarDeviceDriver = (XgAgvCarDeviceDriver) carCode.getDeviceDriver(); if (carCode.getDeviceDriver() instanceof XgAgvCarDeviceDriver) {
xgAgvCarDeviceDriver.setTaskType(AgvActionTypeEnum.getStatus(instruction.getAgv_action_type())); xgAgvCarDeviceDriver = (XgAgvCarDeviceDriver) carCode.getDeviceDriver();
xgAgvCarDeviceDriver.setTaskType(AgvActionTypeEnum.getStatus(instruction.getAgv_action_type()));
}
} }
} }
} }
} else if ("FINISHED".equals(state)) { } else if ("FINISHED".equals(state)) {
instruction.setInstruction_status("2"); if (!"2".equals(instruction.getInstruction_status())) {
try { instruction.setInstruction_status("2");
instructionService.finish(instruction); try {
} catch (Exception e) { instructionService.finish(instruction);
log.error("执行完成，但无法更新状态，可能由于参数错误导致的异常"); } catch (Exception e) {
e.printStackTrace(); log.error("执行完成，但无法更新状态，可能由于参数错误导致的异常");
e.printStackTrace();
}
} }
} else if ("STOPPED".equals(state) || "FAILED".equals(state) || "Error".equals(state)) { } else if ("STOPPED".equals(state) || "FAILED".equals(state) || "Error".equals(state)) {
instruction.setInstruction_status("1"); if (!"1".equals(instruction.getInstruction_status())) {
instructionService.update(instruction); instruction.setInstruction_status("1");
instructionService.update(instruction);
}
} }
} }
} }

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java
View File

@@ -743,7 +743,7 @@ public class XianGongAgvServiceImpl implements XianGongAgvService {
Instruction instructionDto = instructionService.findByCodeFromCache(inst_code); Instruction instructionDto = instructionService.findByCodeFromCache(inst_code);
if (ObjectUtil.isEmpty(instructionDto)) { if (ObjectUtil.isEmpty(instructionDto)) {
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.content("请求失败，未找到指令！" ) .content("请求失败，未找到指令！" + inst_code)
.build(); .build();
logDto.setLog_level(4); logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto); luceneExecuteLogService.deviceExecuteLog(logDto);

110
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java
View File

@@ -76,7 +76,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class); DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
//当前指令 //当前指令
@@ -192,56 +192,64 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
} }
if (move != 0 && task > 0) { if (move != 0 && task > 0) {
if (null!=inst) { if (null != inst) {
inst_message = "指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code(); inst_message = "指令号:" + inst.getInstruction_code() + " " + inst.getStart_point_code() + "->" + inst.getNext_point_code();
} }
update_instruction_status(); update_instruction_status();
} }
} catch (Exception var17) { if (move != last_move && move == 0 && last_move == 1) {
var17.printStackTrace(); requireSucess = false;
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); clearWrite();
}
if (move != last_move && move==0 && last_move==1) {
requireSucess = false;
clearWrite();
}
if (mode == 0) {
this.setIsonline(false);
message = "脱机";
//有报警
} else {
this.setIsonline(true);
this.setIserror(false);
if (error != 0) {
this.setIserror(true);
message = "有警报";
} }
Instruction instruction = null; if (mode == 0) {
List toInstructions; this.setIsonline(false);
message = "脱机";
switch (mode) { //有报警
case 1: } else {
log.debug("设备运转模式:等待工作"); this.setIsonline(true);
break; this.setIserror(false);
case 2: if (error != 0) {
break; this.setIserror(true);
case 25: message = "有警报";
if ( StrUtil.isEmpty(material_barcode)) { }else {
message = "子卷码为空"; this.setIserror(false);
}else { }
//二楼到一楼输送线申请行架任务
if (move == 1 && !requireSucess) { Instruction instruction = null;
applyManipulatorTask(); List toInstructions;
switch (mode) {
case 1:
log.debug("设备运转模式:等待工作");
break;
case 2:
break;
case 25:
if (StrUtil.isEmpty(material_barcode)) {
message = "子卷码为空";
} else {
//二楼到一楼输送线申请行架任务
if (move == 1 && !requireSucess) {
applyManipulatorTask();
}
} }
} break;
break; }
} }
} catch (Exception var17) {
this.iserror = true;
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content(this.device_code+ "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol))
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
var17.printStackTrace();
} }
last_mode = mode; last_mode = mode;
last_move = move; last_move = move;
last_error = error; last_error = error;
@@ -259,21 +267,21 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
private void clearWrite() { private void clearWrite() {
List list = new ArrayList<>(); List list = new ArrayList<>();
Map map = new HashMap<>(); Map map = new HashMap<>();
map.put("code","to_target"); map.put("code", "to_target");
map.put("value","0"); map.put("value", "0");
list.add(map); list.add(map);
Map map2 = new HashMap<>(); Map map2 = new HashMap<>();
map2.put("code","to_task"); map2.put("code", "to_task");
map2.put("value","0"); map2.put("value", "0");
list.add(map2); list.add(map2);
Map map4 = new HashMap<>(); Map map4 = new HashMap<>();
map4.put("code","to_container_type"); map4.put("code", "to_container_type");
map4.put("value","0"); map4.put("value", "0");
list.add(map4); list.add(map4);
this.writing(list); this.writing(list);
message=null; message = null;
vehicle_code=null; vehicle_code = null;
inst_message = null; inst_message = null;
} }
@@ -578,7 +586,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString() while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
, inst.getInstruction_code())) { , inst.getInstruction_code())) {
this.writing(list); this.writing(list);
LuceneLogDto logDto = LuceneLogDto.builder() LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code) .device_code(device_code)
.content(device_code + inst.getInstruction_code() + "再次下发电气信号") .content(device_code + inst.getInstruction_code() + "再次下发电气信号")
.build(); .build();
@@ -652,7 +660,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
map.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError()))); map.put("error", ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(this.getError())));
map.put("requireSucess", requireSucess); map.put("requireSucess", requireSucess);
map.put("driver_type", "siemens_conveyor"); map.put("driver_type", "siemens_conveyor");
map.put("message",message); map.put("message", message);
map.put("inst_message", this.inst_message); map.put("inst_message", this.inst_message);
map.put("last_inst_message", this.last_inst_message); map.put("last_inst_message", this.last_inst_message);
map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); map.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java
View File

@@ -139,7 +139,7 @@ public class ItemProtocol {
setIsonline(true); setIsonline(true);
return value; return value;
} }
return 0; return value;
} }

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java
View File

@@ -243,6 +243,15 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
} }
if (mode == -99){
LuceneLogDto logDto = LuceneLogDto.builder()
.device_code(device_code)
.content("PLC断连需重启程序")
.build();
logDto.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto);
throw new BadRequestException("PLC断连需重启程序");
}
if (move != last_move && move == 0 && last_move == 1) { if (move != last_move && move == 0 && last_move == 1) {

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java
View File

@@ -178,7 +178,7 @@ public class ItemProtocol {
setIsonline(true); setIsonline(true);
return value; return value;
} }
return 0; return -99;
} }

6
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java
View File

@@ -285,6 +285,12 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
} }
}else { }else {
LuceneLogDto logDto2 = LuceneLogDto.builder()
.device_code(device_code)
.content("木箱开盖报错,接口返回:" + response)
.build();
logDto2.setLog_level(4);
luceneExecuteLogService.deviceExecuteLog(logDto2);
message = "木箱开盖报错,返回参数:" + jo; message = "木箱开盖报错,返回参数:" + jo;
this.iserror = true; this.iserror = true;
} }

4
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java
View File

@@ -182,16 +182,14 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
message = "未联机";
//有报警 //有报警
} else if (error != 0) { } else if (error != 0) {
this.setIserror(true); this.setIserror(true);
message = "有报警"; message = "universal_message3";
//无报警 //无报警
} else { } else {
this.setIsonline(true); this.setIsonline(true);
this.setIserror(false); this.setIserror(false);
message = "";
Instruction instruction = null; Instruction instruction = null;
List toInstructions; List toInstructions;

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -1688,7 +1688,14 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
JSONArray ja = new JSONArray(); JSONArray ja = new JSONArray();
ja.add(feed_jo); ja.add(feed_jo);
//TODO 有需要根据上位系统反馈的信息再做进一步处理 //TODO 有需要根据上位系统反馈的信息再做进一步处理
acstowmsService.feedTaskStatus(ja); CompletableFuture.runAsync(() -> {
acstowmsService.feedTaskStatus(ja);
// 异步更新任务状态
try {
} catch (Exception e) {
e.printStackTrace();
}
});
} }
} }

39
acs2/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue
View File

@@ -23,7 +23,24 @@
</div> </div>
<div class="app-container"> <div class="app-container">
<el-table :data="modeform.plans" border fit highlight-current-row style="width: 100%;" class="tb-edit"> <el-table :data="modeform.plans" border fit highlight-current-row style="width: 100%;" class="tb-edit">
<el-table-column label="起始设备" prop="from" width="180"> <el-table-column label="任务类型" prop="type" width="180">
<template scope="scope">
<el-select
v-model="scope.row.type"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in requestMethodList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="指令起点" prop="from" width="180">
<template scope="scope"> <template scope="scope">
<el-select <el-select
v-model="scope.row.from" v-model="scope.row.from"
@@ -40,7 +57,7 @@
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="目标设备" prop="to" width="180"> <el-table-column label="指令终点" prop="to" width="180">
<template scope="scope"> <template scope="scope">
<el-select <el-select
v-model="scope.row.to" v-model="scope.row.to"
@@ -63,23 +80,7 @@
<span v-show="scope.row.edit">{{ scope.row.quantity }}</span> <span v-show="scope.row.edit">{{ scope.row.quantity }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务类型" prop="type" width="180">
<template scope="scope">
<el-select
v-model="scope.row.type"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in requestMethodList"
:key="item.code"
:label="item.name"
:value="item.code"
/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="170"> <el-table-column align="center" label="操作" width="170">
<template scope="scope"> <template scope="scope">
<el-button <el-button