From 607f429d6495abb894266f37d80b9636be259cda Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 23 九月 2024 09:10:15 +0800
Subject: [PATCH] 1号堆垛报警分配2号堆垛机
---
src/main/java/com/zy/common/service/CommonService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6df83e2..d5e66f3 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -245,9 +245,12 @@
if (sourceStaNo == 305) {
// 1鍙峰贩閬撳彲鐢ㄥ簱浣�
List<LocMast> collect = locMasts.stream().filter(locMast1 -> locMast1.getCrnNo().equals(1)).collect(Collectors.toList());
+ List<LocMast> collect2 = locMasts.stream().filter(locMast1 -> locMast1.getCrnNo().equals(2)).collect(Collectors.toList());
BasCrnp crnp = basCrnpService.selectById(1);
- if (crnp.getCrnSts() == 3 && collect.size()>2) {
+ if (crnp.getCrnSts() == 3 && collect.size()>10 && crnp.getCrnErr() == 0) {
locMasts = collect;
+ } else {
+ locMasts = collect2;
}
}
--
Gitblit v1.9.1