From ecb8d4fceb450fcfc8d527cd448914f96a52bf97 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 15:11:32 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/common/service/CommonService.java | 25 +++++++++++++++++--------
1 files changed, 17 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..003f292 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;
}
@@ -378,13 +378,18 @@
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
+ //妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ if (!Utils.checkOutsideLocIsDFX(locMast0.getLocNo())) {
+ //鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
+ continue;
+ }
// 娴呭簱浣嶇鍚堝昂瀵告娴�
if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -401,7 +406,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
flag = true;
break;
@@ -445,7 +450,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 5)) {
locMast = locMast0;
}
}
@@ -548,9 +553,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