From b4c66ec0717b21a56b317af0abd4fe2c9a3d3360 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 19 三月 2024 16:44:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 4baac62..72c2c3c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1152,6 +1152,9 @@
if (basDevp.getAgvTargetPlace()!=0){
basDevp.setAgvTargetPlace(0);
basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short)3);//1
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
}
}else {
if (basDevp.getAgvTargetPlace()!=0){
@@ -1162,6 +1165,9 @@
if (basDevp.getAgvTargetPick()!=0){
basDevp.setAgvTargetPick(0);
basDevpService.updateById(basDevp);
+ staProtocol.setAgvTypeSign((short)2);//0
+ staProtocol.setStaNo(basDevp.getDevNo().shortValue());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(4, staProtocol));
}
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c13a5aa..4667bf6 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -363,7 +363,7 @@
}
ArrayList<Integer> staNos = getStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- if (staProtocol.getAgvTypeSign()==0){ //0鍙栬揣
+ if (staProtocol.getAgvTypeSign()==0 || staProtocol.getAgvTypeSign()==2 ){ //0鍙栬揣
switch (staProtocol.getSiteId()){
case 100:
index=32;
@@ -415,7 +415,11 @@
//浠诲姟涓嬪彂娆℃暟
int writeCount = 0;
do {
- write = siemensS7Net.Write("DB102." + index, (short) 1); // 浠诲姟瀹屾垚
+ short textWrite = 1;// 浠诲姟瀹屾垚
+ if (staProtocol.getAgvTypeSign()>1){
+ textWrite = 0;// 浠诲姟澶嶄綅
+ }
+ write = siemensS7Net.Write("DB102." + index, textWrite);
if(write.IsSuccess){
writeCount=6;
}else {
--
Gitblit v1.9.1