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

双工位RGV驱动修改

Browse Source
This commit is contained in:
张江玮
2023-01-12 12:13:34 +08:00
parent db73b74654
commit c6b177e6cd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java
View File

@@ -292,7 +292,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev
} }
} }
//前工位放货时判断放货位光电信号 //前工位放货时判断放货位光电信号
if (mode == 3 && action1 == 3 && move1 == 1 && task1 > 0) { if (mode == 3 && action1 == 3 && move1 == 1 && task1 > 0 && action2 != 3) {
Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1)); Instruction inst1 = instructionService.findByCodeFromCache(String.valueOf(task1));
String next_device_code = inst1.getNext_device_code(); String next_device_code = inst1.getNext_device_code();
Device nextDevice = deviceAppservice.findDeviceByCode(next_device_code); Device nextDevice = deviceAppservice.findDeviceByCode(next_device_code);

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/scanGroup/HcwNumEnum.java
View File

@@ -5,7 +5,7 @@ package org.nl.wms.pda.scanGroup;
*/ */
public enum HcwNumEnum { public enum HcwNumEnum {
KLZHCQ(1, "KLZHCQ", 10), KLZHCQ(1, "KLZHCQ", 10),
KLZCQ(2, "KLZCQ", 26), KLZCQ(2, "KLZCQ", 25),
MLZZCQ(3, "MLZZCQ", 26), MLZZCQ(3, "MLZZCQ", 26),
YLJQ(4, "YLJQ", 8), YLJQ(4, "YLJQ", 8),
HNJQ(5, "HNJQ", 2), HNJQ(5, "HNJQ", 2),