FeiDaBaoKai/wms_server_kate_suzhou
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新：

Browse Source 
1. 修复拣选任务未下发的问题。
This commit is contained in:
梁州 2024-11-19 18:42:31 +08:00
parent 5175a8841f
commit ccba66f71e
2 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/wms/controller/TaskController.java
View File

@ -852,21 +852,29 @@ public class TaskController {
response.setMessage("拣选任务查询失败");
return convertJsonString(response);
}
pickTask.setPickStatus(PickTaskStatusEnum.FINISH.getCode());
pickTask.setLastUpdateTime(LocalDateTime.now());
// 更新为完成
pickTaskService.updateById(pickTask);
// 更新这个站台当前箱子的拣选任务为完成
pickTaskService.update(new LambdaUpdateWrapper<PickTask>()
.set(PickTask::getPickStatus, PickTaskStatusEnum.FINISH.getCode())
.set(PickTask::getLastUpdateTime, LocalDateTime.now())
.eq(PickTask::getVehicleId, boxArriveRequest.getVehicleNo())
.eq(PickTask::getStandId, boxArriveRequest.getLocation()));
// 更新这个箱子其他的暂存任务为待下发
pickTaskService.update(new LambdaUpdateWrapper<PickTask>()
.set(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode())
.set(PickTask::getLastUpdateTime, LocalDateTime.now())
.eq(PickTask::getVehicleId, boxArriveRequest.getVehicleNo())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.TEMP.getCode()));
// 重置当前站台非当前箱子的已完成拣选任务
pickTaskService.update(new LambdaUpdateWrapper<PickTask>()
.set(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode())
.set(PickTask::getLastUpdateTime, LocalDateTime.now())
.ne(PickTask::getVehicleId, boxArriveRequest.getVehicleNo())
.eq(PickTask::getStandId, boxArriveRequest.getLocation())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.FINISH.getCode()));
// 更新站台信息
standService.update(new LambdaUpdateWrapper<Stand>()
.set(Stand::getPickVehicle, boxArriveRequest.getVehicleNo())
.eq(Stand::getStandId, pickTask.getStandId()));
// 重置当前站台非当前箱子的已完成拣选任务
List<PickTask> otherPickTasks = pickTaskService.list(new LambdaQueryWrapper<PickTask>()
.ne(PickTask::getVehicleId, boxArriveRequest.getVehicleNo())
.eq(PickTask::getStandId, boxArriveRequest.getLocation())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.FINISH.getCode()));
otherPickTasks.forEach(otherPickTask -> otherPickTask.setPickStatus(PickTaskStatusEnum.NEW.getCode()));
pickTaskService.updateBatchById(otherPickTasks);
response.setCode(ResponseCode.OK.getCode());
response.setMessage("上报成功");

4
src/main/java/com/wms/service/business/serviceImplements/WmsJobServiceImplements.java
View File

@ -566,6 +566,10 @@ public class WmsJobServiceImplements implements IWmsJobService {
.set(PickTask::getPickStatus, PickTaskStatusEnum.SEND.getCode())
.in(PickTask::getVehicleId, vehicleAndStansMap.keySet())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode()));
pickTaskService.update(new LambdaUpdateWrapper<PickTask>()
.set(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode())
.in(PickTask::getVehicleId, vehicleAndStansMap.keySet())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.TEMP.getCode()));
} else {
logger.error("发送拣选任务错误：{}", convertJsonString(result));
}