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

更新

Browse Source
This commit is contained in:
gengby
2023-03-13 16:06:01 +08:00
parent 8614b37e6e
commit 082b647105
4 changed files with 101 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,25 +169,24 @@ 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("Vehiclecode", inst.getVehicle_code());
map.put("Vehiclecode", inst.getVehicle_code()); map.put("Status", "1");
map.put("Status", "1"); map.put("Devicecode", inst.getStart_point_code());
map.put("Devicecode", inst.getStart_device_code()); map.put("Taskcode", inst.getTask_code());
map.put("Taskcode", 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) { 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 {
} else { log.warn("指令号:{},acs请求wms取货申请失败，连接被拒绝,未反馈agv允许取货", inst.getInstruction_code());
log.warn("指令号:{},acs请求wms取货申请失败，连接被拒绝,未反馈agv允许取货", inst.getInstruction_code());
}
} }
} }
//取货完毕 //取货完毕
//(需要WCS反馈) //(需要WCS反馈)
} else if (phase == 0x05) { } else if (phase == 0x05) {
@@ -225,25 +224,24 @@ 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("Vehiclecode", inst.getVehicle_code());
map.put("Vehiclecode", inst.getVehicle_code()); map.put("Status", "2");
map.put("Status", "2"); map.put("Devicecode", inst.getStart_point_code());
map.put("Devicecode", inst.getStart_device_code()); map.put("Taskcode", inst.getTask_code());
map.put("Taskcode", 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) { 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 {
} else { log.warn("指令号:{},acs反馈wms取货完成失败，连接被拒绝,未反馈agv取货完成", inst.getInstruction_code());
log.warn("指令号:{},acs反馈wms取货完成失败，连接被拒绝,未反馈agv取货完成", inst.getInstruction_code());
}
} }
} }
//到达放货点 //到达放货点
//(需要WCS反馈) //(需要WCS反馈)
} else if (phase == 0x07) { } else if (phase == 0x07) {
@@ -277,23 +275,21 @@ 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("Vehiclecode", inst.getVehicle_code());
map.put("Vehiclecode", inst.getVehicle_code()); map.put("Status", "3");
map.put("Status", "3"); map.put("Devicecode", inst.getNext_point_code());
map.put("Devicecode", inst.getNext_device_code()); map.put("Taskcode", inst.getTask_code());
map.put("Taskcode", 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) { 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 {
} else { log.warn("指令号:{},acs请求wms放货申请失败，连接被拒绝,未反馈agv允许放货", inst.getInstruction_code());
log.warn("指令号:{},acs请求wms放货申请失败，连接被拒绝,未反馈agv允许放货", inst.getInstruction_code());
}
} }
} }
//放货完毕 //放货完毕
@@ -330,25 +326,24 @@ 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("Vehiclecode", inst.getVehicle_code());
map.put("Vehiclecode", inst.getVehicle_code()); map.put("Status", "4");
map.put("Status", "4"); map.put("Devicecode", inst.getNext_point_code());
map.put("Devicecode", inst.getNext_device_code()); map.put("Taskcode", inst.getTask_code());
map.put("Taskcode", 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) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); log.info("指令号:{},acs请求wms放货完成成功", inst.getInstruction_code());
log.info("指令号:{},acs请求wms放货完成成功", inst.getInstruction_code()); } else {
} else { log.warn("指令号:{},acs请求wms放货完成失败", inst.getInstruction_code());
log.warn("指令号:{},acs请求wms放货完成失败", inst.getInstruction_code());
}
} }
} }
} }
//到达位置点 //到达位置点
//(需要WCS反馈) //(需要WCS反馈)

34
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java
View File

@@ -119,19 +119,27 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("feedbackTaskStatusToWms"); AddressDto addressDto = addressService.findByCode("feedbackTaskStatusToWms");
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
String url = wmsurl + methods_url; String url = wmsurl + methods_url;
try {
result = HttpRequest
.post(url + "?token=" + token)
.header("Content-Type", "application/json")
.body(String.valueOf(data))
.execute();
// //System.out.println(result2);
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
// //System.out.println(msg);
log.info("feedbackTaskStatusToWms-----输出参数{}", msg);
for (int i = 0; i < data.size(); i++) {
JSONObject jsonObject = data.getJSONObject(i);
String taskcode = jsonObject.getString("Taskcode");
String taskstatus = jsonObject.getString("Taskstatus");
JSONObject reqData = new JSONObject();
reqData.put("Staus",taskstatus);
try {
result = HttpRequest
.put(url + taskcode + "?token=" + token)
.header("Content-Type", "application/json")
.body(String.valueOf(reqData))
.execute();
// //System.out.println(result2);
} catch (Exception e) {
String msg = e.getMessage();
//网络不通
// //System.out.println(msg);
log.info("feedbackTaskStatusToWms-----输出参数{}", msg);
}
} }
String type = ""; String type = "";
if (result.getStatus() == 200) { if (result.getStatus() == 200) {
@@ -140,7 +148,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
type = "error"; type = "error";
} }
JSONObject jo = JSONObject.parseObject(result.body()); JSONObject jo = JSONObject.parseObject(result.body());
log.info("feedbackTaskStatusToWms-----输出参数{}", jo.toString()); log.info("feedbackTaskStatusToWms-----输出参数{}", String.valueOf(jo));
return result; return result;
} finally { } finally {
MDC.remove(log_file_type); MDC.remove(log_file_type);

2
acs/nladmin-system/src/main/resources/config/application.yml
View File

@@ -2,7 +2,7 @@ spring:
freemarker: freemarker:
check-template-location: false check-template-location: false
profiles: profiles:
active: prod active: dev
jackson: jackson:
time-zone: GMT+8 time-zone: GMT+8
data: data:

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: [