From b5e8045d5f5b5401b696db12f62fdbcc86dc5c5d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 10 四月 2025 11:40:02 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
index cd7a388..b031261 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaMatRelaController.java
@@ -109,7 +109,7 @@
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒锛�");
}
- if (!StringUtils.isBlank(param.get("locTypeId").toString())) {
+ if (!StringUtils.isBlank(param.get("typeId").toString())) {
throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
if (!StringUtils.isBlank(param.get("areaMatId").toString())) {
@@ -183,12 +183,12 @@
if (Objects.isNull(param)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(param.getAreaId())) {
- throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
- }
- if (Objects.isNull(param.getWarehouseId())) {
- throw new CoolException("浠撳簱涓嶈兘涓虹┖锛侊紒");
- }
+// if (Objects.isNull(param.getAreaId())) {
+// throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
+// }
+// if (Objects.isNull(param.getWarehouseId())) {
+// throw new CoolException("浠撳簱涓嶈兘涓虹┖锛侊紒");
+// }
if (Objects.isNull(param.getAreaMatId())) {
throw new CoolException("涓诲崟ID涓嶈兘涓虹┖锛侊紒");
}
--
Gitblit v1.9.1