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 | 2 +-
src/main/resources/application.yml | 4 ++--
2 files changed, 3 insertions(+), 3 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 8ae7b7b..28c91e4 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3237,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));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 0e0de48..cbad042 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -151,7 +151,7 @@
ip: 10.10.10.150
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 104
crnId: 1
# LED2
led[1]:
@@ -159,6 +159,6 @@
ip: 10.10.10.151
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 104
+ staArr: 102
crnId: 1
--
Gitblit v1.9.1