From 00985eabb51145130d4fa253b153aaeeec3a957a Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期日, 24 三月 2024 20:22:05 +0800
Subject: [PATCH] # app version

---
 src/main/java/com/zy/asrs/service/OrderService.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 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 b2c15f9..645a580 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;
 
@@ -10,6 +13,27 @@
 
     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);
+
+    void report(Long orderId, String username);
+
+    List<Order> selectComplete();
+
+    /**
+     * 璁㈠崟鍚堝苟棰勮
+     */
+    List<OrderMergeVo> mergePreview(List<Long> ids);
+
+    List<Order> selectorderNoL(String orderNo);
+
+    List<Order> selectToBeHistoryOrder();
 
 }

--
Gitblit v1.9.1