From 6199756c83c8217b377e4e90c2904c8a6a6fdfbe Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 25 五月 2023 15:50:19 +0800
Subject: [PATCH] 物料类型

---
 src/main/java/com/zy/asrs/service/OrderService.java |    7 ++++++-
 1 files changed, 6 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 5a0434e..6860609 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -28,6 +28,11 @@
     /**
      * 璁㈠崟鍚堝苟棰勮
      */
-    OrderMergeVo mergePreview(List<Long> ids);
+    List<OrderMergeVo> mergePreview(List<Long> ids);
 
+    /**
+     * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+     * @return
+     */
+    List<Order> selectToBeHistoryOrder();
 }

--
Gitblit v1.9.1