修改 9.15

zss

2023-09-15 cd5b5908546c3d6c98e7aec607af8db1f8565495

 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,6 +18,7 @@
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;
@@ -43,9 +46,10 @@

    //新增成品发货
    @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) {
@@ -70,61 +74,21 @@
        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::getQualityTraceability, consignment.getQualityTraceability())
                .eq(Repertory::getName, consignment.getName())
                .eq(Repertory::getSpecifications, consignment.getSpecifications())
                .eq(Repertory::getUnit, consignment.getUnit())
                .eq(Repertory::getType, 0); //成品发货
        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::getQualityTraceability, consignment.getQualityTraceability())
                    .eq(Repertory::getName, consignment.getName())
                    .eq(Repertory::getSpecifications, consignment.getSpecifications())
                    .eq(Repertory::getUnit, consignment.getUnit())
                    .eq(Repertory::getType, 0); //成品发货
            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);
            //该成品库存的数量大于等于发货的数量才能进行发货
            if (repertory.getNumber() < message.getNumber()) {
            //该成品库存不为空且数量大于等于发货的数量才能进行发货
            if (ObjectUtils.isNotEmpty(repertory) && repertory.getNumber() < message.getNumber()) {
                return "库存不足,无法发货!";
            }
            //构造成品发货实体类