From 10610f52857314807b054d16e81b7fcda0137f58 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 30 三月 2025 12:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 59 ++++++++++++-----------------------------------------------
1 files changed, 12 insertions(+), 47 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 44573ea..c270c19 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,17 @@
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));
+ 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));
+ }
}
}
}
@@ -211,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;
}
// 鏌ヨ浠诲姟淇℃伅
@@ -234,18 +206,11 @@
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()));
- 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);
@@ -355,7 +320,7 @@
staProtocol.setStaNo((short)107);
}else if (staProtocol.getWorkNo()>=9851&&staProtocol.getWorkNo()<=9875) {
staProtocol.setStaNo((short)109);
- }else{
+ }else if (staProtocol.getWorkNo()>=9876 && staProtocol.getWorkNo() <= 9900){
staProtocol.setStaNo((short)110);
}
devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -998,9 +963,9 @@
if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
break;
}
- int storeCount = taskWrkService.getStoreCount(taskWrk.getCrnNo());
+ int storeCount = basDevpService.getStoreCount();
if(storeCount >= maxCount){
- log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", taskWrk.getCrnNo());
+ log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄恵}",storeCount);
break;
}
--
Gitblit v1.9.1