From 2c5cd00985bb587710c67a4f642b6413c2590141 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期五, 16 十二月 2022 11:29:47 +0800
Subject: [PATCH] #

---
 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 f30439c..f5b50e5 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,8 +1,11 @@
 package com.zy.asrs.service;
 
-import com.zy.asrs.entity.Order;
 import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.Order;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.common.model.OrderMergeVo;
 
 import java.util.List;
 
@@ -14,4 +17,17 @@
 
     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();
+
+    /**
+     * 璁㈠崟鍚堝苟棰勮
+     */
+    List<OrderMergeVo> mergePreview(List<Long> ids);
+
 }

--
Gitblit v1.9.1