fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 3bf81c083883d4861d53380423ee8a44c899b5f6

 src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java

@@ -11,7 +11,9 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.equipmentenergyconsumption.mapper.ElectricityConsumptionAreaMapper;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.dto.StockInRecordDto;
@@ -34,7 +36,9 @@

import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Optional;

/**
 * <p>
@@ -55,6 +59,7 @@
    private final WeighbridgeDocGenerator weighbridgeDocGenerator;
    private final ProductMapper productMapper;
    private final ProductModelMapper productModelMapper;
    private final ElectricityConsumptionAreaMapper electricityConsumptionAreaMapper;

    @Override
    public IPage<StockInventoryDto> pagestockInventory(Page page, StockInventoryDto stockInventoryDto) {
@@ -70,10 +75,13 @@
        stockInRecordDto.setRecordId(stockInventoryDto.getRecordId());
        stockInRecordDto.setRecordType(stockInventoryDto.getRecordType());
        stockInRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
        stockInRecordDto.setUnit(stockInventoryDto.getUnit());
        Long modelId;
        if (stockInventoryDto.getProductId() != null) {
            stockInRecordDto.setProductId(stockInventoryDto.getProductId());
            stockInRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
        }else {
            modelId = stockInventoryDto.getProductModelId();
        } else {
            Product parent = productMapper.selectOne(new LambdaQueryWrapper<Product>().eq(Product::getProductName, "原材料").last("limit 1"));
            if (parent == null) {
                throw new RuntimeException("原材料分类不存在");
@@ -120,6 +128,8 @@
            stockInRecordDto.setProductId(product.getId());
            stockInRecordDto.setProductModelId(productModelId);
            stockInventoryDto.setProductModelId(productModelId);

            modelId = productModelId;
        }
        stockInRecordDto.setRemark(stockInventoryDto.getRemark());
        stockInRecordDto.setType("0");
@@ -132,6 +142,7 @@
            stockInRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
            stockInRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
            stockInRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
            stockInRecordDto.setUnit(stockInventoryDto.getUnit());
            // 生成磅单
            String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
            stockInRecordDto.setWeighbridgeDocPath(absoluteDocPath);
@@ -148,12 +159,13 @@
                new QueryWrapper<StockInventory>().lambda()
                        .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
        );
        ProductModel productModel = productModelMapper.selectById(modelId);
        BigDecimal weight = compareUnit(stockInventoryDto, productModel);
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            // 新增库存
            StockInventory newStockInventory = new StockInventory();
            newStockInventory.setProductModelId(stockInventoryDto.getProductModelId());
            newStockInventory.setQualitity(stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
                    stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity());
            newStockInventory.setQualitity(weight);
            newStockInventory.setVersion(1);
            newStockInventory.setRemark(stockInventoryDto.getRemark());
            newStockInventory.setLockedQuantity(stockInventoryDto.getLockedQuantity());
@@ -162,8 +174,7 @@
            stockInventoryMapper.insert(newStockInventory);
        } else {
            // 更新库存
            stockInventoryDto.setQualitity(stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0 ?
                    stockInventoryDto.getNetWeight() : stockInventoryDto.getQualitity());
            stockInventoryDto.setQualitity(weight);
            stockInventoryMapper.updateAddStockInventory(stockInventoryDto);
        }
        return true;
@@ -173,41 +184,112 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean subtractStockInventory(StockInventoryDto stockInventoryDto) {
        //  新增出库记录
        StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
        stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
        stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
        stockOutRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
        stockOutRecordDto.setStockOutNum(stockInventoryDto.getNetWeight());
        stockOutRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
        stockOutRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
        stockOutRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
        stockOutRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
        stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
        stockOutRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
        stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
        stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
        stockOutRecordDto.setType("0");
        //生成磅单
        StockInRecordDto stockInRecordDto = new StockInRecordDto();
        BeanUtils.copyProperties(stockOutRecordDto, stockInRecordDto);
        String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
        stockOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
        stockOutRecordService.add(stockOutRecordDto);
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()));
        if (ObjectUtils.isEmpty(oldStockInventory)) {
            throw new RuntimeException("产品库存不存在");
        }
        BigDecimal lockedQty = oldStockInventory.getLockedQuantity();
        if (lockedQty == null) {
            lockedQty = BigDecimal.ZERO;
        }
        if (stockInventoryDto.getQualitity().compareTo(oldStockInventory.getQualitity().subtract(lockedQty)) > 0) {
            throw new RuntimeException("库存不足无法出库");

        // 1. 查询产品型号和库存信息
        ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId());
        if (productModel == null) {
            throw new BaseException("产品型号不存在");
        }

        stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
        StockInventory oldStockInventory = stockInventoryMapper.selectOne(
                new QueryWrapper<StockInventory>().lambda()
                        .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId())
        );
        if (oldStockInventory == null) {
            throw new BaseException("产品库存不存在");
        }

        // 2. 计算并转换出库数量
        BigDecimal outQuantity = compareUnit(stockInventoryDto, productModel);

        // 3. 检查库存是否充足（考虑锁定库存）
        BigDecimal availableQuantity = oldStockInventory.getQualitity()
                .subtract(Optional.ofNullable(oldStockInventory.getLockedQuantity()).orElse(BigDecimal.ZERO));
        if (outQuantity.compareTo(availableQuantity) > 0) {
            throw new BaseException("库存不足，当前可用库存：" + availableQuantity);
        }

        // 4. 扣减库存
        stockInventoryDto.setQualitity(outQuantity);
        int affectedRows = stockInventoryMapper.updateSubtractStockInventory(stockInventoryDto);
        if (affectedRows == 0) {
            throw new BaseException("扣减库存失败，可能库存不足或数据已被修改");
        }

        // 5. 创建并保存出库记录
        createAndSaveStockOutRecord(stockInventoryDto, productModel);

        return true;
    }

    /**
     * 计算并转换出库数量（统一转换为库存单位）
     */
    private BigDecimal compareUnit(StockInventoryDto stockInventoryDto, ProductModel productModel) {
        // 获取原始出库数量（根据产品类型选择净重或数量）
        BigDecimal originalQuantity = (stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0)
                ? stockInventoryDto.getNetWeight()
                : stockInventoryDto.getQualitity();

        String sourceUnit = stockInventoryDto.getUnit();
        String targetUnit = productModel.getUnit();

        // 单位相同，直接返回
        if (sourceUnit.equals(targetUnit)) {
            return originalQuantity;
        }

        // 单位转换
        if ("吨".equals(targetUnit)) {
            // 转换为吨
            return originalQuantity.divide(BigDecimal.valueOf(1000), 2, RoundingMode.HALF_UP);
        } else if ("公斤".equals(targetUnit)) {
            // 转换为公斤
            return originalQuantity.multiply(BigDecimal.valueOf(1000));
        } else {
            // 单位不匹配时，返回原值
            return originalQuantity;
        }
    }

    /**
     * 创建并保存出库记录
     */
    private void createAndSaveStockOutRecord(StockInventoryDto stockInventoryDto, ProductModel productModel) {
        // 创建出库记录DTO
        StockOutRecordDto stockOutRecordDto = new StockOutRecordDto();
        if (stockInventoryDto.getProductType() != null && stockInventoryDto.getProductType() == 0) {
            stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
            stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
            stockOutRecordDto.setWeighingDate(stockInventoryDto.getWeighingDate());
            stockOutRecordDto.setStockOutNum(stockInventoryDto.getNetWeight());
            stockOutRecordDto.setNetWeight(stockInventoryDto.getNetWeight());
            stockOutRecordDto.setGrossWeight(stockInventoryDto.getGrossWeight());
            stockOutRecordDto.setTareWeight(stockInventoryDto.getTareWeight());
            stockOutRecordDto.setWeighingOperator(stockInventoryDto.getWeighingOperator());
            stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
            stockOutRecordDto.setLicensePlateNo(stockInventoryDto.getLicensePlateNo());
            stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
            stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
            stockOutRecordDto.setUnit(stockInventoryDto.getUnit());
            stockOutRecordDto.setType("0");
            // 生成磅单
            StockInRecordDto stockInRecordDto = new StockInRecordDto();
            BeanUtils.copyProperties(stockOutRecordDto, stockInRecordDto);
            String absoluteDocPath = weighbridgeDocGenerator.generateWeighbridgeDoc(stockInRecordDto);
            stockOutRecordDto.setWeighbridgeDocPath(absoluteDocPath);
        } else {
            stockOutRecordDto.setRecordId(stockInventoryDto.getRecordId());
            stockOutRecordDto.setRecordType(stockInventoryDto.getRecordType());
            stockOutRecordDto.setStockOutNum(stockInventoryDto.getQualitity());
            stockOutRecordDto.setNetWeight(stockInventoryDto.getQualitity());
            stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId());
            stockOutRecordDto.setProductId(stockInventoryDto.getProductId());
            stockOutRecordDto.setRemark(stockInventoryDto.getRemark());
            stockOutRecordDto.setUnit(stockInventoryDto.getUnit());
            stockOutRecordDto.setType("0");
        }
        stockOutRecordService.add(stockOutRecordDto);
    }

    @Override
@@ -235,7 +317,7 @@
                stockInventoryDto.setModel(dto.getModel());
                stockInventoryDto.setUnit(dto.getUnit());

                // 解决方案1：通过代理对象调用
                //通过代理对象调用
                ((StockInventoryService) AopContext.currentProxy()).addstockInventory(stockInventoryDto);
            }
            return R.ok("导入成功");