refactor(stock): 优化库存记录服务中的仓库信息处理逻辑

liyong

2026-05-15 76c84d95506998f546e6f3ebbf70414c0dd9da9d

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

@@ -163,7 +163,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int batchApprove(List<Long> ids, Integer approvalStatus,Long warehouseInfoId) {
    public int batchApprove(List<Long> ids, Integer approvalStatus,Long warehouseInfoId1) {
        if (CollectionUtils.isEmpty(ids)) {
            throw new BaseException("请选择至少一条数据");
        }
@@ -179,7 +179,6 @@
                throw new BaseException("只有待审批状态的记录才能审批,入库批次:" + stockInRecord.getInboundBatches());
            }
            stockInRecord.setApprovalStatus(approvalStatus);
            stockInRecord.setWarehouseInfoId(warehouseInfoId);
            stockInRecordMapper.updateById(stockInRecord);
            // 审批通过时，库存增加
            if (ReviewStatusEnum.APPROVED.getCode().equals(approvalStatus)) {
@@ -188,7 +187,7 @@
                    StockInventory stockInventory = getStockInventory(
                            stockInRecord.getProductModelId(),
                            stockInRecord.getBatchNo(),
                            warehouseInfoId
                            stockInRecord.getWarehouseInfoId()
                    );
                    if (!ObjectUtils.isEmpty(stockInventory)) {
                        if (stockInventory.getLocked().equals( true)&&!stockInRecord.getRecordType().equals(StockInQualifiedRecordTypeEnum.INVENTORY_CHECK_STOCK_IN.getCode())) {
@@ -198,7 +197,7 @@
                    StockInventoryDto stockInventoryDto = new StockInventoryDto();
                    stockInventoryDto.setProductModelId(stockInRecord.getProductModelId());
                    stockInventoryDto.setBatchNo(stockInRecord.getBatchNo());
                    stockInventoryDto.setWarehouseInfoId(warehouseInfoId);
                    stockInventoryDto.setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
                    stockInventoryDto.setQualitity(stockInRecord.getStockInNum());
                    stockInventoryDto.setRemark(stockInRecord.getRemark());
                    if (stockInventory == null) {
@@ -207,7 +206,7 @@
                            setQualitity(stockInRecord.getStockInNum());
                            setBatchNo(stockInRecord.getBatchNo());
                            setRemark(stockInRecord.getRemark());
                            setWarehouseInfoId(warehouseInfoId);
                            setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
                            setVersion(1);
                        }});
                    } else {
@@ -227,6 +226,7 @@
                            setQualitity(stockInRecord.getStockInNum());
                            setBatchNo(stockInRecord.getBatchNo());
                            setRemark(stockInRecord.getRemark());
                            setWarehouseInfoId(stockInRecord.getWarehouseInfoId());
                            setVersion(1);
                        }});
                    } else {