From c8daee5975e5a6f5c844e1fceb65a3a682253c0e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 06 三月 2024 11:51:23 +0800
Subject: [PATCH] #四项库拣料回库时合并wrkdetl到locdetl

---
 src/main/java/com/zy/asrs/service/OrderService.java |    8 +++++++-
 1 files changed, 7 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..645a580 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -23,11 +23,17 @@
 
     void remove(Long orderId);
 
+    void report(Long orderId, String username);
+
     List<Order> selectComplete();
 
     /**
      * 璁㈠崟鍚堝苟棰勮
      */
-    OrderMergeVo mergePreview(List<Long> ids);
+    List<OrderMergeVo> mergePreview(List<Long> ids);
+
+    List<Order> selectorderNoL(String orderNo);
+
+    List<Order> selectToBeHistoryOrder();
 
 }

--
Gitblit v1.9.1