From 4eb5d44418c179f5ac087ce13311741ebad7e19b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 24 三月 2025 10:19:24 +0800
Subject: [PATCH] #新增 1. 新增逻辑分区主子表
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 8d7f157..2c900a8 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
@@ -22,6 +22,7 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
@@ -76,8 +77,7 @@
if (Objects.isNull(loc.getTypeIds())) {
throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
}
- List<Long> lists = JSONArray.parseArray(loc.getTypeIds(), Long.class);
- String join = StringUtils.join(lists, ",");
+ String join = StringUtils.join(loc.getTypeIds(), ",");
loc.setType(join);
loc.setCreateBy(getLoginUserId());
@@ -87,7 +87,7 @@
}
if (!locService.saveType(loc)) {
- throw new CoolException("搴撲綅绫诲瀷淇濆瓨澶辫触锛侊紒");
+ throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
}
return R.ok("Save Success").add(loc);
}
@@ -95,11 +95,19 @@
@PreAuthorize("hasAuthority('manager:loc:update')")
@OperationLog("Update 搴撲綅淇℃伅琛�")
@PostMapping("/loc/update")
+ @Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
loc.setUpdateBy(getLoginUserId());
- loc.setUpdateTime(new Date());
+ 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("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
}
return R.ok("Update Success").add(loc);
}
@@ -151,6 +159,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("搴撲綅鍒濆鍖�")
@@ -159,9 +179,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