From 84d74096a72578a83d9f3b48afa8c39b4ba0ae9a Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 25 十二月 2023 11:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/OrderService.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index f45330d..ae33263 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.plugins.Page;
+import com.zy.asrs.entity.*;
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 java.util.List;
@@ -25,4 +23,16 @@
List<Order> selectComplete();
boolean addToLogTable(Order order);
+
+ void BackToInit(String orderNo);
+
+ List<Order> selectInOrOutOrders(boolean inOrders);
+
+ void checkSettleUpdate(Long orderId);
+
+ List<Order> selectToBeHistoryOrder(boolean isERP);
+
+ List<OrderListDTO> selectAllorderNo();
+
+ Page<Order> getOrderAll(Page<Order> page);
}
--
Gitblit v1.9.1