feat: 发货审批根据合同号合并到第一条(未审批)的记录中

buhuazhen

4 天以前 acaf0e69a594f36ef9be6749c2b8d66e4ef6123b

 src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java

@@ -7,23 +7,24 @@
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@@ -51,9 +52,11 @@
    private ApproveProcessServiceImpl approveProcessService;

    @Override
    public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
        IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req);

    public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
        IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
        listPage.getRecords().forEach(item ->{
            item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
        });
        return listPage;
    }

@@ -63,14 +66,17 @@
        if (byId == null) {
            throw new RuntimeException("发货信息不存在");
        }
        //扣减库存
        if(!"已发货".equals(byId.getStatus())){
            SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
            stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
        }
        byId.setExpressNumber(req.getExpressNumber());
        byId.setExpressCompany(req.getExpressCompany());
        byId.setStatus("已发货");
        byId.setShippingCarNumber(req.getShippingCarNumber());
        boolean update = this.updateById(req);
        //扣减库存
        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
        stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
        byId.setShippingDate(req.getShippingDate());
        boolean update = this.updateById(byId);
        // 迁移文件
        if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
            tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
@@ -82,11 +88,14 @@
    public boolean delete(List<Long> ids) {
        List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
                .in(ShippingInfo::getId, ids));
        if(CollectionUtils.isEmpty(shippingInfos)) return false;
        // 删除附件
        commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue());
        // 扣库存
        for (Long id : ids) {
            stockUtils.deleteStockRecord(id, StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
        // 扣已发货库存
        for (ShippingInfo shippingInfo : shippingInfos) {
            if("已发货".equals(shippingInfo.getStatus())) {
                stockUtils.deleteStockOutRecord(shippingInfo.getId(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
            }
        }
        // 删除发货审批
        if(CollectionUtils.isNotEmpty(shippingInfos)){
@@ -101,4 +110,129 @@

        return this.removeBatchByIds(ids);
    }

    @Override
    public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
        return shippingInfoMapper.getReturnManagementDtoById(shippingId );

    }

    @Override
    public List<ShippingInfo> getShippingInfoByCustomerName(String customerName) {
        return shippingInfoMapper.getShippingInfoByCustomerName(customerName);
    }

    /**
     * 一键发货 - 自动审批通过并出库
     * 不创建审批流程，直接扣减库存
     */
    @Override
    @Transactional
    public boolean oneClickShipping(ShippingInfoDto req) throws IOException {
        // 获取销售台账产品信息
        SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
        if (salesLedgerProduct == null) {
            throw new RuntimeException("销售产品不存在");
        }

        // 生成发货单号
        String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");

        // 创建发货记录，状态直接为"已发货"
        ShippingInfo shippingInfo = new ShippingInfo();
        shippingInfo.setShippingNo(shippingNo);
        shippingInfo.setSalesLedgerId(req.getSalesLedgerId());
        shippingInfo.setSalesLedgerProductId(req.getSalesLedgerProductId());
        shippingInfo.setType(req.getType());
        shippingInfo.setShippingDate(req.getShippingDate());
        shippingInfo.setShippingCarNumber(req.getShippingCarNumber());
        shippingInfo.setExpressCompany(req.getExpressCompany());
        shippingInfo.setExpressNumber(req.getExpressNumber());
        shippingInfo.setStatus("已发货");
        boolean save = this.save(shippingInfo);

        if (save) {
            // 直接扣减库存
            stockUtils.substractStock(
                salesLedgerProduct.getProductModelId(),
                salesLedgerProduct.getQuantity(),
                StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
                shippingInfo.getId()
            );

            // 迁移附件
            if (CollectionUtils.isNotEmpty(req.getTempFileIds())) {
                tempFileService.migrateTempFilesToFormal(shippingInfo.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
            }
        }

        return save;
    }

    /**
     * 批量一键发货 - 将销售台账下所有未发货的产品全部发货
     */
    @Override
    @Transactional
    public boolean batchOneClickShipping(Long salesLedgerId, ShippingInfoDto req) throws IOException {
        // 查询该销售台账下所有产品
        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
            new LambdaQueryWrapper<SalesLedgerProduct>()
                .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
                .eq(SalesLedgerProduct::getType, 1) // 销售类型
        );

        if (CollectionUtils.isEmpty(products)) {
            throw new RuntimeException("该销售台账下没有产品");
        }

        // 过滤出未发货的产品（没有发货记录或发货状态不是"已发货"）
        List<SalesLedgerProduct> unshippedProducts = new ArrayList<>();
        for (SalesLedgerProduct product : products) {
            ShippingInfo existingShipping = shippingInfoMapper.selectOne(
                new LambdaQueryWrapper<ShippingInfo>()
                    .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
                    .eq(ShippingInfo::getStatus, "已发货")
                    .last("limit 1")
            );
            if (existingShipping == null) {
                unshippedProducts.add(product);
            }
        }

        if (CollectionUtils.isEmpty(unshippedProducts)) {
            throw new RuntimeException("该销售台账下所有产品已发货");
        }

        // 为每个未发货的产品创建发货记录
        for (SalesLedgerProduct product : unshippedProducts) {
            // 生成发货单号
            String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");

            // 创建发货记录
            ShippingInfo shippingInfo = new ShippingInfo();
            shippingInfo.setShippingNo(shippingNo);
            shippingInfo.setSalesLedgerId(salesLedgerId);
            shippingInfo.setSalesLedgerProductId(product.getId());
            shippingInfo.setType(req.getType());
            shippingInfo.setShippingDate(req.getShippingDate());
            shippingInfo.setShippingCarNumber(req.getShippingCarNumber());
            shippingInfo.setExpressCompany(req.getExpressCompany());
            shippingInfo.setExpressNumber(req.getExpressNumber());
            shippingInfo.setStatus("已发货");

            boolean save = this.save(shippingInfo);
            if (save) {
                // 扣减库存
                stockUtils.substractStock(
                    product.getProductModelId(),
                    product.getQuantity(),
                    StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
                    shippingInfo.getId()
                );
            }
        }

        return true;
    }
}