From 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:26 +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 | 58 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 18 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 6bea7f0..ce8d052 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,5 +1,7 @@
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;
import com.vincent.rsf.framework.common.Cools;
@@ -10,6 +12,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.service.BasStationService;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,13 +35,15 @@
PageParam<BasStation, BaseParam> pageParam = new PageParam<>(baseParam, BasStation.class);
PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true));
for (BasStation station : page.getRecords()) {
- 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());
+ if (!Cools.isEmpty(station.getCrossZoneArea())) {
+ List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class);
+ station.setAreaIds(longs1);
}
- station.setAreaIds(longArray);
+ if (!Cools.isEmpty(station.getContainerType())) {
+ List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
+ station.setContainerTypes(longs1);
+ }
+
}
return R.ok().add(page);
}
@@ -58,18 +63,19 @@
@PreAuthorize("hasAuthority('manager:basStation:list')")
@GetMapping("/basStation/{id}")
public R get(@PathVariable("id") Long id) {
- BasStation basStation = 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());
+ BasStation station = basStationService.getById(id);
+ if (!Cools.isEmpty(station.getCrossZoneArea())) {
+ List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class);
+ station.setAreaIds(longs1);
}
- basStation.setAreaIds(longArray);
+ if (!Cools.isEmpty(station.getContainerType())) {
+ List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class);
+ station.setContainerTypes(longs1);
+ }
- return R.ok().add(basStation);
+
+
+ return R.ok().add(station);
}
@PreAuthorize("hasAuthority('manager:basStation:save')")
@@ -80,6 +86,16 @@
basStation.setCreateTime(new Date());
basStation.setUpdateBy(getLoginUserId());
basStation.setUpdateTime(new Date());
+ BasStation serviceOne = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, basStation.getStationName()));
+ if (!Cools.isEmpty(serviceOne)) {
+ return R.error(basStation.getStationName()+"绔欏凡琚垵濮嬪寲");
+ }
+ if (null !=basStation.getAreaIds()){
+ basStation.setCrossZoneArea(basStation.getAreaIds().toString());
+ }
+ if (null !=basStation.getContainerTypes()){
+ basStation.setContainerType(basStation.getContainerTypes().toString());
+ }
if (!basStationService.save(basStation)) {
return R.error("淇濆瓨澶辫触");
}
@@ -92,8 +108,14 @@
public R update(@RequestBody BasStation basStation) {
basStation.setUpdateBy(getLoginUserId());
basStation.setUpdateTime(new Date());
- if (null !=basStation.getAreaIds()){
- basStation.setCrossZoneArea(Arrays.toString(basStation.getAreaIds()));
+ if (null !=basStation.getAreaIds() && !basStation.getContainerTypes().isEmpty()){
+ basStation.setCrossZoneArea(basStation.getAreaIds().toString());
+ }
+ if (null != basStation.getContainerTypes() && !basStation.getContainerTypes().isEmpty()){
+ basStation.setContainerType(basStation.getContainerTypes().toString());
+ }
+ if (null !=basStation.getUseStatus() && basStation.getUseStatus().equals(StaUseStatusType.TYPE_O.type)){
+ basStation.setBarcode(null);
}
if (!basStationService.updateById(basStation)) {
return R.error("鏇存柊澶辫触");
--
Gitblit v1.9.1