From 0f2015d89accebb6c34fef2476b040e0ed478724 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 28 一月 2025 10:41:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 86dd859..d986120 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -19,6 +19,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -81,6 +82,7 @@
orderDetlService.updateById(orderDetl);
}
}
+ order.setMemo("0");
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -152,8 +154,38 @@
}
@Override
+ public List<Order> selectCompleteSave() {
+ return this.baseMapper.selectCompleteSave();
+ }
+
+ @Override
public List<Order> selectComplete1() {
return this.baseMapper.selectComplete1();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo0() {
+ return this.baseMapper.selectCompleteMome0();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo1() {
+ return this.baseMapper.selectCompleteMome1();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo2() {
+ return this.baseMapper.selectCompleteMome2();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo3() {
+ return this.baseMapper.selectCompleteMome3();
+ }
+
+ @Override
+ public List<Order> selectCompletemEmo4() {
+ return this.baseMapper.selectCompleteMome4();
}
@Override
@@ -216,7 +248,7 @@
@Override
public List<Order> selectToBeHistoryOrder(boolean isERP) {
- int settle = isERP ? 7 : 4;
+ int settle = isERP ? 8 : 4;
return this.baseMapper.selectToBeHistoryOrder(settle);
}
--
Gitblit v1.9.1