From 843d5b6dd50567dadcc56257f074840e80d757aa Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 18:42:18 +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/BasStationController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 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 2d70b3b..60cde28 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
@@ -42,6 +42,15 @@
}
station.setAreaIds(longArray);
}
+ if (!Cools.isEmpty(station.getContainerType())) {
+ String content = station.getContainerType().substring(1, station.getContainerType().length() - 1);
+ String[] parts = content.split(",");
+ Long[] longArray = new Long[parts.length];
+ for (int i = 0; i < parts.length; i++) {
+ longArray[i] = Long.parseLong(parts[i].trim());
+ }
+ station.setContainerTypes(longArray);
+ }
}
return R.ok().add(page);
@@ -62,18 +71,29 @@
@PreAuthorize("hasAuthority('manager:basStation:list')")
@GetMapping("/basStation/{id}")
public R get(@PathVariable("id") Long id) {
- BasStation basStation = basStationService.getById(id);
+ BasStation station = basStationService.getById(id);
- String content = basStation.getCrossZoneArea().substring(1, basStation.getCrossZoneArea().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
+ if (!Cools.isEmpty(station.getCrossZoneArea())) {
+ String content = station.getCrossZoneArea().substring(1, station.getCrossZoneArea().length() - 1);
+ String[] parts = content.split(",");
+ Long[] longArray = new Long[parts.length];
+ for (int i = 0; i < parts.length; i++) {
+ longArray[i] = Long.parseLong(parts[i].trim());
+ }
+ station.setAreaIds(longArray);
}
- basStation.setAreaIds(longArray);
+ if (!Cools.isEmpty(station.getContainerType())) {
+ String content = station.getContainerType().substring(1, station.getContainerType().length() - 1);
+ String[] parts = content.split(",");
+ Long[] longArray = new Long[parts.length];
+ for (int i = 0; i < parts.length; i++) {
+ longArray[i] = Long.parseLong(parts[i].trim());
+ }
+ station.setContainerTypes(longArray);
+ }
- return R.ok().add(basStation);
+ return R.ok().add(station);
}
@PreAuthorize("hasAuthority('manager:basStation:save')")
@@ -91,6 +111,9 @@
if (null !=basStation.getAreaIds()){
basStation.setCrossZoneArea(Arrays.toString(basStation.getAreaIds()));
}
+ if (null !=basStation.getContainerTypes()){
+ basStation.setContainerType(Arrays.toString(basStation.getContainerTypes()));
+ }
if (!basStationService.save(basStation)) {
return R.error("淇濆瓨澶辫触");
}
@@ -106,6 +129,9 @@
if (null !=basStation.getAreaIds()){
basStation.setCrossZoneArea(Arrays.toString(basStation.getAreaIds()));
}
+ if (null !=basStation.getContainerTypes()){
+ basStation.setContainerType(Arrays.toString(basStation.getContainerTypes()));
+ }
if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(StaUseStatusType.TYPE_O.type)){
basStation.setBarcode(null);
}
--
Gitblit v1.9.1