From 18c2d9bb34e3e13f33612d0b879136bd5ec0c339 Mon Sep 17 00:00:00 2001 From: Junjie <fallin.jie@qq.com> Date: 星期三, 20 九月 2023 12:41:30 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/service/OrderService.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java index 588f64b..2418d98 100644 --- a/src/main/java/com/zy/asrs/service/OrderService.java +++ b/src/main/java/com/zy/asrs/service/OrderService.java @@ -1,10 +1,11 @@ package com.zy.asrs.service; -import com.zy.asrs.entity.Order; import com.baomidou.mybatisplus.service.IService; +import com.zy.asrs.entity.Order; import com.zy.asrs.entity.OrderDetl; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; +import com.zy.common.model.OrderMergeVo; import java.util.List; @@ -22,4 +23,15 @@ void remove(Long orderId); + void report(Long orderId, Long userId); + + List<Order> selectComplete(); + + /** + * 璁㈠崟鍚堝苟棰勮 + */ + List<OrderMergeVo> mergePreview(List<Long> ids); + + List<Order> selectorderNoL(String orderNo); + } -- Gitblit v1.9.1