From 0178712209fa92d55f1af021f6cfb1cd201ee474 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期一, 07 十月 2024 14:22:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d9a1a2b..d301e2e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -286,7 +286,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -325,7 +325,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -354,7 +354,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
break;
}
@@ -384,7 +384,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -401,7 +401,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -445,7 +445,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
}
}
@@ -548,9 +548,13 @@
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}, crnNo={}", staDescId, sourceStaNo, locMast.getCrnNo());
if (sourceStaNo==103 && locMast.getCrnNo()==3){
- throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�");
+ throw new CoolException("璇锋斁鍒�203鍏ュ簱鍙�--1000");
}else if (sourceStaNo==203 && locMast.getCrnNo()==1){
- throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�");
+ throw new CoolException("璇锋斁鍒�103鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==113 && locMast.getCrnNo()==3){
+ throw new CoolException("璇锋斁鍒�213鍏ュ簱鍙�--1000");
+ }else if (sourceStaNo==213 && locMast.getCrnNo()==1){
+ throw new CoolException("璇锋斁鍒�113鍏ュ簱鍙�--1000");
}else {
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
--
Gitblit v1.9.1