From a84386f98cc752516d492222684d5c850c9c7a1e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 00:00:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 18 +++++++++++++++++-
1 files changed, 17 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..878002f 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -12,12 +12,28 @@
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();
}
--
Gitblit v1.9.1