diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java index 1fe670e..f706cb9 100644 --- a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java @@ -125,10 +125,10 @@ public class NdxyHandServiceImpl implements NdxyHandService { status = "2"; status_name = "故障"; } - if (ndxySpecialDeviceDriver.getChecked()) { - status = "3"; - status_name = "已选择"; - } +// if (ndxySpecialDeviceDriver.getChecked()) { +// status = "3"; +// status_name = "已选择"; +// } Device device_code1 = deviceAppService.findDeviceByCode(devicejo.optString("device_code")); jo.put("status", status); diff --git a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index b57960c..9fef1b3 100644 --- a/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -2345,12 +2345,14 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { //请求删除任务 else if (phase == 0x30) { flag = true; - if (!ObjectUtil.isEmpty(inst)) { - data = AgvService.sendAgvOneModeInst(phase, index, 0); - } else { - log.info("未找到对应的指令无法删除"); - break; - } +// if (!ObjectUtil.isEmpty(inst)) { +// data = AgvService.sendAgvOneModeInst(0x8F, index, 0); +// } else { +// log.info("未找到对应的指令无法删除"); +// break; +// } + data = AgvService.sendAgvOneModeInst(0x8F, index, 0); + } //任务删除确认 //(需要WCS反馈)