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