feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.x...

liding

2026-05-21 a76e1d17d67641993dea6335cb8e1465a94df58d

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

@@ -152,7 +152,7 @@
     * @param recordType
     * @param recordId
     */
    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,String batchNo) {
    public void substractStock(Long productModelId, BigDecimal quantity, String recordType, Long recordId,String batchNo,Long stockId) {
        StockInventoryDto stockInventoryDto = new StockInventoryDto();
        stockInventoryDto.setRecordId(recordId);
        stockInventoryDto.setRecordType(String.valueOf(recordType));
@@ -161,6 +161,7 @@
        if (batchNo !=null && !batchNo.isEmpty()) {
            stockInventoryDto.setBatchNo(batchNo);
        }
        stockInventoryDto.setStockId(stockId);
        stockInventoryService.subtractStockInventory(stockInventoryDto);
    }

@@ -185,4 +186,18 @@
            stockOutRecordService.batchDelete(idList);
        }
    }

    /**
     * 仅按recordId删除出库记录（用于recordType为动态值的场景）
     */
    public void deleteStockOutRecordByRecordId(Long recordId) {
        List<StockOutRecord> one = stockOutRecordService.list(new QueryWrapper<StockOutRecord>()
                .lambda().eq(StockOutRecord::getRecordId, recordId));
        if (ObjectUtils.isNotEmpty(one)) {
            List<Long> idList = one.stream()
                    .map(StockOutRecord::getId)
                    .collect(Collectors.toList());
            stockOutRecordService.batchDelete(idList);
        }
    }
}