From 383c6139926563f02fba4432effbfc27f87d88c5 Mon Sep 17 00:00:00 2001
From: bfwms <1>
Date: 星期三, 30 七月 2025 14:36:57 +0800
Subject: [PATCH] ERP对接

---
 src/main/java/com/zy/asrs/service/OrderService.java |   11 ++++++++++-
 1 files changed, 10 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..6bd073a 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/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);
 }

--
Gitblit v1.9.1