pjb
2025-03-08 83b51a5a0774ea8ecb9a06304af3b956a21307c8
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java
@@ -73,14 +73,7 @@
                if (taskDetls.isEmpty()) {
                    throw new CoolException("任务明细不存在");
                } else { //TODO 先更新订单,后删除任务明细。任务为53时,需更新明细。
//                    if (task.getTaskType() == 53L) {
//                        List<Long> waveIds = taskDetls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
//                        List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
//                        orders.forEach(order -> {
//
//                        });
//                    } else {
                } else {
                        //任务类型为53,根据WaveId修改订单明细
                        for (TaskDetl taskDetl : taskDetls) {
                            if (taskDetl.getDetlId() == null) {
@@ -98,6 +91,7 @@
                            }
                            //检测订单是否完成
                            boolean checkOrderComplete = orderService.checkOrderComplete(orderDetl.getOrderId());
                            if (checkOrderComplete) {
                                //订单已经完成
                                Order order = orderService.getById(orderDetl.getOrderId());
@@ -112,7 +106,6 @@
                            }
                        }
//                    }
                }
                //删除任务历史档案
@@ -221,7 +214,7 @@
                taskLog.setId(null);
                if (!taskLogService.save(taskLog)) {
                    throw new CoolException("保存任务历史档失败");
                } else { //fixme 历史任务档保存后,修改订单状态信息后,再删除任务档
                } else {
                    //更新订单信息
                    taskDetls.forEach(taskDetl -> {
                        if (taskDetl.getDetlId() != null) {