From 892b77de128f0938c56c65e79848d7b65020b12f Mon Sep 17 00:00:00 2001 From: liweidong-hj Date: Wed, 4 Mar 2026 15:58:16 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E7=8A=B6=E6=80=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/desk/logistics/pojo/entity/Station.java | 5 +++++ .../desk/logistics/service/impl/PipelineServiceImpl.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java index a561e962..79536840 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/logistics/pojo/entity/Station.java @@ -32,6 +32,11 @@ public class Station extends BaseEntity { */ public static final Integer STATUS_FREE = 1; + /** + * 状态常量：预占用 + */ + public static final Integer PRE_STATUS_OCCUPIED = 2; + /** * 站点名称 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java index 52704d15..265bb2d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/PipelineServiceImpl.java @@ -98,9 +98,11 @@ public class PipelineServiceImpl implements IPipelineService { throw new ServiceException("查询不到站点信息： "+boxBarcode); } - //查询站点 判断站点是否为空 + //查询站点 判断站点是否为空闲 Station station = stationService.getById(task.getStationId()); - if(Station.STATUS_FREE.equals(station.getStationStatus())){ + + //证明预占用 + if(Station.PRE_STATUS_OCCUPIED.equals(station.getStationStatus())){ }