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

fix 更新RGV业务

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-07-18 15:13:10 +08:00
parent 71b5617841
commit 416a5b0da3
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -369,35 +369,35 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
// }
//双任务下 后工位取货完成，然后给前工位下发取满盘任务取货命令
if (mode == 3 && action_2 == 2 && action_1 == 0 && move_2 != 0 && move_1 == 0 && task2 > 0) {
if (mode == 3 && action_2 == 2 && action_1 == 0 && move_2 != 0 && move_1 == 0 && task2 > 0 && to_task1>0 && to_task2>0 ) {
if(to_command1 !=1 ){
writing("to_command1", "1");
}
}
//双任务下发 前后工位取货完成 给后工位放货命令
if (mode == 3 && action_2 == 2 && action_1 == 2 && move_2 != 0 && move_1 != 0 && task2 > 0 && task1 > 0) {
if (mode == 3 && action_2 == 2 && action_1 == 2 && move_2 != 0 && move_1 != 0 && task2 > 0 && task1 > 0 ) {
if(to_command2 !=2 ) {
writing("to_command2", "2");
}
}
//双任务下发 后工位放货完成 给前工位下发放货
if (mode == 3 && action_2 == 4 && action_1 == 2 && move_2 != 0 && move_1 != 0 && task2 > 0 && task1 > 0) {
if (mode == 3 && action_2 == 4 && action_1 == 2 && move_2 == 0 && move_1 != 0 && task2 > 0 && task1 > 0) {
if(to_command1 !=2 ) {
writing("to_command1", "2");
}
}
//后工位单任务下发 空托或者半托缓存任务
if (mode == 3 && action_2 == 2 && action_1 == 0 && move_2 > 0 && move_1 == 0 && task2 > 0 && task1 == 0) {
if (mode == 3 && action_2 == 2 && action_1 == 0 && move_2 > 0 && move_1 == 0 && task2 > 0 && task1 == 0 && to_task1==0 ) {
if(to_command2 !=2 ) {
writing("to_command2", "2");
}
}
//前工位单任务下发 强制包装的任务
if (mode == 3 && action_1 == 2 && action_2 == 0 && move_1 > 0 && move_2 == 0 && task1 > 0 && task2 == 0) {
if (mode == 3 && action_1 == 2 && action_2 == 0 && move_1 > 0 && move_2 == 0 && task1 > 0 && task2 == 0 && to_task2==0 ) {
if(to_command1 !=2 ) {
writing("to_command1", "2");
}

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

@@ -88,7 +88,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
port = Integer.parseInt(acsConfigService.findConfigFromCache().get(AcsConfig.AGVPORT));
InetSocketAddress socketAddress = new InetSocketAddress(ip, port);
byte[] b = new byte[1028];
socket = new Socket(ip, port);
socket = new Socket();
socket.connect(socketAddress,2*1000);
socket.setKeepAlive(true);//长链接
dos = new DataOutputStream(socket.getOutputStream());