From 058770cc7f646ed387757fdde6e45d2f92ea01c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 31 五月 2023 10:06:37 +0800
Subject: [PATCH] 2023.5.31上架区域版本兼容代码。判断当前库位组是否均为同一种物料，如不是，则认定需要执行兼容代码

---
 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