From 6dfdedd42acc696b6d13b4d74a5b898a248e85b6 Mon Sep 17 00:00:00 2001
From: gt-fuwuqi <3272660260@qq.com>
Date: 星期四, 31 十月 2024 15:48:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
src/main/resources/application.yml | 9 ++++-----
2 files changed, 7 insertions(+), 8 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 cabc0e1..a17d497 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2115,10 +2115,10 @@
} else {
staProtocol = staProtocol.clone();
}
- if (!(staProtocol.stateType == DevpStateType.AUTO && staProtocol.workType == DevpWorkType.BUSY && staProtocol.requestType == DevpRequestType.OUT)){
+ if (!(staProtocol.stateType == DevpStateType.AUTO && staProtocol.requestType == DevpRequestType.OUT)){
continue;
}
- if (staProtocol.getWorkNo() != 0){
+ if (staProtocol.getWorkNo() == 0){
continue;
}
WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", staProtocol.getWorkNo()).eq("wrk_sts", 101));
@@ -2159,7 +2159,7 @@
//璧峰浣�
new ForwardAGVTaskParam.PositionCodePaths(staNo.toString(),"05"),
//鐩爣浣�
- new ForwardAGVTaskParam.PositionCodePaths("a3","05")
+ new ForwardAGVTaskParam.PositionCodePaths("a2","05")
);
Date date = new Date();
DecimalFormat df = new DecimalFormat("0000");
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 173bc03..f25b4cc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -239,10 +239,6 @@
outSta[0]:
staNo: 124
led: ${wcs-slave.led[0].id}
- agvOutSta[0]:
- staNo: 140
- agvOutSta[1]:
- staNo: 142
devp[1]:
@@ -315,7 +311,10 @@
outSta[5]:
staNo: 3012
led: ${wcs-slave.led[3].id}
-
+ agvOutSta[0]:
+ staNo: 1040
+ agvOutSta[1]:
+ staNo: 1042
# LED1
led[0]:
id: 1
--
Gitblit v1.9.1