From 4d7cce61317b2e2c2e90a0faf73fc57464bf698f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 20 五月 2025 07:58:47 +0800
Subject: [PATCH] 库位明细添加新字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasStationController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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..2d70b3b 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
@@ -10,6 +10,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 +33,16 @@
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())) {
+ 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);
}
- station.setAreaIds(longArray);
+
}
return R.ok().add(page);
}
@@ -80,6 +84,13 @@
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(Arrays.toString(basStation.getAreaIds()));
+ }
if (!basStationService.save(basStation)) {
return R.error("淇濆瓨澶辫触");
}
@@ -95,6 +106,9 @@
if (null !=basStation.getAreaIds()){
basStation.setCrossZoneArea(Arrays.toString(basStation.getAreaIds()));
}
+ 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