From 9f5e97c05c5d503dab0ecef9a8a2139e50087690 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 27 二月 2026 16:40:19 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
index a84cdc8..5024eeb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java
@@ -47,6 +47,14 @@
return R.ok().add(page);
}
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
+ @PostMapping("/basStation/page/v1")
+ public R pagev22(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<BasStation, BaseParam> pageParam = new PageParam<>(baseParam, BasStation.class);
+ return R.ok().add(basStationService.page(pageParam, pageParam.buildWrapper(true)));
+ }
+
@PreAuthorize("hasAuthority('manager:basStation:list')")
@PostMapping("/basStation/list")
public R list(@RequestBody Map<String, Object> map) {
@@ -72,8 +80,6 @@
station.setContainerTypes(longs1);
}
-
-
return R.ok().add(station);
}
@@ -95,6 +101,12 @@
if (null !=basStation.getContainerTypes()){
basStation.setContainerType(basStation.getContainerTypes().toString());
}
+ if (Cools.isEmpty(basStation.getStationAlias())){
+ basStation.setStationAlias(new ArrayList<>());
+ basStation.getStationAlias().add(basStation.getStationName());
+ } else if (!basStation.getStationAlias().contains(basStation.getStationName())){
+ basStation.getStationAlias().add(basStation.getStationName());
+ }
if (!basStationService.save(basStation)) {
return R.error("淇濆瓨澶辫触");
}
@@ -116,6 +128,12 @@
if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)){
basStation.setBarcode(null);
}
+ if (Cools.isEmpty(basStation.getStationAlias())){
+ basStation.setStationAlias(new ArrayList<>());
+ basStation.getStationAlias().add(basStation.getStationName());
+ } else if (!basStation.getStationAlias().contains(basStation.getStationName())){
+ basStation.getStationAlias().add(basStation.getStationName());
+ }
if (!basStationService.updateById(basStation)) {
return R.error("鏇存柊澶辫触");
}
--
Gitblit v1.9.1