互相循环代码bug修复

liweidong
绫Umbrella 1 month ago
parent a97b7f3b55
commit 0276a383a7
  1. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/controller/OrderBoxController.java
  2. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/IOrderBoxService.java
  3. 14
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/IOrderBoxServiceImpl.java
  4. 3
      blade-service/blade-desk/src/main/java/org/springblade/desk/logistics/service/impl/StorageMonitoringServiceImpl.java

@ -74,7 +74,7 @@ public class OrderBoxController extends BladeController {
description = "获取当前作业中心名称"
)
public R getBSWORKCENTER(){
return R.data(bsWorkCenterService.list(new LambdaQueryWrapper<BsWorkCenterEntity>().eq(BsWorkCenterEntity::getIsDeleted, 0)));
return iOrderBoxService.getBSWORKCENTER();
}
@PostMapping("/box-binding")
@ApiOperationSupport(order = 3)

@ -49,4 +49,6 @@ public interface IOrderBoxService {
R returnToWarehouseList();
R getBSWORKCENTER();
}

@ -425,6 +425,18 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
return R.data(bsWorkCenterVOList);
}
@Override
public R getBSWORKCENTER() {
List<Station> stationList = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getStationStatus, STATUS_FREE));
if (!stationList.isEmpty()) {
List<Long> list = stationList.stream().map(Station::getWcId).distinct().collect(Collectors.toList());
List<BsWorkCenterVO> bwList = bsWorkCenterService.getByIds(list);
return R.data(bwList);
}
return null;
}
/**
* 批量保存订单与任务的绑定关系
* 核心创建订单绑定记录并批量插入插入失败则回滚任务删除已创建的任务
@ -484,7 +496,7 @@ public class IOrderBoxServiceImpl implements IOrderBoxService {
*/
private R getSiteLocation(Task task) {
// 1. 查询当前工位可用的站点(状态为占用的站点)
List<Station> list = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getWcId, task.getWcId()).eq(Station::getStationStatus, STATUS_OCCUPIED));
List<Station> list = iStationService.list(new LambdaQueryWrapper<Station>().eq(Station::getWcId, task.getWcId()).eq(Station::getStationStatus, STATUS_FREE));
if (!CollectionUtils.isEmpty(list)) {
task.setStationId(list.get(0).getId()); // 分配第一个可用站点
// 更新站点状态为预占用(锁定站点)

@ -9,6 +9,7 @@ import org.springblade.desk.logistics.pojo.entity.Station;
import org.springblade.desk.logistics.pojo.entity.Task;
import org.springblade.desk.logistics.pojo.vo.AgvSchedulingTaskVO;
import org.springblade.desk.logistics.service.*;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@ -88,7 +89,7 @@ public class StorageMonitoringServiceImpl implements IStorageMonitoringService {
* - 库位ID/任务/库位信息空值校验跳过异常数据
* - 状态未变化时跳过更新减少数据库IO
*/
// @Scheduled(cron = "*/5 * * * * ?") // Spring定时任务注解,cron表达式控制执行频率
@Scheduled(cron = "0 * * * * ?") // Spring定时任务注解,cron表达式控制执行频率
@Override // 实现IStorageMonitoringService接口的抽象方法
public void monitoringStation() {
// ========== 步骤1:查询所有空闲状态的站点 ==========

Loading…
Cancel
Save