From d1480e6c40cbcaf7e0dd6349153a461a3635bee3 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 19 八月 2024 09:04:39 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/service/OrderService.java | 19 ++++++++++++++++++-
1 files changed, 18 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 588f64b..6bd073a 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;
@@ -14,6 +15,8 @@
List<OrderDetl> selectWorkingDetls(Long orderId);
+ List<OrderDetl> selectTotalDetls(Long orderId);
+
boolean updateSettle(Long orderId, Long settle, Long userId);
void checkComplete(String orderNo);
@@ -22,4 +25,18 @@
void remove(Long orderId);
+ List<Order> selectComplete();
+
+ /**
+ * 璁㈠崟鍚堝苟棰勮
+ */
+ List<OrderMergeVo> mergePreview(List<Long> ids);
+
+ /**
+ * 鏌ヨ涓婃姤瀹岀粨鍘嗗彶妗�
+ * @return
+ */
+ List<Order> selectToBeHistoryOrder();
+
+ List<Order> selectOrderNoL(String orderNo);
}
--
Gitblit v1.9.1