From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index 1711cc9..c023f34 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -12,6 +12,8 @@
Order selectByNo(String orderNo);
+ List<Order> selectBySettle(Long settle);
+
List<OrderDetl> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
@@ -23,7 +25,11 @@
void remove(Long orderId);
List<Order> selectComplete();
+ List<Order> selectComplete1();
+ List<Order> selectComplete99();
List<Order> selectComplete8();
+ List<Order> selectComplete10();
+ List<Order> selectComplete9();
boolean addToLogTable(Order order);
@@ -32,4 +38,8 @@
Order selectOrderMoveStatus();
Order selectOrderMoveStatusInitial();
+ List<String> AllStatusSatisfyOrder(Integer moveStatus);
+
+ boolean updateOrderStatus(String orderNo);
+
}
--
Gitblit v1.9.1