|
|
|
|
@ -1017,16 +1017,17 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { |
|
|
|
|
return stationR; |
|
|
|
|
} |
|
|
|
|
Station station = (Station) stationR.getData(); |
|
|
|
|
StationNameBoxBarcodeVO stationNameBoxBarcodeVO = new StationNameBoxBarcodeVO(); |
|
|
|
|
stationNameBoxBarcodeVO.setStation(station); |
|
|
|
|
List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>().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); |
|
|
|
|
} |
|
|
|
|
|