From da3bbf602cf91249b31c8b01eba0f5c2bf9edea7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 11 九月 2025 13:01:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 22 +++++++++++++++++++++-
1 files changed, 21 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 2716ac4..e5d9d87 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -12,12 +12,32 @@
Order selectByNo(String orderNo);
+ List<Order> selectBySettle(Long settle);
+
List<OrderDetl> selectWorkingDetls(Long orderId);
boolean updateSettle(Long orderId, Long settle, Long userId);
void checkComplete(String orderNo);
- boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls);
+ boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+ void remove(Long orderId);
+
+ List<Order> selectComplete();
+ List<Order> selectComplete1();
+ List<Order> selectComplete99();
+ List<Order> selectComplete8();
+
+ boolean addToLogTable(Order order);
+
+ List<Order> selectorderNoL(String orderNo);
+
+ Order selectOrderMoveStatus();
+ Order selectOrderMoveStatusInitial();
+
+ List<String> AllStatusSatisfyOrder(Integer moveStatus);
+
+ boolean updateOrderStatus(String orderNo);
}
--
Gitblit v1.9.1