From c255a17d7ef4fabb37c1ac84b212768e73c42915 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 29 五月 2025 16:57:17 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 3a91dc6..59971b5 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;
@@ -14,6 +15,7 @@
import com.vincent.rsf.server.manager.controller.params.LocMastInitParam;
import com.vincent.rsf.server.manager.controller.params.LocModifyParams;
import com.vincent.rsf.server.manager.entity.Loc;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -29,6 +31,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.*;
+import java.util.stream.Collectors;
@Api(tags = "搴撲綅淇℃伅")
@@ -43,13 +46,31 @@
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) {
+ String locCode = map.get("locCode").toString();
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locCode),false);
+ List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>()
+ .eq(Loc::getAreaId, loc.getAreaId())
+ .eq(Loc::getChannel,loc.getChannel())
+ .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+ );
+ List<String> list1 = list.stream().map(obj -> obj.getCode()).collect(Collectors.toList());
+ return R.ok(list1);
}
@PreAuthorize("hasAuthority('manager:loc:list')")
@@ -144,7 +165,7 @@
if (Objects.isNull(map.get("ids"))) {
locs = locService.list();
} else {
- locs = locService.list(new LambdaQueryWrapper<Loc>().in(Loc::getId , map.get("ids")).eq(Loc::getStatus, 1));
+ locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getStatus, 1));
}
ExcelUtil.build(ExcelUtil.create(locs, Loc.class), response);
}
@@ -206,6 +227,10 @@
if (Objects.isNull(param.getEndLev())) {
return R.error("缁堟灞備笉鑳戒负绌猴紒锛�");
}
+ if (Objects.isNull(param.getChannel())) {
+ return R.error("宸烽亾涓嶈兘涓虹┖锛侊紒");
+ }
+
return locService.initLocs(param, getLoginUserId());
}
--
Gitblit v1.9.1