From 65775e1357468c9abcf29d212eb0669d8282bf7a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 16:38:40 +0800
Subject: [PATCH] fix:收货单字段修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 51e73c1..3a91dc6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -100,11 +100,12 @@
loc.setUpdateBy(getLoginUserId());
String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
-
+ if (Objects.isNull(loc.getTypeIds())) {
+ throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
if (!locService.updateById(loc)) {
return R.error("Update Fail");
}
-
if (!locService.updateLoc(loc)) {
throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
}
@@ -176,34 +177,36 @@
@PostMapping("/loc/init")
public R initLocInfo(@Valid @RequestBody LocMastInitParam param) {
if (Objects.isNull(param)) {
- throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+ return R.error("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getTypeIds()) && param.getTypeIds().isEmpty()) {
+ return R.error("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getWarehouseId())) {
- throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ return R.error("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getAreaId())) {
- throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+ return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getStartRow())) {
- throw new CoolException("璧峰鎺掍笉鑳戒负绌猴紒锛�");
+ return R.error("璧峰鎺掍笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getEndRow())) {
- throw new CoolException("缁堟鎺掍笉鑳戒负绌猴紒锛�");
+ return R.error("缁堟鎺掍笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getStartBay())) {
- throw new CoolException("璧峰鍒椾笉鑳戒负绌猴紒锛�");
+ return R.error("璧峰鍒椾笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getEndBay())) {
- throw new CoolException("缁堟鍒椾笉鑳戒负绌猴紒锛�");
+ return R.error("缁堟鍒椾笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getStartLev())) {
- throw new CoolException("璧峰灞備笉鑳戒负绌猴紒锛�");
+ return R.error("璧峰灞備笉鑳戒负绌猴紒锛�");
}
if (Objects.isNull(param.getEndLev())) {
- throw new CoolException("缁堟灞備笉鑳戒负绌猴紒锛�");
+ return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
}
-
- return locService.initLocs(param);
+ return locService.initLocs(param, getLoginUserId());
}
}
--
Gitblit v1.9.1