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

更新

Browse Source
This commit is contained in:
gengby
2023-03-14 09:45:30 +08:00
parent 6484d1de42
commit 4e8ce3ea50
2 changed files with 93 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -169,29 +169,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver){ Object reqWms = device.getExtraValue().get("reqWms");
Object reqWms = device.getExtraValue().get("reqWms"); if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")){ JSONArray req = new JSONArray();
JSONArray req = new JSONArray(); JSONObject map = new JSONObject();
JSONObject map = new JSONObject(); map.put("vehicle_code", inst.getVehicle_code());
map.put("vehicle_code", inst.getVehicle_code()); map.put("status", "1");
map.put("status", "1"); map.put("device_code", inst.getStart_point_code());
map.put("device_code", inst.getStart_point_code()); map.put("task_code", inst.getTask_code());
map.put("task_code", inst.getTask_code()); req.add(map);
req.add(map); HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body());
JSONObject resp = JSONObject.parseObject(httpResponse.body()); if (resp.getInteger("status") == 200) {
if (resp.getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms取货申请成功,wms允许agv申请取货,已反馈agv允许取货", inst.getInstruction_code());
log.info("指令号:{},acs请求wms取货申请成功,wms允许agv申请取货,已反馈agv允许取货", inst.getInstruction_code());
} else {
log.warn("指令号:{},acs请求wms取货申请成功,wms不允许agv申请取货,未反馈agv允许取货", inst.getInstruction_code());
}
} else { } else {
log.warn("指令号:{},acs请求wms取货申请失败，连接被拒绝,未反馈agv允许取货", inst.getInstruction_code()); log.warn("指令号:{},acs请求wms取货申请成功,wms不允许agv申请取货,未反馈agv允许取货", inst.getInstruction_code());
} }
} else {
log.warn("指令号:{},acs请求wms取货申请失败，连接被拒绝,未反馈agv允许取货", inst.getInstruction_code());
} }
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} }
//取货完毕 //取货完毕
//(需要WCS反馈) //(需要WCS反馈)
@@ -230,29 +230,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
return; return;
} }
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver){ Object reqWms = device.getExtraValue().get("reqWms");
Object reqWms = device.getExtraValue().get("reqWms"); if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")){ JSONArray req = new JSONArray();
JSONArray req = new JSONArray(); JSONObject map = new JSONObject();
JSONObject map = new JSONObject(); map.put("vehicle_code", inst.getVehicle_code());
map.put("vehicle_code", inst.getVehicle_code()); map.put("status", "2");
map.put("status", "2"); map.put("device_code", inst.getStart_point_code());
map.put("device_code", inst.getStart_point_code()); map.put("task_code", inst.getTask_code());
map.put("task_code", inst.getTask_code()); req.add(map);
req.add(map); HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body());
JSONObject resp = JSONObject.parseObject(httpResponse.body()); if (resp.getInteger("status") == 200) {
if (resp.getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs反馈wms取货完成成功,wms允许agv取货完成,已反馈agv取货完成", inst.getInstruction_code());
log.info("指令号:{},acs反馈wms取货完成成功,wms允许agv取货完成,已反馈agv取货完成", inst.getInstruction_code());
} else {
log.warn("指令号:{},acs反馈wms取货完成成功,wms不允许agv取货完成,未反馈agv取货完成", inst.getInstruction_code());
}
} else { } else {
log.warn("指令号:{},acs反馈wms取货完成失败，连接被拒绝,未反馈agv取货完成", inst.getInstruction_code()); log.warn("指令号:{},acs反馈wms取货完成成功,wms不允许agv取货完成,未反馈agv取货完成", inst.getInstruction_code());
} }
} else {
log.warn("指令号:{},acs反馈wms取货完成失败，连接被拒绝,未反馈agv取货完成", inst.getInstruction_code());
} }
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} }
//到达放货点 //到达放货点
//(需要WCS反馈) //(需要WCS反馈)
@@ -287,29 +287,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("未找到关联编号{}对应的指令", ikey); log.info("未找到关联编号{}对应的指令", ikey);
return; return;
} }
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver){ Object reqWms = device.getExtraValue().get("reqWms");
Object reqWms = device.getExtraValue().get("reqWms"); if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")){ JSONArray req = new JSONArray();
JSONArray req = new JSONArray(); JSONObject map = new JSONObject();
JSONObject map = new JSONObject(); map.put("vehicle_code", inst.getVehicle_code());
map.put("vehicle_code", inst.getVehicle_code()); map.put("status", "3");
map.put("status", "3"); map.put("device_code", inst.getNext_point_code());
map.put("device_code", inst.getStart_point_code()); map.put("task_code", inst.getTask_code());
map.put("task_code", inst.getTask_code()); req.add(map);
req.add(map); HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { JSONObject resp = JSONObject.parseObject(httpResponse.body());
JSONObject resp = JSONObject.parseObject(httpResponse.body()); if (resp.getInteger("status") == 200) {
if (resp.getInteger("status") == 200) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code());
log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code());
} else {
log.warn("指令号:{},acs请求wms放货申请成功,wms不允许agv申请放货,未反馈agv允许放货", inst.getInstruction_code());
}
} else { } else {
log.warn("指令号:{},acs请求wms放货申请失败，连接被拒绝,未反馈agv允许放货", inst.getInstruction_code()); log.warn("指令号:{},acs请求wms放货申请成功,wms不允许agv申请放货,未反馈agv允许放货", inst.getInstruction_code());
} }
} else {
log.warn("指令号:{},acs请求wms放货申请失败，连接被拒绝,未反馈agv允许放货", inst.getInstruction_code());
} }
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} }
//放货完毕 //放货完毕
//(需要WCS反馈) //(需要WCS反馈)
@@ -345,7 +345,23 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("未找到编号{}对应的指令", ikey); log.info("未找到编号{}对应的指令", ikey);
return; return;
} }
if (StrUtil.equals(inst.getNext_device_code(), device_code)) { Object reqWms = device.getExtraValue().get("reqWms");
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
JSONArray req = new JSONArray();
JSONObject map = new JSONObject();
map.put("vehicle_code", inst.getVehicle_code());
map.put("status", "4");
map.put("device_code", inst.getNext_point_code());
map.put("task_code", inst.getTask_code());
req.add(map);
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code());
} else {
log.warn("指令号:{},acs请求wms放货申请失败，连接被拒绝,未反馈agv允许放货", inst.getInstruction_code());
}
} else {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} }
} }

17
acs/nladmin-ui/src/views/acs/device/driver/standard_storage.vue
View File

@@ -1,6 +1,20 @@
<template> <template>
<!-- 标准版-货架--> <!-- 标准版-货架-->
<div> <div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">指令相关：</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="是否请求wms" label-width="150px">
<el-switch v-model="form.reqWms" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never"> <el-card class="box-card" shadow="never">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span class="role-span">设备协议：</span> <span class="role-span">设备协议：</span>
@@ -133,7 +147,8 @@ export default {
maxY: 0, maxY: 0,
maxZ: 0, maxZ: 0,
minY: 0, minY: 0,
minZ: 0 minZ: 0,
reqWms: true
}, },
rules: { rules: {
x: [ x: [