Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-17 66ff6f509bbbba04cffc428e7e1c886b534b4f13

 inventory-server/src/main/java/com/yuanchu/mom/service/impl/ConsignmentServiceImpl.java

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yuanchu.mom.mapper.ConsignmentMapper;
@@ -16,11 +18,13 @@
import com.yuanchu.mom.utils.MyUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
 * 成品发货表(Consignment)表服务实现类
@@ -42,28 +46,26 @@

    //新增成品发货
    @Override
    @Transactional(rollbackFor = Exception.class)
    public String addCon(String name, ConsignmentDto consignmentDto) {
        //生成一个押运单编号
        String escortCode = MyUtil.getTimeSixNumberCode("YY");
        //如果该订单已经发过货了不能再发货
        String escortCode = MyUtil.getTimeSixNumberCode("YY", "num");
        List<Consignment> consignments = consignmentMapper.selectAll();
        //如果没有发货表中没有数据也可以发货
        if (consignments.size()==0) {
        //如果发货表中没有数据也可以发货
        if (consignments.size() == 0) {
            /*新增成品发货*/
            String mes1 = addConsign(name, consignmentDto, escortCode);
            return mes1;
        } else {
            for (Consignment consignment : consignments) {
                if (consignment.getCustomerCode().equals(consignmentDto.getCustomerCode())) {
                    return "该合同订单已发过货,无法再次发货!";
                } else {
                    /*新增成品发货*/
                    String mes2 = addConsign(name, consignmentDto, escortCode);
                    return mes2;
                }
            }
            return addConsign(name, consignmentDto, escortCode);
        }
        return null;
        //获取发货表中的合同编号集合
        List<String> customerCodeList = consignments.stream().map(consignment -> {
            String customerCode = consignment.getCustomerCode();
            return customerCode;
        }).distinct().collect(Collectors.toList());
        if (customerCodeList.contains(consignmentDto.getCustomerCode())) {
            return "该合同订单已发过货,无法再次发货!";
        }
        /*新增成品发货*/
        return addConsign(name, consignmentDto, escortCode);
    }

    //查询发货记录列表
@@ -72,85 +74,41 @@
        return consignmentMapper.selectAllCon(page, name, specifications, time);
    }

    //根据id删除
    @Override
    public void delCon(Integer id) {
        //删除发货记录
        Consignment consignment = consignmentMapper.selectById(id);
        consignment.setState(0);
        consignmentMapper.updateById(consignment);
        //库存也要新增
        LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(Repertory::getCode, consignment.getCode())
                .eq(Repertory::getName, consignment.getName())
                .eq(Repertory::getSpecifications, consignment.getSpecifications())
                .eq(Repertory::getUnit, consignment.getUnit())
                .eq(Repertory::getType, 0) //成品发货
                .eq(Repertory::getCheckState, 1); //只有已检验才能发货
        Repertory repertory = repertoryMapper.selectOne(queryWrapper);
        repertory.setNumber(repertory.getNumber() + consignment.getNumber());
        repertoryMapper.updateById(repertory);
    }

    //批量删除
    @Override
    public void delAllCon(List<Integer> ids) {
        List<Consignment> consignments = consignmentMapper.selectBatchIds(ids);
        for (Consignment consignment : consignments) {
            consignment.setState(0);
            //删除发货记录
            consignmentMapper.updateById(consignment);
            //库存新增
            LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(Repertory::getCode, consignment.getCode())
                    .eq(Repertory::getName, consignment.getName())
                    .eq(Repertory::getSpecifications, consignment.getSpecifications())
                    .eq(Repertory::getUnit, consignment.getUnit())
                    .eq(Repertory::getType, 0) //成品发货
                    .eq(Repertory::getCheckState, 1); //只有已检验才能发货
            Repertory repertory = repertoryMapper.selectOne(queryWrapper);
            repertory.setNumber(repertory.getNumber() + consignment.getNumber());
            repertoryMapper.updateById(repertory);
        }
    }


    //新增发货一系列操作
    private String addConsign(String name, ConsignmentDto consignmentDto, String escortCode) {
        /*新增成品发货*/
        List<ConsignmentDto2> messages = consignmentDto.getMessages();
        for (ConsignmentDto2 message : messages) {
            //查询产品编码(通过在成品库存表中的产品名称,规格型号以及单位进行查找)
            //查询产品库存数量
            LambdaQueryWrapper<Repertory> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(Repertory::getName, message.getName())
                    .eq(Repertory::getSpecifications, message.getSpecifications())
                    .eq(Repertory::getUnit, message.getUnit())
                    .eq(Repertory::getType, 0);
                    .eq(Repertory::getType, 0)
                    .eq(Repertory::getOrderCode, consignmentDto.getOrderCode());
            Repertory repertory = repertoryMapper.selectOne(queryWrapper);
            //该成品的检验状态是已检验1才能进行发货
            if (repertory.getCheckState() == 1) {
                //该成品库存的数量大于等于发货的数量才能进行发货
                if (repertory.getNumber() >= message.getNumber()) {
                    //构造成品发货实体类
                    Consignment consig = Consignment.builder()
                            .customerCode(consignmentDto.getCustomerCode())
                            .escortCode(escortCode)
                            .orderCode(consignmentDto.getOrderCode())
                            .userName(name)
                            .checkName(consignmentDto.getCheckName())
                            .fitName(consignmentDto.getFitName())
                            .name(message.getName())
                            .specifications(message.getSpecifications())
                            .unit(message.getUnit())
                            .number(message.getNumber())
                            .code(repertory.getCode())
                            .build();
                    consignmentMapper.insert(consig);
                    /*减少对应的库存*/
                    repertory.setNumber(repertory.getNumber() - consig.getNumber());
                    repertoryMapper.updateById(repertory);
                } else return "库存不足,无法发货!";
            } else return "该产品还未检验,不能发货!";
            //该成品库存不为空且数量大于等于发货的数量才能进行发货
            if (ObjectUtils.isNotEmpty(repertory) && repertory.getNumber() < message.getNumber()) {
                return "库存不足,无法发货!";
            }
            //构造成品发货实体类
            Consignment consig = Consignment.builder()
                    .customerCode(consignmentDto.getCustomerCode())
                    .escortCode(escortCode)
                    .orderCode(consignmentDto.getOrderCode())
                    .userName(name)
                    .checkName(consignmentDto.getCheckName())
                    .fitName(consignmentDto.getFitName())
                    .name(message.getName())
                    .specifications(message.getSpecifications())
                    .unit(message.getUnit())
                    .number(message.getNumber())
                    .qualityTraceability(repertory.getQualityTraceability())
                    .build();
            consignmentMapper.insert(consig);
            /*减少对应的库存*/
            repertory.setNumber(repertory.getNumber() - consig.getNumber());
            repertoryMapper.updateById(repertory);
        }
        /*发货成功之后需要新增一张回单*/
        Receipt receipt = new Receipt();