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

add:刻字机取放货判断工作模式

Browse Source
This commit is contained in:
gengby
2023-07-06 16:31:42 +08:00
parent 5d7c70570d
commit 3d1b6119e1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
View File

@@ -428,7 +428,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
//到达取货点
if (agvphase == 0x03) {
if (ObjectUtil.isNotEmpty(inst) && move == 1) {
if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 1) {
inst.setExecute_status(InstActionEnum.EXECUTE_TO_GET.getCode());
instructionService.update(inst);
byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -451,7 +451,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
//取货完成
if (agvphase == 0x05) {
if (ObjectUtil.isNotEmpty(inst) && move == 0) {
if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 0) {
inst.setExecute_status(InstActionEnum.EXECUTE_GET_FINISH.getCode());
instructionService.update(inst);
byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -473,7 +473,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
}
if (agvphase == 0x07) {
if (ObjectUtil.isNotEmpty(inst) && move == 0) {
if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 0) {
inst.setExecute_status(InstActionEnum.EXECUTE_TO_PUT_FALL_SEND_FULL.getCode());
instructionService.update(inst);
byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);
@@ -495,7 +495,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
}
if (agvphase == 0x09) {
if (ObjectUtil.isNotEmpty(inst) && move == 1) {
if (mode == 1 && ObjectUtil.isNotEmpty(inst) && move == 1) {
inst.setExecute_status(InstActionEnum.EXECUTE_PUT_FALL_SEND_FULL_FINISH.getCode());
instructionService.update(inst);
byte[] data = agvService.sendAgvOneModeInst(agvphase, index, 0);