From 5bcf86d0b2793dfebe53c575853725e49fb3d230 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 十月 2024 11:18:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++---
src/main/resources/application.yml | 6 +++---
2 files changed, 8 insertions(+), 6 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 b05492e..27b7fbf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -8750,14 +8750,16 @@
add(3);
add(4);
}});
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
Integer count = basJarMastList.size();
ArrayList<Integer> wrkNoList = new ArrayList<>();
-
for (Integer staNoEnt : staNos){
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocolEnt = devpThread.getStation().get(staNoEnt);
- if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
+ if (staProtocolEnt == null || (staProtocolEnt.isLoading() && staProtocolEnt.getWorkNo()==0)){
+ log.error("绔欑偣寮傚父,璁℃暟鍔犱竴锛岀珯鐐瑰彿锛�"+staNoEnt);
+ count++;
+ } else if (staProtocolEnt != null && staProtocolEnt.getWorkNo()!=0 && !wrkNoList.contains(staProtocolEnt.getWorkNo())){
if (staProtocolEnt.getStaNo().equals(basJar.getEntStaNo$())){
count++;
wrkNoList.add(staProtocolEnt.getWorkNo());
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7b0aade..a7198eb 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -302,9 +302,9 @@
emptyInSta[2]:
staNo: 536
led: ${wcs-slave.led[0].id}
- # 绌烘澘鍏ュ簱鍙�1(涓存椂)
- emptyInSta[3]:
- staNo: 607
+# # 绌烘澘鍏ュ簱鍙�1(涓存椂)
+# emptyInSta[3]:
+# staNo: 607
# 鍏ュ簱鍙�1
inSta[0]:
staNo: 460
--
Gitblit v1.9.1