From 97c6a268766387d9c6834c23c9da3fdf63f3dc3f Mon Sep 17 00:00:00 2001 From: tzsk <Administrator@qq.com> Date: 星期三, 07 二月 2024 11:26:48 +0800 Subject: [PATCH] Changes --- 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 d29343c..645a580 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,6 +23,17 @@ void remove(Long orderId); + void report(Long orderId, String username); + List<Order> selectComplete(); + /** + * 璁㈠崟鍚堝苟棰勮 + */ + List<OrderMergeVo> mergePreview(List<Long> ids); + + List<Order> selectorderNoL(String orderNo); + + List<Order> selectToBeHistoryOrder(); + } -- Gitblit v1.9.1