From 2561f81f2c28480502f51775e618bceeb053644c Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 06 十一月 2025 09:29:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/service/OrderPakoutService.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/OrderPakoutService.java b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
index 09643a1..d0836cd 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakoutService.java
@@ -12,6 +12,8 @@
 
     OrderPakout selectByNo(String orderNo);
 
+    List<OrderPakout> selectBySettle(Long settle);
+
     List<OrderDetlPakout> selectWorkingDetls(Long orderId);
 
     boolean updateSettle(Long orderId, Long settle, Long userId);
@@ -32,4 +34,8 @@
     OrderPakout selectOrderMoveStatus();
     OrderPakout selectOrderMoveStatusInitial();
 
+    List<String> AllStatusSatisfyOrder(Integer moveStatus);
+
+    boolean updateOrderStatus(String orderNo);
+
 }

--
Gitblit v1.9.1