src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -167,14 +167,17 @@ } @Override public OrderMergeVo mergePreview(List<Long> ids) { OrderMergeVo vo = new OrderMergeVo(); public List<OrderMergeVo> mergePreview(List<Long> ids) { List<OrderMergeVo> result = new ArrayList<>(); for (Long orderId : ids) { Order order = this.selectById(orderId); // 获取所有未作业的明细 List<OrderDetl> orderDetls = orderDetlService.selectRemainder(orderId); for (OrderDetl orderDetl : orderDetls) { } return vo; } return result; } }