From 3872580fee05ed43ff23a8aee4e126ea693eb288 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 25 十月 2023 14:37:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 8ce0fd0..014616b 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -67,8 +67,10 @@
boolean sign = true;
for (Integer crnNo : crns){
sign = true;
+ //瀹滅涓撶敤 澶у皬鎵樼洏
+ short locType1= staNo==112? (short)1 : (short)2;//1:"灏忔墭鐩�"銆�2:"澶ф墭鐩�"
// 鑾峰彇搴撲綅
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo).eq("loc_type1",locType1));
if (Cools.isEmpty(locMast)) {
// throw new CoolException("搴撲腑鏃犵┖鏉匡紒锛侊紒");
@@ -85,6 +87,10 @@
.eq("stn_no", staNo)
.eq("crn_no", crnNo);
StaDesc staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)){
+ sign = false;
+ continue;
+ }
Integer sourceStaNo = staDesc.getCrnStn();
if (Cools.isEmpty(sourceStaNo)) {
// throw new CoolException("妫�绱㈡簮绔欏け璐�");
--
Gitblit v1.9.1