From e80184f5d053bff9d0f7fdaade6c800bee84c7dd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 15 四月 2025 12:49:57 +0800
Subject: [PATCH] #修改 1. 新增综合订单管理 2. 新增综合明细订单管理
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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..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
@@ -98,14 +98,14 @@
@Transactional(rollbackFor = Exception.class)
public R update(@RequestBody Loc loc) {
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("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触!@锛�");
}
@@ -159,18 +159,54 @@
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("搴撲綅鍒濆鍖�")
@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())) {
+ return R.error("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.getAreaId())) {
- throw new CoolException("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
+ return R.error("搴撳尯ID涓嶈兘涓虹┖锛侊紒");
}
- return locService.initLocs(param);
+ if (Objects.isNull(param.getStartRow())) {
+ return R.error("璧峰鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndRow())) {
+ return R.error("缁堟鎺掍笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartBay())) {
+ return R.error("璧峰鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndBay())) {
+ return R.error("缁堟鍒椾笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getStartLev())) {
+ return R.error("璧峰灞備笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getEndLev())) {
+ return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
+ }
+ return locService.initLocs(param, getLoginUserId());
}
}
--
Gitblit v1.9.1