From 83beaad1e6b65377ded9e17302298ffc4b562441 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期一, 08 十二月 2025 09:41:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ca16ea9..030bd97 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -284,13 +284,6 @@
throw new CoolException(crnNo + "鍙峰爢鍨涙満鍒拌揪绌哄簱浣嶉鐣欎笂闄愶紒灏哄瑙勬牸锛�" + (locTypeDto.getLocType1() == 1 ? "楂�" : "浣�"));
}
- if (crnNo == 1) {
- if (wrkMasts.size() >= 1) {
- log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), 1);
- throw new CoolException(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒");
- }
- }
-
LocMast locMast = null;
if (staDescId == 10) {
//鎼滅储绌烘墭鐩�
@@ -506,6 +499,18 @@
break;
}
}
+
+ if(targetLocMast == null) {
+ //娣卞簱浣嶆壘瀹岄兘娌℃壘鍒帮紝鐩存帴鎵炬祬搴撲綅
+ for (LocMast locMast : locMastsList) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ //绌哄簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ }
+ }
}
return targetLocMast;
--
Gitblit v1.9.1