From 8095d456d66c6f109dc8fc03c06dc2bd29f5b75b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 30 三月 2025 12:48:57 +0800
Subject: [PATCH] #输送线超重优化
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 35 ++++++++---------------------------
1 files changed, 8 insertions(+), 27 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 7c53b3c..40067e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -164,10 +164,12 @@
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol5));
}
} else {
- short workNo = staProtocol.getWorkNo();
- staProtocol.setWorkNo(workNo);
- staProtocol.setStaNo((short) 112);
- MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+ if(staProtocol.isLoading() && (staProtocol.getStaNo() == 105 || staProtocol.getStaNo() == 110 || staProtocol.getStaNo() == 111)){
+ short workNo = staProtocol.getWorkNo();
+ staProtocol.setWorkNo(workNo);
+ staProtocol.setStaNo((short) 112);
+ MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, staProtocol));
+ }
}
}
}
@@ -195,21 +197,7 @@
}
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 璇嗗埆鍙樺寲
-// }
- if (staProtocol == null || staProtocol.getWorkNo() == 0 || !staProtocol.isLoading() ) {
- continue;
- }
- if(staProtocol.getStaNo() != 112){
- continue;
- }
- if(staProtocol.getWorkNo() == staProtocol2.getWorkNo()) {
+ if (staProtocol.getStaNo() != 112 || staProtocol.getWorkNo() == 0 || !staProtocol.isLoading() || staProtocol.getWorkNo() > 9000 || staProtocol.getWorkNo() < 6000) {
continue;
}
// 鏌ヨ浠诲姟淇℃伅
@@ -218,14 +206,7 @@
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(workNo);
staProtocol.setStaNo(Short.valueOf(taskWrk.getTargetPoint()));
@@ -984,7 +965,7 @@
}
int storeCount = basDevpService.getStoreCount();
if(storeCount >= maxCount){
- log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄�");
+ log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄恵}",storeCount);
break;
}
--
Gitblit v1.9.1