From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index 7998654..524f77d 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -114,6 +114,17 @@
}
@Transactional
+ public List<Order> selectComplete9() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
+ }
+ @Transactional
+ public List<Order> selectComplete10() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
+ return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
+ }
+
+ @Transactional
public List<Order> selectComplete8() {
List<OrderPakin> orderPakinList = orderPakinService.selectComplete8();
return OrderTransFormationUtil.transformationOrderListPakin(orderPakinList);
@@ -280,6 +291,16 @@
List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
}
+ @Transactional
+ public List<Order> selectComplete9() {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
+ }
+ @Transactional
+ public List<Order> selectComplete10() {
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
+ return OrderTransFormationUtil.transformationOrderListPakout(orderPakoutList);
+ }
@Transactional
public boolean addToLogTableOrder(Order order) {
@@ -436,6 +457,18 @@
List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete8();
return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
}
+ @Transactional
+ public List<Order> selectComplete9() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete9();
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete9();
+ return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
+ }
+ @Transactional
+ public List<Order> selectComplete10() {
+ List<OrderPakin> orderPakinList = orderPakinService.selectComplete10();
+ List<OrderPakout> orderPakoutList = orderPakoutService.selectComplete10();
+ return OrderTransFormationUtil.transformationOrderList(orderPakinList,orderPakoutList);
+ }
@Transactional
public boolean addToLogTableOrder(Order order) {
@@ -544,6 +577,8 @@
public abstract List<Order> selectComplete();
public abstract List<Order> selectComplete8();
+ public abstract List<Order> selectComplete9();
+ public abstract List<Order> selectComplete10();
public abstract boolean addToLogTableOrder(Order order);
--
Gitblit v1.9.1