#

zjj

2025-03-24 86c69620f1bb3976f01b726d3d1804527474898f

 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;

@@ -73,12 +75,14 @@
        }
        if (complete) {
            for (OrderDetl orderDetl : orderDetls) {
                //生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                if (orderDetl.getBatch().equals("")){
                if (Cools.isEmpty(orderDetl.getBatch())){
                    orderDetlService.updateById(orderDetl);
                }else if (orderDetl.getBatch().equals("")){//生成单据和入库通知档时，给batch为空的明细赋了一个 =""， 现在改为null，回传用
                    orderDetl.setBatch(null);
                    orderDetlService.updateById(orderDetl);
                }
            }
            order.setMemo("0");
            if (!this.updateSettle(order.getId(), 4L, null)) {
                throw new CoolException("修改订单【orderNo = " + order.getOrderNo() + "】状态为已完成失败");
            }
@@ -150,6 +154,46 @@
    }

    @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
    public List<Order> selectComplete2() {
        return this.baseMapper.selectComplete2();
    }

    @Override
    public boolean addToLogTable(Order order) {
        return this.baseMapper.addToLogTable(order) > 0;
    }
@@ -204,7 +248,7 @@

    @Override
    public List<Order> selectToBeHistoryOrder(boolean isERP) {
        int settle = isERP ? 6 : 4;
        int settle = isERP ? 8 : 4;
        return this.baseMapper.selectToBeHistoryOrder(settle);
    }

@@ -213,4 +257,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;
    }
}