From 27f0c5253fb48dbf9635d31c62d3435407f326c1 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期三, 17 八月 2022 17:48:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzynasrs' into gzynasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 15 ++++++++++++++-
1 files changed, 14 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 b2c15f9..f45330d 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -3,6 +3,8 @@
import com.zy.asrs.entity.Order;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
import java.util.List;
@@ -10,6 +12,17 @@
Order selectByNo(String orderNo);
- List<OrderDetl> selectWorkingDetls(String orderNo);
+ List<OrderDetl> selectWorkingDetls(Long orderId);
+ boolean updateSettle(Long orderId, Long settle, Long userId);
+
+ void checkComplete(String orderNo);
+
+ boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+ void remove(Long orderId);
+
+ List<Order> selectComplete();
+
+ boolean addToLogTable(Order order);
}
--
Gitblit v1.9.1