From 6883e31331af4633d1b7d74ea7deb5f972afa05d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 20:02:19 +0800
Subject: [PATCH] 新增移库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 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..7b981c9 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -29,6 +30,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "搴撲綅淇℃伅")
@@ -43,13 +45,25 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
- return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true)));
+ List<String> list = new ArrayList<>();
+ list.add("row");
+ list.add("col");
+ list.add("lev");
+ return R.ok().add(locService.page(pageParam, pageParam.buildWrapper(true,list)));
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@PostMapping("/loc/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(locService.list());
+ }
+
+ @PreAuthorize("hasAuthority('manager:loc:list')")
+ @PostMapping("/loc/areaNoUse/list")
+ public R areaNoUselist(@RequestBody Map<String, Object> map) {
+ List<Loc> list = locService.list();
+ List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
+ return R.ok(list1);
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -100,11 +114,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 +191,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