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

rev 判断逻辑

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2024-04-17 10:39:01 +08:00
parent 192e1a515b
commit 257f8cbece
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java
View File

@@ -374,15 +374,15 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
} }
//存在托盘才可以申请任务 //存在托盘才可以申请任务 不需要这个逻辑，先下发行架任务后送空盘
BeltConveyorDeviceDriver beltConveyorDeviceDriver; BeltConveyorDeviceDriver beltConveyorDeviceDriver;
if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { // if (nextDevice.getDeviceDriver() instanceof BeltConveyorDeviceDriver) {
beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver(); // beltConveyorDeviceDriver = (BeltConveyorDeviceDriver) nextDevice.getDeviceDriver();
if (beltConveyorDeviceDriver.getMove() != 1) { // if (beltConveyorDeviceDriver.getMove() != 1) {
notCreateInstMessage = "universal_notCreateInstMessage2"; // notCreateInstMessage = "universal_notCreateInstMessage2";
return false; // return false;
} // }
} // }
String taskid = taskDto.getTask_id(); String taskid = taskDto.getTask_id();
String taskcode = taskDto.getTask_code(); String taskcode = taskDto.getTask_code();
String start_point_code = taskDto.getStart_point_code(); String start_point_code = taskDto.getStart_point_code();