From a395c37ac600ec6c73fed890ba94ede9fec5cc68 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期一, 12 八月 2024 17:12:04 +0800
Subject: [PATCH] #标记
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++++++++--
src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java | 2 +-
2 files changed, 21 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 9b6900c..414df90 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5441,7 +5441,9 @@
if (basJarMastList.size() != jarMaxLoc){
return false;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0&&(basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7)){
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
+ && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
+ && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
return false;
}
@@ -5528,7 +5530,7 @@
if (basJarMastList10.size()==jarMaxLoc){
return false;
}
- if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0){
+ if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=7){
return false;
}
@@ -5574,6 +5576,22 @@
return false;
}
+ //涓存椂
+ if (basJar.getJarCode()==1){
+ JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
+ JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
+ if (jarOtherProtocol == null) {
+ return false;
+ }
+
+ if (!jarOtherProtocol.isAutoing() || jarOtherProtocol.jarErr!=0
+ || !jarOtherProtocol.isLeftDoor() || !jarOtherProtocol.isRightDoor()
+ || jarOtherProtocol.leftDoorOpen==1 || jarOtherProtocol.leftDoorClose==1 || jarOtherProtocol.rightDoorOpen==1 || jarOtherProtocol.rightDoorClose==1){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧涓嶆弧瓒冲墠寰�鍐峰嵈姹犳潯浠讹紝浠ｅ彿2纭寲缃愰棬娌″紑锛侊紒锛�",jarOtherProtocol.getJarNo());
+ return false;
+ }
+ }
+
//闂ㄤ綔涓� 鏃�
// if (jarProtocol.isAutoing() && jarProtocol.statusType == JarStatusType.WAITING4 && jarProtocol.jarErr==0
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0
diff --git a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
index bf94419..0ac9f54 100644
--- a/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java
@@ -34,7 +34,7 @@
}
}
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){//涓婁紶寮�寮忓喎鍗翠俊鍙�
int[] jarList =new int[]{1,2,3,4,5,6};
for (int jarNo : jarList){
--
Gitblit v1.9.1