From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/service/OrderService.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 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 d29343c..ba3f2a4 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;
@@ -22,6 +20,37 @@
void remove(Long orderId);
+ //涓嬫帹
List<Order> selectComplete();
+ //淇濆瓨
+ List<Order> selectCompleteSave();
+ //鎻愪氦
+ List<Order> selectComplete1();
+ //瀹℃牳
+ List<Order> selectCompletemEmo0();
+ List<Order> selectCompletemEmo1();
+
+ List<Order> selectCompletemEmo2();
+
+ List<Order> selectCompletemEmo3();
+
+ List<Order> selectCompletemEmo4();
+
+ List<Order> selectComplete2();
+
+
+ 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