feat(stock): 添加库存盘点功能并优化出入库记录

liyong

2026-05-09 4402a6e3befe0c33e8f3b58641984fce3fdb0bbc

 src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java

@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.dto.StockInventoryDto;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.dto.StockUninventoryDto;
import com.ruoyi.stock.mapper.StockInventoryMapper;
import com.ruoyi.stock.pojo.StockInRecord;
@@ -44,7 +46,7 @@
        stockUninventoryDto.setRecordType(String.valueOf(recordType));
        stockUninventoryDto.setQualitity(quantity);
        stockUninventoryDto.setProductModelId(productModelId);
        stockUninventoryService.addStockUninventory(stockUninventoryDto);
        stockUninventoryService.addStockInRecordOnly(stockUninventoryDto);
    }

    /**
@@ -77,7 +79,24 @@
        stockInventoryDto.setRecordType(String.valueOf(recordType));
        stockInventoryDto.setQualitity(quantity);
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryService.addstockInventory(stockInventoryDto);
        stockInventoryService.addStockInRecordOnly(stockInventoryDto);
    }

    /**
     * 合格入库带批次号
     * @param productModelId
     * @param quantity
     * @param recordType
     * @param recordId
     */
    public StockInRecordDto addStockWithBatchNo(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
        stockInventoryDto.setQualitity(quantity);
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryDto.setBatchNo(batchNo);
       return stockInventoryService.addStockInRecordOnly(stockInventoryDto);
    }

    /**
@@ -97,14 +116,14 @@
        stockInventoryService.subtractStockInventory(stockInventoryDto);
    }

    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
    public StockOutRecordDto substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId, String batchNo) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
        stockInventoryDto.setQualitity(quantity);
        stockInventoryDto.setProductModelId(productModelId);
        stockInventoryDto.setBatchNo(batchNo);
        stockInventoryService.subtractStockInventory(stockInventoryDto);
       return stockInventoryService.subtractStockInventory(stockInventoryDto);
    }

    //不合格库存删除