采购优化

liding

3 天以前 dc9010b9fc4ca6929992bfc3cc4fa110ebc24b2c

 main-business/src/main/java/com/ruoyi/business/service/impl/PurchaseRegistrationServiceImpl.java

@@ -5,14 +5,24 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.entity.CoalInfo;
import com.ruoyi.basic.entity.Supply;
import com.ruoyi.basic.mapper.CoalInfoMapper;
import com.ruoyi.basic.mapper.SupplyMapper;
import com.ruoyi.business.dto.PurchaseRegistrationDto;
import com.ruoyi.business.entity.PendingInventory;
import com.ruoyi.business.entity.PurchaseRegistration;
import com.ruoyi.business.mapper.PendingInventoryMapper;
import com.ruoyi.business.mapper.PurchaseRegistrationMapper;
import com.ruoyi.business.service.PurchaseRegistrationService;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.BeanUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;

import java.time.LocalDate;
import java.util.Objects;

/**
@@ -30,6 +40,12 @@

    private final PurchaseRegistrationMapper purchaseRegistrationMapper;

    private final PendingInventoryMapper pendingInventoryMapper;

    private final CoalInfoMapper coalInfoMapper;

    private final SupplyMapper supplyMapper;

    @Override
    public IPage<PurchaseRegistration> selectPurchaseRegistrationList(Page page, PurchaseRegistrationDto purchaseRegistrationDto) {
        LambdaQueryWrapper<PurchaseRegistration> queryWrapper = new LambdaQueryWrapper<>();
@@ -38,17 +54,58 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int addOrEditPR(PurchaseRegistrationDto purchaseRegistrationDto) {
        // 参数校验
        Assert.notNull(purchaseRegistrationDto, "采购登记信息不能为空");

        // 创建采购登记实体并复制属性
        PurchaseRegistration purchaseRegistration = new PurchaseRegistration();
        BeanUtils.copyProperties(purchaseRegistrationDto,purchaseRegistration);
        
        BeanUtils.copyProperties(purchaseRegistrationDto, purchaseRegistration);
        CoalInfo coalInfo = coalInfoMapper.selectById(purchaseRegistrationDto.getCoalId());
        if (coalInfo == null) {
            throw new BaseException("煤种信息不存在");
        }
        purchaseRegistration.setCoal(coalInfo.getCoal());
        Supply supply = supplyMapper.selectById(purchaseRegistrationDto.getSupplierId());
        if (supply == null) {
            throw new BaseException("供应商信息不存在");
        }
        purchaseRegistration.setSupplierName(supply.getSupplierName());
        if (Objects.isNull(purchaseRegistrationDto.getId())) {
            return purchaseRegistrationMapper.insert(purchaseRegistration);
            // 新增采购登记
            purchaseRegistration.setRegistrationDate(LocalDate.now());
            int insertCount = purchaseRegistrationMapper.insert(purchaseRegistration);
            if (insertCount > 0) {
                // 采购登记成功，同步创建待入库记录
                PendingInventory pendingInventory = createPendingInventory(purchaseRegistration);
                pendingInventory.setSupplierName(supply.getSupplierName());
                pendingInventory.setCoal(coalInfo.getCoal());
                return pendingInventoryMapper.insert(pendingInventory);
            }
            return insertCount;
        } else {
            // 更新采购登记
            return purchaseRegistrationMapper.updateById(purchaseRegistration);
        }
    }

    /**
     * 根据采购登记信息创建待入库记录
     *
     * @param purchaseRegistration 采购登记实体
     * @return 待入库实体
     */
    private PendingInventory createPendingInventory(PurchaseRegistration purchaseRegistration) {
        PendingInventory pendingInventory = new PendingInventory();
        // 复制基本属性
        BeanUtils.copyProperties(purchaseRegistration, pendingInventory);

        // 设置待入库记录特有的属性（如果有）
        pendingInventory.setInventoryQuantity(purchaseRegistration.getPurchaseQuantity());
        return pendingInventory;
    }

    @Override
    public int delByIds(Long[] ids) {
        // 检查参数