From cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 04 七月 2024 15:53:09 +0800
Subject: [PATCH] Merge branch 'tzhneasrs' of http://47.97.1.152:5880/r/zy-asrs into tzhneasrs
---
src/main/java/com/zy/asrs/service/OrderService.java | 18 +++++++++++++-----
1 files changed, 13 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..e2c82d4 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -1,10 +1,7 @@
package com.zy.asrs.service;
-import com.zy.asrs.entity.Order;
+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;
@@ -18,10 +15,21 @@
void checkComplete(String orderNo);
- boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
+// boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);
void remove(Long orderId);
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();
}
--
Gitblit v1.9.1