wangs
/
zhongDingTianNeng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更新

master
gengby 2 years ago
parent
2451151303
commit
21fceb5f1f
2 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
  2. 10
      hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java

2
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
View File

@ -230,7 +230,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
Map<String, Object> itemMap = new HashMap<String, Object>();
itemMap.put(to_param, value);
ReadUtil.write(itemMap, server);
logServer.log("kong", "write", String.valueOf(type), param.toString(), String.valueOf(param), "200", "", "");
logServer.log("kong", "write", String.valueOf(type), to_param.toString(), String.valueOf(param), "200", "", "");
}

10
hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java
View File

@ -49,7 +49,7 @@ public class AgvWaitUtil {
int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
String responseMessage = String.valueOf(feedback.get("responseMessage"));
if (responseCode == 0) {
feedback.put("feedbackStatus", "taking");
feedMap.put("feedbackStatus", "taking");
acsToWmsZDService.taskFeedback(feedMap);
map.put("status", 200);
map.put("message", "请求成功");
@ -83,7 +83,7 @@ public class AgvWaitUtil {
String responseMessage = String.valueOf(feedback.get("responseMessage"));
if (responseCode == 0) {
feedback.put("feedbackStatus", "taking");
feedMap.put("feedbackStatus", "taking");
acsToWmsZDService.taskFeedback(feedMap);
map.put("status", 200);
map.put("message", "请求成功");
@ -195,7 +195,7 @@ public class AgvWaitUtil {
String responseMessage = (String.valueOf(feedback.get("responseMessage")));
if (responseCode == 0) {
feedback.put("feedbackStatus", "puting");
feedMap.put("feedbackStatus", "puting");
acsToWmsZDService.taskFeedback(feedMap);
map.put("status", 200);
map.put("message", "请求成功");
@ -213,7 +213,7 @@ public class AgvWaitUtil {
map.put("message", "请求失败,终点位置有货!move = " + standardConveyorLineDeviceDriver.getMove() + "action = " + standardConveyorLineDeviceDriver.getAction());
type = "erro";
logServer.log(task_code, "waitpointRequest", type, param.toString(), String.valueOf(map), "400", "api/agv/waitpointRequest", instructionDto.getVehicle_code());
throw new BadRequestException("请求失败,终点位置有货!");
throw new BadRequestException("请求失败,终点位置有货或不允许放货!");
}
}
if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
@ -229,7 +229,7 @@ public class AgvWaitUtil {
String responseMessage = (String.valueOf(feedback.get("responseMessage")));
if (responseCode == 0) {
feedback.put("feedbackStatus", "puting");
feedMap.put("feedbackStatus", "puting");
acsToWmsZDService.taskFeedback(feedMap);
map.put("status", 200);
map.put("message", "请求成功");

Write Preview
Loading…
Cancel
Save