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

根据现场沟通去掉579的wms请求

Browse Source
This commit is contained in:
psh
2024-01-03 09:05:08 +08:00
parent 86e6029765
commit 587c3fb066
1 changed files with 174 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,30 +394,30 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
wcsFlag = true; wcsFlag = true;
} }
if ("true".equals(device.getExtraValue().get("reqWms")) // if ("true".equals(device.getExtraValue().get("reqWms"))
&& !inst.getTask_code().startsWith("-") // && !inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) { // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 2); // form.put("status", 2);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
//
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// wmsFlag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV取货后离开。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
wmsFlag = true; wmsFlag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV取货后离开。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
wmsFlag = true;
}
if (wcsFlag && wmsFlag) { if (wcsFlag && wmsFlag) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
@@ -428,45 +428,45 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { } else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver(); StandardInspectSiteDeviceDriver driver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if (driver.getMode() != 0 // if (driver.getMode() != 0
&& driver.getMove() == 0) { // && driver.getMove() == 0) {
if (!inst.getTask_code().startsWith("-") // if (!inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue()) // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())
&& "true".equals(device.getExtraValue().get("reqWms"))) { // && "true".equals(device.getExtraValue().get("reqWms"))) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 2); // form.put("status", 2);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
//
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// flag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV取货后离开。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
flag = true; flag = true;
} else { // }
String resultMessage = result.getString("message"); // } else {
this.message = resultMessage; // String message = "";
String message = resultMessage + "不允许AGV取货后离开。"; // if (driver.getMode() == 0) {
driver.setMessage(message); // message += "站点未联机，";
logServer.deviceExecuteLog(device_code, "", "", message); // } else {
} // if (driver.getMove() != 0) {
} else { // message += "站点有货，";
flag = true; // }
} // }
} else { // message += "不允许AGV取货后离开。";
String message = ""; // driver.setMessage(message);
if (driver.getMode() == 0) { // logServer.deviceExecuteLog(device_code, "", "", message);
message += "站点未联机，"; // }
} else {
if (driver.getMove() != 0) {
message += "站点有货，";
}
}
message += "不允许AGV取货后离开。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
if (flag) { if (flag) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
@@ -479,29 +479,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (driver.getMode() != 0 if (driver.getMode() != 0
&& driver.getMove() == 0 && driver.getMove() == 0
&& driver.getNumber() == 0) { && driver.getNumber() == 0) {
if (!inst.getTask_code().startsWith("-") // if (!inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue()) // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())
&& "true".equals(device.getExtraValue().get("reqWms"))) { // && "true".equals(device.getExtraValue().get("reqWms"))) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 2); // form.put("status", 2);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// flag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV取货后离开。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
flag = true; flag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV取货后离开。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
flag = true;
}
} else { } else {
String message = ""; String message = "";
if (driver.getMode() == 0) { if (driver.getMode() == 0) {
@@ -588,30 +588,30 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
wcsFlag = true; wcsFlag = true;
} }
if ("true".equals(device.getExtraValue().get("reqWms")) // if ("true".equals(device.getExtraValue().get("reqWms"))
&& !inst.getTask_code().startsWith("-") // && !inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) { // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 3); // form.put("status", 3);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
//
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// wmsFlag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV放货。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
wmsFlag = true; wmsFlag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV放货。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
wmsFlag = true;
}
if (wcsFlag && wmsFlag) { if (wcsFlag && wmsFlag) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
@@ -624,30 +624,30 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (driver.getMode() != 0 if (driver.getMode() != 0
&& driver.getMove() == 0) { && driver.getMove() == 0) {
if (!inst.getTask_code().startsWith("-") // if (!inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue()) // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())
&& "true".equals(device.getExtraValue().get("reqWms"))) { // && "true".equals(device.getExtraValue().get("reqWms"))) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 3); // form.put("status", 3);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
//
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// flag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV放货。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
flag = true; flag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV放货。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
flag = true;
}
} else { } else {
String message = ""; String message = "";
if (driver.getMode() == 0) { if (driver.getMode() == 0) {
@@ -671,29 +671,29 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} else if (device.getDeviceDriver() instanceof FoldDiscSiteDeviceDriver) { } else if (device.getDeviceDriver() instanceof FoldDiscSiteDeviceDriver) {
FoldDiscSiteDeviceDriver driver = (FoldDiscSiteDeviceDriver) device.getDeviceDriver(); FoldDiscSiteDeviceDriver driver = (FoldDiscSiteDeviceDriver) device.getDeviceDriver();
if (driver.getMode() != 0) { if (driver.getMode() != 0) {
if (!inst.getTask_code().startsWith("-") // if (!inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue()) // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())
&& "true".equals(device.getExtraValue().get("reqWms"))) { // && "true".equals(device.getExtraValue().get("reqWms"))) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 3); // form.put("status", 3);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// flag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV放货。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
flag = true; flag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV放货。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
flag = true;
}
} else { } else {
String message = ""; String message = "";
if (driver.getMode() == 0) { if (driver.getMode() == 0) {
@@ -774,30 +774,30 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
wcsFlag = true; wcsFlag = true;
} }
if ("true".equals(device.getExtraValue().get("reqWms")) // if ("true".equals(device.getExtraValue().get("reqWms"))
&& !inst.getTask_code().startsWith("-") // && !inst.getTask_code().startsWith("-")
&& "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) { // && "1".equals(paramService.findByCode(AcsConfig.HASWMS).getValue())) {
JSONObject form = new JSONObject(); // JSONObject form = new JSONObject();
form.put("vehicle_code", inst.getVehicle_code()); // form.put("vehicle_code", inst.getVehicle_code());
form.put("status", 4); // form.put("status", 4);
form.put("device_code", device_code); // form.put("device_code", device_code);
form.put("task_code", inst.getTask_code()); // form.put("task_code", inst.getTask_code());
JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{ // JSONObject result = acsToWmsService.feedAgvTaskStatus(new JSONArray() {{
add(form); // add(form);
}}); // }});
//
if (20000 == result.getIntValue("code")) { // if (20000 == result.getIntValue("code")) {
// wmsFlag = true;
// } else {
// String resultMessage = result.getString("message");
// this.message = resultMessage;
// String message = resultMessage + "不允许AGV放货后离开。";
// driver.setMessage(message);
// logServer.deviceExecuteLog(device_code, "", "", message);
// }
// } else {
wmsFlag = true; wmsFlag = true;
} else { // }
String resultMessage = result.getString("message");
this.message = resultMessage;
String message = resultMessage + "不允许AGV放货后离开。";
driver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message);
}
} else {
wmsFlag = true;
}
if (wcsFlag && wmsFlag) { if (wcsFlag && wmsFlag) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);