From 94e38780aaaca83dcec2935109b9399f977f3cc4 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 15 十二月 2022 16:03:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs
---
src/main/java/com/zy/common/service/CommonService.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 11f066a..58b105a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -160,6 +160,9 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (shallowLoc.getLocType1()<locTypeDto.getLocType1()){
+ continue;
+ }
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
crnNo = locMast.getCrnNo();
--
Gitblit v1.9.1