From 63982856d55e3e0c64886be9c99d7beaaf39ca00 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 08 九月 2025 14:24:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 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 6b29b4d..e20d4dd 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -169,15 +169,17 @@
}
}
- //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
- String matnr = findLocNoAttributeVo.getMatnr();
- Mat mat = matService.selectByMatnr(matnr);
- if (mat == null) {
- throw new CoolException(matnr + "鐗╂枡淇℃伅涓嶅瓨鍦�");
- }
+ if (staDescId != 10) {
+ //妫�娴嬫槸鍚︿负鍛嗘粸鏂�
+ String matnr = findLocNoAttributeVo.getMatnr();
+ Mat mat = matService.selectByMatnr(matnr);
+ if (mat == null) {
+ throw new CoolException(matnr + "鐗╂枡淇℃伅涓嶅瓨鍦�");
+ }
- if (mat.getTscp() != null && mat.getTscp() == 1) {
- crnList.add(0, 1);
+ if (mat.getTscp() != null && mat.getTscp() == 1) {
+ crnList.add(0, 1);
+ }
}
}else if (barcode.startsWith("16")) {
crnList.add(6);
@@ -504,6 +506,18 @@
break;
}
}
+
+ if(targetLocMast == null) {
+ //娣卞簱浣嶆壘瀹岄兘娌℃壘鍒帮紝鐩存帴鎵炬祬搴撲綅
+ for (LocMast locMast : locMastsList) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast, locTypeDto)) {
+ continue;
+ }
+
+ //绌哄簱浣嶇洿鎺ラ�夋嫨
+ targetLocMast = locMast;
+ }
+ }
}
return targetLocMast;
--
Gitblit v1.9.1