From b3a41c6e7161a3271856605a3940bc27534efbc1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期日, 21 七月 2024 11:04:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java | 5 +++--
2 files changed, 39 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
index 3bd73bc..c9294b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarMastServiceImpl.java
@@ -204,8 +204,9 @@
statusList.add(14);//灏忚溅鍒拌揪鍐峰嵈妲�
}
case 3://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
- statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
-
+ if (type!=6){
+ statusList.add(4);//鍏ョ～鍖栫綈瀹屾垚
+ }
case 2://鍏宠繘鏂欓棬浠诲姟 //鐢熸垚鍒濆浠诲姟
statusList.add(0);//鍒濆
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 8a5b9c7..6bea44b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5128,9 +5128,10 @@
if (jarProtocol.isAutoing() && jarProtocol.jarErr==0){
if (jarWrkMastExecuteGenerate5(jarSlave,sign)){
signExecute[jarSlave.getId()-5] = true;
+ return signExecute;
//鍑虹～鍖栫綈 ===銆� 鍏ュ喎鍗存Ы
}
- return signExecute;
+ continue;
}
} catch (Exception e){
log.error("{}鍙风～鍖栫綈JarWrkMastExecute浠诲姟鍒涘缓寮傚父,寮傚父鍘熷洜={}",jarSlave.getId(),e.getMessage());
@@ -8178,13 +8179,14 @@
}
public synchronized Integer jarGetStartStaNo(Integer staNo) {
try {
- int[] jarNos=new int[]{4,2,3,1};//(607鍒嗛厤纭寲缃�)
+ int[] jarNos=new int[]{3,1,4,2};//(607鍒嗛厤纭寲缃�)
ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(607);add(608);add(609);add(610);add(611);add(612);
add(613);add(614);add(615);add(616);add(617);add(618);
add(619);add(620);add(621);add(622);
}};
ArrayList<Integer> jarNoList = new ArrayList<>();
+ ArrayList<Integer> jarNoList1 = new ArrayList<>();
ArrayList<Integer> jarNoListNow = new ArrayList<>();
for (int jarNo : jarNos) {
List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarNo, new ArrayList<Integer>() {{
@@ -8201,10 +8203,38 @@
jarNoList.add(jarNo);
}
}
- jarNoList.add(4);
- jarNoList.add(2);
- jarNoList.add(3);
- jarNoList.add(1);
+ for (int jarNo : jarNos) {
+ if (!jarNoList.contains(jarNo)){
+ jarNoList1.add(jarNo);
+ }
+ }
+ for (int jarNo : jarNoList1) {
+ List<BasJarMast> jarMastByJarIdAndStatusList = basJarMastService.getJarMastByJarIdAndStatusList(8, jarNo);
+ if (jarMastByJarIdAndStatusList.isEmpty()){
+ jarNoList.add(jarNo);
+ }
+ }
+ jarNoList1 = new ArrayList<Integer>();
+ for (int jarNo : jarNos) {
+ if (!jarNoList.contains(jarNo)){
+ jarNoList1.add(jarNo);
+ }
+ }
+ for (int jarNo : jarNoList1) {
+ List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarNo, new ArrayList<Integer>() {{
+ add(5);
+ add(6);
+ add(7);
+ add(8);
+ add(9);
+ add(13);
+ add(14);
+ add(15);
+ }});
+ if (basJarMastList.isEmpty()){
+ jarNoList.add(jarNo);
+ }
+ }
for (int jarNo : jarNoList) {
if (jarNoListNow.contains(jarNo)){
continue;
--
Gitblit v1.9.1