From 183d00d631493ba8689934c4b3961c705f409c83 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 01 十月 2023 09:55:01 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/OrderService.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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..2418d98 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +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;
 
@@ -18,6 +19,19 @@
 
     void checkComplete(String orderNo);
 
-    boolean saveHandlerOrder(WrkMast wrkMast, List<WrkDetl> wrkDetls);
+    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+
+    void remove(Long orderId);
+
+    void report(Long orderId, Long userId);
+
+    List<Order> selectComplete();
+
+    /**
+     * 璁㈠崟鍚堝苟棰勮
+     */
+    List<OrderMergeVo> mergePreview(List<Long> ids);
+
+    List<Order> selectorderNoL(String orderNo);
 
 }

--
Gitblit v1.9.1