From daa29b4c12c0cd358dfa9aa506466b4365b76805 Mon Sep 17 00:00:00 2001
From: TQS <56479841@qq.com>
Date: 星期六, 04 二月 2023 17:23:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 17 ++++++++++++++++-
1 files changed, 16 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 6f2f89f..ca077cf 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -324,6 +324,21 @@
for (LocMast one : locMasts) {
if (one.getRow1().equals(innermostRow)) {
locMast = one;
+ crnNo = locMast.getCrnNo();
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", crnNo);
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, crnNo);
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+ // 妫�娴嬬洰鏍囩珯
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+ }
break;
}
}
@@ -358,7 +373,7 @@
if (Cools.isEmpty(locMast)) {
int sign = curRow;
- while (sign != 0) {
+ while (sign != 0 && Cools.isEmpty(locMast)) {
List<LocMast> locMasts = locMastService.queryFreeLocMastEnd(sign, locTypeDto.getLocType1());
for (LocMast loc : locMasts) {
// 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
--
Gitblit v1.9.1