From c588ec9236ef644fe13af957920198bdcb4e05e8 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 29 三月 2025 13:44:38 +0800
Subject: [PATCH] #输送线循环覆写由plc执行
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 46 +++++++++++++++-------------------------------
1 files changed, 15 insertions(+), 31 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 037ce7a..7c53b3c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -159,31 +159,15 @@
StaProtocol staProtocol5 = getClonedStation(devpThread, staProtocol.getSiteId() - 1);
if (staProtocol5 != null && (staProtocol5.isLoading() && (staProtocol5.getStaNo() == 107 || staProtocol5.getStaNo() == 109))) {
short workNo = staProtocol5.getWorkNo();
-
- // **鍏堟竻闆讹紝绛夊緟 100ms**
- staProtocol5.setWorkNo((short) 0);
- staProtocol5.setStaNo((short) 0);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol5));
- Thread.sleep(100);
-
- // **鍐嶅啓鍏ョ洰鏍囧��**
staProtocol5.setWorkNo(workNo);
staProtocol5.setStaNo((short) 112);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol5));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol5));
}
} else {
short workNo = staProtocol.getWorkNo();
-
- // **鍏堟竻闆讹紝绛夊緟 100ms**
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 0);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- Thread.sleep(100);
-
- // **鍐嶅啓鍏ョ洰鏍囧��**
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo((short) 112);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
}
}
}
@@ -212,13 +196,13 @@
StaProtocol staProtocol = devpThread.getStation().get(112);
StaProtocol staProtocol2 = devpThread.getStation().get(116);
- StaProtocol staProtocol3 = devpThread.getStation().get(117);
- if(Objects.equals(staProtocol3.getWorkNo(), staProtocol.getWorkNo()) && staProtocol.getWorkNo() != 0){
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 0);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- Thread.sleep(100); // 璁� PLC 璇嗗埆鍙樺寲
- }
+// StaProtocol staProtocol3 = devpThread.getStation().get(117);
+// if(Objects.equals(staProtocol3.getWorkNo(), staProtocol.getWorkNo()) && staProtocol.getWorkNo() != 0){
+// staProtocol.setWorkNo((short) 0);
+// staProtocol.setStaNo((short) 0);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// Thread.sleep(100); // 璁� PLC 璇嗗埆鍙樺寲
+// }
if (staProtocol == null || staProtocol.getWorkNo() == 0 || !staProtocol.isLoading() ) {
continue;
}
@@ -234,18 +218,18 @@
continue;
}
- // 鍏堟竻闆�
+// 鍏堟竻闆�
short workNo = staProtocol.getWorkNo();
short oldStaNo = staProtocol.getStaNo();
- staProtocol.setWorkNo((short) 0);
- staProtocol.setStaNo((short) 0);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- Thread.sleep(100); // 璁� PLC 璇嗗埆鍙樺寲
+// staProtocol.setWorkNo((short) 0);
+// staProtocol.setStaNo((short) 0);
+// MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+// Thread.sleep(100); // 璁� PLC 璇嗗埆鍙樺寲
// 鍐嶅啓鍏ョ洰鏍囩珯鐐�
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
Thread.sleep(200);
log.info("Shifted from cycle station 112 to target {}, workNo: {}", taskWrk.getTargetPoint(), workNo);
--
Gitblit v1.9.1