From b61c2d7525bcbdf02db339c1b9865c6032412a8c Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 19 三月 2026 14:10:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index bdf8dd8..3734e81 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -28,7 +28,19 @@
**/
public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
// 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
- return dto.getLocType1().equals(loc.getLocType1());
+ if (dto == null || loc == null) {
+ return false;
+ }
+ if (dto.getLocType1() != null && dto.getLocType1() > 0 && !dto.getLocType1().equals(loc.getLocType1())) {
+ return false;
+ }
+ if (dto.getLocType2() != null && dto.getLocType2() > 0 && !dto.getLocType2().equals(loc.getLocType2())) {
+ return false;
+ }
+ if (dto.getLocType3() != null && dto.getLocType3() > 0 && !dto.getLocType3().equals(loc.getLocType3())) {
+ return false;
+ }
+ return true;
}
}
--
Gitblit v1.9.1