小盒子打印顺序

This commit is contained in:
bo.wu@finesys.com.cn 2025-06-21 19:23:55 +08:00
parent 9238cd419b
commit db35603d0b

View File

@ -906,7 +906,7 @@ public class TaskController {
.set(PickTask::getLastUpdateTime, LocalDateTime.now()) .set(PickTask::getLastUpdateTime, LocalDateTime.now())
.eq(PickTask::getVehicleId, boxArriveRequest.getVehicleNo()) .eq(PickTask::getVehicleId, boxArriveRequest.getVehicleNo())
.eq(PickTask::getPickStatus, PickTaskStatusEnum.TEMP.getCode())); .eq(PickTask::getPickStatus, PickTaskStatusEnum.TEMP.getCode()));
// 重置当前站台非当前箱子的已完成拣选任务 // 重置当前站台非当前箱子的已完成拣选任务 todo
pickTaskService.update(new LambdaUpdateWrapper<PickTask>() pickTaskService.update(new LambdaUpdateWrapper<PickTask>()
.set(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode()) .set(PickTask::getPickStatus, PickTaskStatusEnum.NEW.getCode())
.set(PickTask::getLastUpdateTime, LocalDateTime.now()) .set(PickTask::getLastUpdateTime, LocalDateTime.now())
@ -1588,7 +1588,7 @@ public class TaskController {
outsideVehiclesService.updateById(currentGoodsVehicle); outsideVehiclesService.updateById(currentGoodsVehicle);
} }
} else { } else {
// 更新流转载具表剩余数量 // 更新流转载具表剩余数量 todo
if (currentGoodsVehicle != null) { if (currentGoodsVehicle != null) {
currentGoodsVehicle.setRemainNum(currentGoodsVehicle.getRemainNum().add(workConfirmRequest.getRemainNumReal().subtract(workConfirmRequest.getRemainNumOrigin()))); currentGoodsVehicle.setRemainNum(currentGoodsVehicle.getRemainNum().add(workConfirmRequest.getRemainNumReal().subtract(workConfirmRequest.getRemainNumOrigin())));
outsideVehiclesService.updateById(currentGoodsVehicle); outsideVehiclesService.updateById(currentGoodsVehicle);
@ -2365,6 +2365,8 @@ public class TaskController {
logger.info("获取打印标签成功。"); logger.info("获取打印标签成功。");
response.setCode(ResponseCode.OK.getCode()); response.setCode(ResponseCode.OK.getCode());
response.setMessage("获取打印标签成功。"); response.setMessage("获取打印标签成功。");
//把boxPrintDatas根据SequenceNo进行排序
boxPrintDatas.sort(Comparator.comparingInt(BoxPrintData::getSequenceNo));
response.setReturnData(boxPrintDatas); response.setReturnData(boxPrintDatas);
return convertJsonString(response); return convertJsonString(response);
} catch (Exception e) { } catch (Exception e) {