From 203e553223a51b1e80c3d764363771c4d9453b8d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 15:06:14 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 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 2521ad4..51e73c1 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
@@ -98,7 +98,6 @@
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
-
String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
@@ -159,6 +158,18 @@
return locService.modifyLocs(locs);
}
+ @PreAuthorize("hasAuthority('manager:loc:update')")
+ @PostMapping("/loc/batch/area")
+ @ApiOperation("搴撲綅鎵归噺鍒嗗尯")
+ public R batchLocArea(@RequestBody LocModifyParams locs) {
+ if (Objects.isNull(locs)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ locs.setCreateBy(getLoginUserId());
+ locs.setUpdateBy(getLoginUserId());
+ return locService.batchBindLocs(locs);
+ }
+
@PreAuthorize("hasAuthority('manager:loc:update')")
@ApiOperation("搴撲綅鍒濆鍖�")
@@ -167,9 +178,31 @@
if (Objects.isNull(param)) {
throw new CoolException("鍒濆鍖栦俊鎭笉鑳戒负绌猴紒锛�");
}
+ if (Objects.isNull(param.getWarehouseId())) {
+ throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+ }
if (Objects.isNull(param.getAreaId())) {
throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
}
+ if (Objects.isNull(param.getStartRow())) {
+ throw new CoolException("璧峰鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndRow())) {
+ throw new CoolException("缁堟鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartBay())) {
+ throw new CoolException("璧峰鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndBay())) {
+ throw new CoolException("缁堟鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartLev())) {
+ throw new CoolException("璧峰灞備笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndLev())) {
+ throw new CoolException("缁堟灞備笉鑳戒负绌猴紒锛�");
+ }
+
return locService.initLocs(param);
}
--
Gitblit v1.9.1