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 5a921b61..e2ed46da 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 @@ -679,14 +679,14 @@ public class IOrderBoxServiceImpl implements IOrderBoxService { if (!CollectionUtils.isEmpty(freeStationList)) { Station station = null; String stationPosition = ""; + station = freeStationList.get(0); if (station.getStatus() == SAME_LAYER) { + station = null; Station startStation = stationService.list(new LambdaQueryWrapper().eq(Station::getStationCode, startStationCode)).get(0); stationPosition = startStation.getStationPosition(); station = findByField(freeStationList, "stationPosition", stationPosition); - } else { - station = freeStationList.get(0); } if (station == null) { return R.fail("当前班次" + stationPosition + "楼层库位繁忙,请空闲后再试"); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java index 33ed9fa1..19aa9e01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java @@ -203,9 +203,13 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService { if(null != ctuSchedulingTask && ctuSchedulingTask.getCode().equals("0")){ // 添加任务 boolean record = taskExecuteRecordService.inboundRecord(ctuSchedulingTask, firstTask,null); - taskIdList.add(firstTask.getId()); - } + if (record){ + taskIdList.add(firstTask.getId()); + } + + } + log.info("taskIdList数据:{}",taskList); processedCount++; // 成功处理计数+1 } catch (Exception e) {