diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
index 86b6c944a..86dc5bc67 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java
@@ -18,6 +18,7 @@ import org.nl.acs.device.service.dto.StorageCellDto;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.FileUtil;
import org.nl.modules.common.utils.SecurityUtils;
+import org.nl.modules.common.utils.StringUtils;
import org.nl.modules.wql.core.bean.ResultBean;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.WqlUtil;
@@ -110,15 +111,26 @@ public class StorageCellServiceImpl implements StorageCellService {
@Override
@Transactional(rollbackFor = Exception.class)
public void create(StorageCellDto dto) {
+ JSONArray arr;
+ WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
+ if(dto.getAddress()!=0) {
+ arr = wo.query("address ='" + dto.getAddress() + "'").getResultJSONArray(0);
+ if (arr.size() != 0) {
+ throw new BadRequestException("AGV编码非0时不能重复！");
+ }
+ }
+ arr = wo.query("storage_code ='" + dto.getStorage_code() + "'").getResultJSONArray(0);
+ if(arr.size()!=0){
+ throw new BadRequestException("货位编码不能重复！");
+ }
+
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
-
dto.setStorage_id(IdUtil.simpleUUID());
dto.setCreate_by(currentUsername);
dto.setUpdate_by(currentUsername);
dto.setUpdate_time(now);
dto.setCreate_time(now);
- WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.insert(json);
deviceService.addDeviceCodeByAddress(dto);
@@ -131,12 +143,25 @@ public class StorageCellServiceImpl implements StorageCellService {
StorageCellDto entity = this.findById(dto.getStorage_id());
if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!");
+ WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
+ JSONArray arr;
+ if(dto.getAddress()!=0) {
+ arr = wo.query("address ='" + dto.getAddress() + "'and storage_id <>'"+dto.getStorage_id() + "'").getResultJSONArray(0);
+ if (arr.size() != 0) {
+ throw new BadRequestException("AGV编码非0时不能重复！");
+ }
+ }
+ arr = wo.query("storage_code ='" + dto.getStorage_code() + "'and storage_id <>'"+dto.getStorage_id()+ "'").getResultJSONArray(0);
+ if(arr.size()!=0){
+ throw new BadRequestException("货位编码不能重复！");
+ }
+
+
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
dto.setUpdate_time(now);
dto.setUpdate_by(currentUsername);
- WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
JSONObject json = (JSONObject) JSONObject.toJSON(dto);
wo.update(json);
deviceService.updateDeviceCodeByAddress(dto);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
index edfa702ee..2a65667b1 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java
@@ -227,7 +227,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
}
- this.setPhase(phase);
} else if (device.getDeviceDriver() instanceof PhotoelectricInspectionSiteDeviceDriver) {
photoelectricInspectionSiteDeviceDriver = (PhotoelectricInspectionSiteDeviceDriver) device.getDeviceDriver();
@@ -344,11 +343,13 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
+ standardOrdinarySiteDeviceDriver.setAgvphase(phase);
if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
&& StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
&& StrUtil.equals(task.getTask_type(), "1")) {
//
if (standardOrdinarySiteDeviceDriver.getOption() == 1) {
+ standardOrdinarySiteDeviceDriver.setAgvphase(0);
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
} else {
log.info("等待LMS系统进行确认允许取货，设备号{},指令号{}", device_code, ikey);
@@ -360,7 +361,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
}
- this.setPhase(phase);
} else {
data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
}
@@ -533,21 +533,21 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
- if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
- && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
- && StrUtil.equals(task.getTask_type(), "1")) {
- //
- if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- standardOrdinarySiteDeviceDriver.setOption(0);
- } else {
- log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
- message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
- }
- } else {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- }
-
+// if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
+// && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
+// && StrUtil.equals(task.getTask_type(), "1")) {
+// //
+// if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// standardOrdinarySiteDeviceDriver.setOption(0);
+// } else {
+// log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
+// message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
+// }
+// } else {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// }
+ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
this.setPhase(phase);
} else if (device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) {
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
@@ -592,21 +592,21 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
- if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
- && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
- && StrUtil.equals(task.getTask_type(), "1")) {
- //
- if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- standardOrdinarySiteDeviceDriver.setOption(0);
- } else {
- log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
- message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
- }
- } else {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- }
-
+// if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
+// && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
+// && StrUtil.equals(task.getTask_type(), "1")) {
+// //
+// if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// standardOrdinarySiteDeviceDriver.setOption(0);
+// } else {
+// log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
+// message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
+// }
+// } else {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// }
+ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
this.setPhase(phase);
} else {
@@ -649,21 +649,21 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) {
standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver();
- if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
- && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
- && StrUtil.equals(task.getTask_type(), "1")) {
- //
- if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- standardOrdinarySiteDeviceDriver.setOption(0);
- } else {
- log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
- message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
- }
- } else {
- data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
- }
-
+// if (ObjectUtil.isNotEmpty(standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait"))
+// && StrUtil.equals("true", standardOrdinarySiteDeviceDriver.getDevice().getExtraValue().get("wait").toString())
+// && StrUtil.equals(task.getTask_type(), "1")) {
+// //
+// if (standardOrdinarySiteDeviceDriver.getOption() == 2) {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// standardOrdinarySiteDeviceDriver.setOption(0);
+// } else {
+// log.info("等待LMS系统进行确认离开，设备号{},指令号:{}", device_code, ikey);
+// message = "等待LMS系统进行确认离开,设备号:" + device_code + ",指令号:" + ikey;
+// }
+// } else {
+// data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+// }
+ data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
this.setPhase(phase);
} else {
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
index 789badd6f..c7d71642b 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
@@ -648,6 +648,21 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
map3.put("value", "1");
list.add(map3);
this.writing(list);
+
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
+ , inst.getInstruction_code())) {
+ this.writing(list);
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ if(ObjectUtil.isEmpty(instructionService.findByTaskcodeAndStatus(taskdto.getTask_code()))){
+ return false;
+ }
+ }
+
// if (task != Integer.parseInt(inst.getInstruction_code())) {
// this.writing(list);
// message = "重新下发电气信号";
@@ -760,11 +775,17 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
this.writing(list);
logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
try {
- Thread.sleep(500);
+ Thread.sleep(1000);
} catch (InterruptedException e) {
e.printStackTrace();
}
+ if(ObjectUtil.isEmpty(taskserver.findByCode(taskdto.getTask_code()))){
+ return false;
+ }
}
+
+
+
// if (task != Integer.parseInt(inst.getInstruction_code())) {
// this.writing(list);
// message = "重新下发电气信号";
@@ -806,6 +827,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
} catch (InterruptedException e) {
e.printStackTrace();
}
+ if(ObjectUtil.isEmpty(instructionService.findByDeviceCodeFromCache(this.device_code))){
+ return false;
+ }
}
// if (task != Integer.parseInt(inst.getInstruction_code())) {
// this.writing(list);
@@ -977,6 +1001,17 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
} else {
if (jo.getInteger("status") == 200) {
message = "申请补码AGV搬运任务成功";
+ List list = new ArrayList();
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString()
+ , "8")) {
+ this.writing(list);
+ logServer.deviceExecuteLog(device_code, "", "", "再次下发mode信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
logServer.deviceExecuteLog(this.device_code, "", "", "申请补码AGV任务,返回参数:" + jo);
requireSucess = true;
} else {
@@ -1013,6 +1048,22 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
} else {
if (jo.getInteger("status") == 200) {
message = "申请AGV搬运任务成功";
+ List list = new ArrayList();
+ Map map = new HashMap();
+ map.put("code", "to_command");
+ map.put("value", "8");
+ list.add(map);
+ this.writing(list);
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".to_command").toString()
+ , "8")) {
+ this.writing(list);
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发mode信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
logServer.deviceExecuteLog(this.device_code, "", "", "申请AGV任务,返回参数:" + jo);
requireSucess = true;
} else {
@@ -1059,5 +1110,4 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}
}
-
}
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
index 8ca258cbf..a86490157 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
@@ -585,6 +585,16 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
map3.put("value", "1");
list.add(map3);
this.writing(list);
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
+ , inst.getInstruction_code())) {
+ this.writing(list);
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
return true;
}
try {
@@ -659,11 +669,23 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
map2.put("value", inst.getInstruction_code());
list.add(map4);
this.writing(list);
- if (task != Integer.parseInt(inst.getInstruction_code())) {
+// if (task != Integer.parseInt(inst.getInstruction_code())) {
+// this.writing(list);
+// message = "重新下发电气信号";
+// logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+// }
+
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
+ , inst.getInstruction_code())) {
this.writing(list);
- message = "重新下发电气信号";
- logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
+
message = "下发电气任务号成功";
requireSucess = true;
return true;
@@ -770,10 +792,20 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
map2.put("value", inst.getInstruction_code());
list.add(map4);
this.writing(list);
- if (task != Integer.parseInt(inst.getInstruction_code())) {
+// if (task != Integer.parseInt(inst.getInstruction_code())) {
+// this.writing(list);
+// message = "重新下发电气信号";
+// logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+// }
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
+ , inst.getInstruction_code())) {
this.writing(list);
- message = "重新下发电气信号";
- logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
} else {
//如果不存在则直接找对应指令
@@ -799,9 +831,19 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
map3.put("value", "1");
list.add(map3);
this.writing(list);
- if (task != Integer.parseInt(inst.getInstruction_code())) {
+// if (task != Integer.parseInt(inst.getInstruction_code())) {
+// this.writing(list);
+// logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+// }
+ while (!StrUtil.equals(this.getOpcValueAccessor().getValue(this.getOpcServer() + "." + this.getOpcPlc() + "." + this.getDevice_code() + ".task").toString()
+ , inst.getInstruction_code())) {
this.writing(list);
- logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发电气信号");
+ logServer.deviceExecuteLog(device_code, "", "", inst.getInstruction_code() + "再次下发信号");
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
}
requireSucess = true;
}
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
index e2ec8b0d0..9d27b1983 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDeviceDriver.java
@@ -123,67 +123,67 @@ public class StandardOrdinarySiteDeviceDriver extends AbstractDeviceDriver imple
batch = this.getDevice().getBatch();
device_code = this.getDeviceCode();
- if (agvphase == 0x03) {
- if (ObjectUtil.isNotEmpty(inst)) {
- inst.setExecute_status("1");
- instructionService.update(inst);
- byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
- agvphase = 0;
- index = 0;
- inst = null;
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
- } else {
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
-
- }
- }
-
- if (agvphase == 0x05) {
- if (ObjectUtil.isNotEmpty(inst)) {
- inst.setExecute_status("2");
- instructionService.update(inst);
- byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
-// OneNDCSocketConnectionAutoRun.write(data);
- agvphase = 0;
- index = 0;
- inst = null;
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
- } else {
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
-
- }
- }
-
- if (agvphase == 0x07) {
- if (ObjectUtil.isNotEmpty(inst)) {
- inst.setExecute_status("5");
- instructionService.update(inst);
- byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
-// OneNDCSocketConnectionAutoRun.write(data);
- agvphase = 0;
- index = 0;
- inst = null;
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
- } else {
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
- }
- }
-
- if (agvphase == 0x09) {
- if (ObjectUtil.isNotEmpty(inst)) {
- inst.setExecute_status("6");
- instructionService.update(inst);
- byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
-// OneNDCSocketConnectionAutoRun.write(data);
- agvphase = 0;
- index = 0;
- inst = null;
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
- } else {
- logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
-
- }
- }
+// if (agvphase == 0x03) {
+// if (ObjectUtil.isNotEmpty(inst)) {
+// inst.setExecute_status("1");
+// instructionService.update(inst);
+// byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
+// agvphase = 0;
+// index = 0;
+// inst = null;
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
+// } else {
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
+//
+// }
+// }
+//
+// if (agvphase == 0x05) {
+// if (ObjectUtil.isNotEmpty(inst)) {
+// inst.setExecute_status("2");
+// instructionService.update(inst);
+// byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
+//// OneNDCSocketConnectionAutoRun.write(data);
+// agvphase = 0;
+// index = 0;
+// inst = null;
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
+// } else {
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
+//
+// }
+// }
+//
+// if (agvphase == 0x07) {
+// if (ObjectUtil.isNotEmpty(inst)) {
+// inst.setExecute_status("5");
+// instructionService.update(inst);
+// byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
+//// OneNDCSocketConnectionAutoRun.write(data);
+// agvphase = 0;
+// index = 0;
+// inst = null;
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
+// } else {
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
+// }
+// }
+//
+// if (agvphase == 0x09) {
+// if (ObjectUtil.isNotEmpty(inst)) {
+// inst.setExecute_status("6");
+// instructionService.update(inst);
+// byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
+//// OneNDCSocketConnectionAutoRun.write(data);
+// agvphase = 0;
+// index = 0;
+// inst = null;
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "反馈成功");
+// } else {
+// logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + agvphase + "等待反馈");
+//
+// }
+// }
}
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
index c39adc2f1..1034152a5 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/OpcServerServiceImpl.java
@@ -70,24 +70,24 @@ public class OpcServerServiceImpl implements OpcServerService, ApplicationAutoIn
public Group getServer(String code) {
synchronized(this.buildLock(code)) {
Group group = null;
- group = (Group)this.groups.get(code);
- if (group != null) {
- label68: {
- Group var10000;
- try {
- if (!group.isActive()) {
- break label68;
- }
-
- var10000 = group;
- } catch (JIException var14) {
- log.error(code, var14);
- break label68;
- }
-
- return var10000;
- }
- }
+// group = (Group)this.groups.get(code);
+// if (group != null) {
+// label68: {
+// Group var10000;
+// try {
+// if (!group.isActive()) {
+// break label68;
+// }
+//
+// var10000 = group;
+// } catch (JIException var14) {
+// log.error(code, var14);
+// break label68;
+// }
+//
+// return var10000;
+// }
+// }
Server server = (Server)this.servers.get(code);
boolean needcreate = false;
diff --git a/acs/nladmin-ui/src/views/acs/device/driver/device_status.vue b/acs/nladmin-ui/src/views/acs/device/driver/device_status.vue
new file mode 100644
index 000000000..92161b237
--- /dev/null
+++ b/acs/nladmin-ui/src/views/acs/device/driver/device_status.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+ 指令相关：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+