|
|
@ -234,8 +234,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
Object reqWms = device.getExtraValue().get("reqWms"); |
|
|
|
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) { |
|
|
|
// 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()); |
|
|
@ -245,19 +245,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic |
|
|
|
req.add(map); |
|
|
|
HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req); |
|
|
|
if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) { |
|
|
|
JSONObject resp = JSONObject.parseObject(httpResponse.body()); |
|
|
|
if (resp.getInteger("status") == 200) { |
|
|
|
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); |
|
|
|
log.info("指令号:{},acs反馈wms取货完成成功,wms允许agv取货完成,已反馈agv取货完成", inst.getInstruction_code()); |
|
|
|
} else { |
|
|
|
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); |
|
|
|
} |
|
|
|
// } else {
|
|
|
|
// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
|
|
|
|
// }
|
|
|
|
//到达放货点
|
|
|
|
//(需要WCS反馈)
|
|
|
|
} else if (phase == 0x07) { |
|
|
@ -303,7 +298,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic |
|
|
|
// HttpResponse httpResponse = acsToWmsService.feedAgvTaskStatus(req);
|
|
|
|
// if (ObjectUtil.isNotEmpty(httpResponse) && httpResponse.getStatus() == 200) {
|
|
|
|
// JSONObject resp = JSONObject.parseObject(httpResponse.body());
|
|
|
|
// if (resp.getInteger("status") == 200) {
|
|
|
|
// if (resp.getInteger("status") == 200) {
|
|
|
|
// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
|
|
|
|
// log.info("指令号:{},acs请求wms放货申请成功,wms允许agv申请放货,已反馈agv允许放货", inst.getInstruction_code());
|
|
|
|
// } else {
|
|
|
@ -349,8 +344,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic |
|
|
|
log.info("未找到编号{}对应的指令", ikey); |
|
|
|
return; |
|
|
|
} |
|
|
|
Object reqWms = device.getExtraValue().get("reqWms"); |
|
|
|
if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) { |
|
|
|
// 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()); |
|
|
@ -365,9 +360,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic |
|
|
|
} else { |
|
|
|
log.warn("指令号:{},acs请求wms放货申请失败,连接被拒绝,未反馈agv允许放货", inst.getInstruction_code()); |
|
|
|
} |
|
|
|
} else { |
|
|
|
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); |
|
|
|
} |
|
|
|
// } else {
|
|
|
|
// data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
|
|
|
|
// }
|
|
|
|
} |
|
|
|
//到达位置点
|
|
|
|
//(需要WCS反馈)
|
|
|
|