#

zjj

2025-04-14 287170042ad762d32ca574a5ed692648ea8e002f

 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("修改订单【orderNo = " + 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);
    }