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

更新

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-10-08 18:03:37 +08:00
parent 424d1e76b2
commit 0e19945f09
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java
View File

@@ -125,10 +125,10 @@ public class NdxyHandServiceImpl implements NdxyHandService {
status = "2"; status = "2";
status_name = "故障"; status_name = "故障";
} }
if (ndxySpecialDeviceDriver.getChecked()) { // if (ndxySpecialDeviceDriver.getChecked()) {
status = "3"; // status = "3";
status_name = "已选择"; // status_name = "已选择";
} // }
Device device_code1 = deviceAppService.findDeviceByCode(devicejo.optString("device_code")); Device device_code1 = deviceAppService.findDeviceByCode(devicejo.optString("device_code"));
jo.put("status", status); jo.put("status", status);

14
hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -2345,12 +2345,14 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
//请求删除任务 //请求删除任务
else if (phase == 0x30) { else if (phase == 0x30) {
flag = true; flag = true;
if (!ObjectUtil.isEmpty(inst)) { // if (!ObjectUtil.isEmpty(inst)) {
data = AgvService.sendAgvOneModeInst(phase, index, 0); // data = AgvService.sendAgvOneModeInst(0x8F, index, 0);
} else { // } else {
log.info("未找到对应的指令无法删除"); // log.info("未找到对应的指令无法删除");
break; // break;
} // }
data = AgvService.sendAgvOneModeInst(0x8F, index, 0);
} }
//任务删除确认 //任务删除确认
//(需要WCS反馈) //(需要WCS反馈)