From 67b5d6fdb3ec4642c186ec95a27db3a5ce584fbd Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 17 三月 2026 12:45:55 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
index fd84f81..ee84fdf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/InBoundServiceImpl.java
@@ -76,7 +76,7 @@
if (Cools.isEmpty(basStation)) {
throw new CoolException("鏈壘鍒扮珯鐐逛俊鎭�");
}
- if (!basStation.getUseStatus().equals("O")) {
+ if (!basStation.getUseStatus().equals("O") && !basStation.getUseStatus().equals("D") && !basStation.getUseStatus().equals("F")) {
throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
}
if (!Cools.isEmpty(basStation.getContainerType())) {
@@ -185,9 +185,11 @@
// }
BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, param.getTransferStationNo()));
- if (Objects.isNull(station) || (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) ) {
+ if (Objects.isNull(station) || (!station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type) && !station.getUseStatus().equals(LocStsType.LOC_STS_TYPE_D.type)) ) {
throw new CoolException("绔欑偣涓嶅瓨鍦ㄦ垨绔欑偣涓嶅浜庣┖搴撱�佺┖鏉跨姸鎬侊紒锛�");
}
+ station.setBarcode("");
+ basStationService.updateById(station);
StringBuilder errorBuilder = new StringBuilder();
List<Long> areaTypeList = LocUtils.getAreaTypeList(station.getStationName());
if (areaTypeList.isEmpty()) {
@@ -267,8 +269,9 @@
if (!taskService.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
- station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
-
+ if (!station.getType().equals(0)){
+ station.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ }
if (!basStationService.updateById(station)) {
throw new CoolException("绔欑偣鐘舵�佹洿鏂板け璐ワ紒锛�");
}
@@ -363,5 +366,4 @@
}
return R.ok();
}
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1