From 207823b94f5627fae49d29b51b5ce7186a70c8e0 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 04 一月 2025 09:59:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 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 60e9268..6e6f778 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
@@ -18,6 +19,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -80,6 +82,7 @@
orderDetlService.updateById(orderDetl);
}
}
+ order.setMemo("0");
if (!this.updateSettle(order.getId(), 4L, null)) {
throw new CoolException("淇敼璁㈠崟銆恛rderNo = " + order.getOrderNo() + "銆戠姸鎬佷负宸插畬鎴愬け璐�");
}
@@ -151,6 +154,41 @@
}
@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> selectComplete2() {
+ return this.baseMapper.selectComplete2();
+ }
+
+ @Override
public boolean addToLogTable(Order order) {
return this.baseMapper.addToLogTable(order) > 0;
}
@@ -205,7 +243,7 @@
@Override
public List<Order> selectToBeHistoryOrder(boolean isERP) {
- int settle = isERP ? 6 : 4;
+ int settle = isERP ? 8 : 4;
return this.baseMapper.selectToBeHistoryOrder(settle);
}
@@ -214,4 +252,10 @@
return this.baseMapper.selectAllorderNo();
}
+ @Override
+ public Page<Order> getOrderAll(Page<Order> page) {
+ page.setRecords(baseMapper.getOrderAll(page.getCondition()));
+ page.setTotal(baseMapper.getOrderAllCount(page.getCondition()));
+ return page;
+ }
}
--
Gitblit v1.9.1