From 085c9ce6ff4790838035909a7ed79280111948af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BB=ABUmbrella?= <2539020564@qq.com> Date: Mon, 23 Mar 2026 14:12:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=B5=81=E9=A1=B9=E7=9B=AE=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/logistics/service/impl/IOrderBoxServiceImpl.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java index ecc1506d..63f52255 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java @@ -1017,16 +1017,17 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { return stationR; } Station station = (Station) stationR.getData(); + StationNameBoxBarcodeVO stationNameBoxBarcodeVO = new StationNameBoxBarcodeVO(); + stationNameBoxBarcodeVO.setStation(station); List taskList = taskService.list(new LambdaQueryWrapper().eq(Task::getStationId, station.getId()).orderByDesc(Task::getUpdateTime)); if (taskList==null||taskList.size()==0) { - return R.fail("未查询到该站点任务状态"); + return R.data(stationNameBoxBarcodeVO); } R boxbarcodeDetailsR = getBoxbarcodeDetails(taskList.get(0).getBoxBarcode()); if (!boxbarcodeDetailsR.isSuccess()) { return boxbarcodeDetailsR; } - StationNameBoxBarcodeVO stationNameBoxBarcodeVO = new StationNameBoxBarcodeVO(); - stationNameBoxBarcodeVO.setStation(station); + stationNameBoxBarcodeVO.setBoxbarcodeDetailsVO((BoxbarcodeDetailsVO) boxbarcodeDetailsR.getData()); return R.data(stationNameBoxBarcodeVO); }