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/OrderPakinService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderPakinService.java b/src/main/java/com/zy/asrs/service/OrderPakinService.java
index 0d21930..dcaf604 100644
--- a/src/main/java/com/zy/asrs/service/OrderPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderPakinService.java
@@ -12,6 +12,8 @@
OrderPakin selectByNo(String orderNo);
+ List<OrderPakin> selectBySettle(Long settle);
+
List<OrderDetlPakin> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
@@ -32,4 +34,8 @@
OrderPakin selectOrderMoveStatus();
OrderPakin selectOrderMoveStatusInitial();
+ List<String> AllStatusSatisfyOrder(Integer moveStatus);
+
+ boolean updateOrderStatus(String orderNo);
+
}
--
Gitblit v1.9.1