From dd8d187c9ea82282d46a0abe9f78758704058062 Mon Sep 17 00:00:00 2001
From: rqdz <rqdz@163.com>
Date: 星期五, 14 十一月 2025 12:35:55 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 8478342..28c91e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2423,6 +2423,10 @@
public synchronized void autoEmptyOut() {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ StaProtocol staProtocol1 = devpThread.getStation().get(103);
+ if (staProtocol1.isAutoing()&&staProtocol1.isLoading()){
+ return;
+ }
List<Integer> list = new ArrayList<>();
list.add(103);//绌烘墭鐩樺嚭搴撶洰鏍囩珯闆嗗悎
Map<Integer, Integer> map = new HashMap<>();
@@ -3233,7 +3237,7 @@
// if ((crnProtocol.getCrnNo()==1 || crnProtocol.getCrnNo()==2) && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
// continue;
// }
- if (crnProtocol.getCrnNo()==1 && crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
+ if (crnProtocol.getBay()==1 && crnProtocol.getLevel() == 1) {
continue;
}
Page<BasCrnOpt> basCrnOptPage = crnOptService.selectPage(new Page<>(1, 1), new EntityWrapper<BasCrnOpt>().eq("crn_no", crn.getId()).orderBy("send_time", false));
--
Gitblit v1.9.1