From c65db22f67af8018ae7105ea00d8743e42835e13 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 29 三月 2025 15:52:09 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/OrderService.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 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 f30439c..722bdf4 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,8 +1,8 @@
 package com.zy.asrs.service;
 
-import com.zy.asrs.entity.Order;
 import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.OrderMergeVo;
 
 import java.util.List;
 
@@ -12,6 +12,33 @@
 
     List<OrderDetl> selectWorkingDetls(Long orderId);
 
+    boolean updateTel(Long orderId, String tel);
+
     boolean updateSettle(Long orderId, Long settle, Long userId);
 
+    boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime);
+
+
+    void checkComplete(String orderNo, Integer pltType);
+
+    void checkComplete2(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