From 416e1b230c8557cc063a198dfaf8c9d9cf9e42de Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 27 二月 2026 16:31:10 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 ce8d052..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
@@ -1,6 +1,5 @@
package com.vincent.rsf.server.manager.controller;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,7 +11,7 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.BasStation;
-import com.vincent.rsf.server.manager.enums.StaUseStatusType;
+import com.vincent.rsf.server.manager.enums.LocStsType;
import com.vincent.rsf.server.manager.service.BasStationService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,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) {
@@ -73,8 +80,6 @@
station.setContainerTypes(longs1);
}
-
-
return R.ok().add(station);
}
@@ -96,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("淇濆瓨澶辫触");
}
@@ -114,9 +125,15 @@
if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){
basStation.setContainerType(basStation.getContainerTypes().toString());
}
- if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(StaUseStatusType.TYPE_O.type)){
+ 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