From 67cb49032b0efff478b2432713d62c305e4e53ce Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 17:42:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/OrderService.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index d29343c..97876c7 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +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.WrkDetl;
-import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.OrderMergeVo;
import java.util.List;
@@ -16,12 +14,26 @@
boolean updateSettle(Long orderId, Long settle, Long userId);
- void checkComplete(String orderNo);
+ boolean updateSettle2(Long orderId, Long settle, Integer pltType,String inTime);
+
+
+ void checkComplete(String orderNo, Integer pltType);
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