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

add: 效率提升屏蔽光电判断

Browse Source
This commit is contained in:
ls
2026-01-19 17:06:40 +08:00
parent 38cd317d85
commit 45422b6939
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java
View File

@@ -424,14 +424,16 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
} }
BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver; //效率提升屏蔽光电判断
if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver(); // BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) { // if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
notCreateInstMessage = "universal_notCreateInstMessage2"; // boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver();
return false; // if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) {
} // notCreateInstMessage = "universal_notCreateInstMessage2";
} // return false;
// }
// }
ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver; ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver;
if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) { if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) {
@@ -553,11 +555,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
map12.put("value", interactionJsonDTO.getFrpModel()); map12.put("value", interactionJsonDTO.getFrpModel());
list.add(map12); list.add(map12);
} }
if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) { // if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
map13.put("code", "to_have_or_not"); // map13.put("code", "to_have_or_not");
map13.put("value", interactionJsonDTO.getIsHave()); // map13.put("value", interactionJsonDTO.getIsHave());
list.add(map13); // list.add(map13);
} // }
} }
this.writing(list); this.writing(list);
luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder() luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder()