src/main/java/com/zy/asrs/service/OrderService.java
@@ -15,6 +15,8 @@ List<OrderDetl> selectWorkingDetls(Long orderId); List<OrderDetl> selectTotalDetls(Long orderId); boolean updateSettle(Long orderId, Long settle, Long userId); void checkComplete(String orderNo); @@ -28,6 +30,13 @@ /** * 订单合并预览 */ OrderMergeVo mergePreview(List<Long> ids); List<OrderMergeVo> mergePreview(List<Long> ids); /** * 查询上报完结历史档 * @return */ List<Order> selectToBeHistoryOrder(); List<Order> selectOrderNoL(String orderNo); }