From b96e4a05a6e7d85d5a10491dbbecd22158f4e9d1 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 11 七月 2024 11:04:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index e10298d..9561966 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -169,16 +169,24 @@
crns.add(7);
boolean sign = true;
for (Integer crnNo : crns){
- List<String> locNoList = new ArrayList<>();
-
+ // 妫�娴嬭矾寰�
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", 110)
+ .eq("stn_no", staNo)
+ .eq("crn_no", crnNo);
+ StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)){
+ continue;
+ }
BasCrnp basCrnp = basCrnpService.selectById(crnNo);
if (basCrnp.getCrnSts()!=3 || !basCrnp.getOutEnable().equals("Y")){
continue;
}
- sign = true;
// 鑾峰彇搴撲綅
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").eq("crn_no", crnNo));
for (LocMast locMastS : locMasts){
+ List<String> locNoList = new ArrayList<>();
+ sign = true;
if (Cools.isEmpty(locMastS)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
@@ -194,10 +202,9 @@
locNoList.add(locMastS.getLocNo());
//灏忔枡绠变即鐢熷嚭搴�
- if (Utils.getRow(locMastS.getLocNo())<=8){
+ if (sign && Utils.getRow(locMastS.getLocNo())<=8){
String locNoOther = staNoOther(locMastS.getLocNo());
LocMast locMastOther = locMastService.selectById(locNoOther);
-
if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
if (locMastOther.getLocSts().equals("D")){
locNoList.add(locNoOther);
@@ -205,7 +212,7 @@
}else {
sign=false;
}
- }else if (Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
+ }else if (sign && Utils.getRow(locMastS.getLocNo())>=21 && Utils.getRow(locMastS.getLocNo())<=27){
String locNoOther = staNoOther(locMastS.getLocNo());
LocMast locMastOther = locMastService.selectById(locNoOther);
if (locMastOther.getLocSts().equals("D") || locMastOther.getLocSts().equals("F") || locMastOther.getLocSts().equals("R")){
--
Gitblit v1.9.1