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

fix:解决输送线脱机问题

Browse Source
This commit is contained in:
tuqiang
2025-02-12 17:28:38 +08:00
parent 9875a5d660
commit 5def15b5e7
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -1279,7 +1279,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) { if (StrUtil.equals(this.getDeviceCode(), inst.getNext_device_code())) {
vehicle_code = inst.getVehicle_code(); vehicle_code = inst.getVehicle_code();
inst.setExecute_device_code(this.device_code); inst.setExecute_device_code(this.device_code);
if (mode == 2) { if (mode == 2 || mode == 0) {
finish_instruction(); finish_instruction();
} }
logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code()); logServer.deviceExecuteLog(device_code, "", "", "入库输送线任务开始反馈完成状态,反馈成功,指令号:" + task + ",载具号:" + inst.getVehicle_code());

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

@@ -650,7 +650,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
public HttpResponse taskDeviceUpdate(JSONObject param) { public HttpResponse taskDeviceUpdate(JSONObject param) {
try { try {
MDC.put(log_file_type, log_type); MDC.put(log_file_type, log_type);
// log.info("shipDeviceUpdate-----输入参数{}", param); // log.info("taskDeviceUpdate-----输入参数{}", param);
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue();
AddressDto addressDto = addressService.findByCode("taskDeviceUpdate"); AddressDto addressDto = addressService.findByCode("taskDeviceUpdate");

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

@@ -1007,7 +1007,6 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
continue; continue;
} }
Resp resp = acsToLiKuService.sendInst(task_dto.getStorage_task_type(), inst); Resp resp = acsToLiKuService.sendInst(task_dto.getStorage_task_type(), inst);
if (StrUtil.equals(resp.result, "true")) { if (StrUtil.equals(resp.result, "true")) {
//创建任务和指令 //创建任务和指令
taskService.create(task_dto); taskService.create(task_dto);