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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-12-25 09:49:40 +08:00
parent 543801a5dc 885d1ec962
commit 1024462f13
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/indoor_manipulator/IndoorManipulatorDeviceDriver.java
View File

@@ -150,7 +150,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
String message = null; String message = null;
Boolean iserror = false; Boolean iserror = false;
private Date instruction_update_time = new Date(); private Date instruction_update_time = new Date();
private int instruction_update_time_out = 1000; private int instruction_update_time_out = 3000;
Integer heartbeat_tag; Integer heartbeat_tag;
private Date instruction_require_time = new Date(); private Date instruction_require_time = new Date();
@@ -440,7 +440,6 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
//反馈尺寸 //反馈尺寸
if (mode == 3 && action == 2) { if (mode == 3 && action == 2) {
String task_code = inst1.getTask_code(); String task_code = inst1.getTask_code();
TaskDto task = taskserver.findByCode(task_code);
applyManipulatorActionRequest.setType("2"); applyManipulatorActionRequest.setType("2");
applyManipulatorActionRequest.setTask_code1(task_code); applyManipulatorActionRequest.setTask_code1(task_code);
applyManipulatorActionRequest.setSize(String.valueOf(inflatable_shaft_size)); applyManipulatorActionRequest.setSize(String.valueOf(inflatable_shaft_size));
@@ -507,7 +506,7 @@ public class IndoorManipulatorDeviceDriver extends AbstractOpcDeviceDriver imple
} else { } else {
feedbackSucess = false; feedbackSucess = false;
message = "申请新取货点失败"; message = "申请新取货点失败";
logServer.deviceExecuteLog(this.device_code, "", "", "申请新取货点,返回参数:" + applyManipulatorActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "申请新取货点失败,返回参数:" + applyManipulatorActionResponse);
} }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java
View File

@@ -524,7 +524,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
map3.put("to_command", "4"); map3.put("to_command", "4");
this.writing(map3); this.writing(map3);
requireSucess = true; requireSucess = true;
logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管成功,返回参数:" + applyPaperActionResponse);
message = "申请出货成功"; message = "申请出货成功";
} else { } else {
message = applyPaperActionResponse.getMessage(); message = applyPaperActionResponse.getMessage();
@@ -532,7 +532,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
this.writing(map3); this.writing(map3);
requireSucess = false; requireSucess = false;
message = "出库顺序错误"; message = "出库顺序错误";
logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管,返回参数:" + applyPaperActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "申请出纸管顺序错误,返回参数:" + applyPaperActionResponse);
} }
} }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/plugging_unplugging_machine/PluggingUnpluggingMachineDeviceDriver.java
View File

@@ -181,7 +181,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
map.put("to_command", 6); map.put("to_command", 6);
this.writing(map); this.writing(map);
requireSucess = true; requireSucess = true;
logServer.deviceExecuteLog(this.device_code, "", "", "拔轴完成反馈,返回参数:" + applyManipulatorActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "拔轴成功反馈,返回参数:" + applyManipulatorActionResponse);
message = "拔轴完成成功"; message = "拔轴完成成功";
}else{ }else{
message = applyManipulatorActionResponse.getMessage(); message = applyManipulatorActionResponse.getMessage();
@@ -189,7 +189,7 @@ public class PluggingUnpluggingMachineDeviceDriver extends AbstractOpcDeviceDriv
map.put("to_command", 99); map.put("to_command", 99);
requireSucess = true; requireSucess = true;
message = "拔轴失败"; message = "拔轴失败";
logServer.deviceExecuteLog(this.device_code, "", "", "拔轴完成反馈,返回参数:" + applyManipulatorActionResponse); logServer.deviceExecuteLog(this.device_code, "", "", "拔轴失败反馈,返回参数:" + applyManipulatorActionResponse);
} }
} }

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

@@ -458,14 +458,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
AddressDto addressDto = addressService.findByCode("actionFinishRequest"); AddressDto addressDto = addressService.findByCode("actionFinishRequest");
String methods_url = addressDto.getMethods_url(); String methods_url = addressDto.getMethods_url();
String url = wmsUrl + methods_url; String url = wmsUrl + methods_url;
log.info("ApplyManipulatorActionRequest----请求参数{}", param); log.info("actionFinishRequest----请求参数{}", param);
try { try {
// String result = ""; // String result = "";
String result = HttpRequest.post(url) String result = HttpRequest.post(url)
.body(JSON.toJSONString(param)) .body(JSON.toJSONString(param))
.execute().body(); .execute().body();
JSONObject jsonObject = JSONObject.parseObject(result); JSONObject jsonObject = JSONObject.parseObject(result);
log.info("ApplyManipulatorActionResponse----返回参数{}", result); log.info("actionFinishResponse----返回参数{}", result);
actionFinishRequestResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class); actionFinishRequestResponse = JSONObject.toJavaObject(jsonObject, ApplyManipulatorActionResponse.class);
} catch (Exception e) { } catch (Exception e) {
JSONObject map = new JSONObject(); JSONObject map = new JSONObject();