库存流水修改

liyong

4 天以前 450bcae3cfffe9923dc09dea2a4e89312bb373d7

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java

@@ -85,8 +85,47 @@
        return update(null, updateWrapper);
    }

    /**
     * 增量更新库存占用量
     *
     * @param id        库存记录编号
     * @param count     变动数量（正数=增加占用，负数=减少占用）
     * @param checkFlag 是否校验可用量充足（为 true 时占用不允许超过可用量）
     * @return 影响行数
     */
    default int updateReservedQuantity(Long id, BigDecimal count, boolean checkFlag) {
        LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getId, id)
                .setSql("reserved_quantity = reserved_quantity + " + count);
        if (checkFlag && count.compareTo(BigDecimal.ZERO) > 0) {
            // 校验可用量充足：quantity - frozen_quantity - reserved_quantity >= count
            updateWrapper.apply("quantity - IFNULL(frozen_quantity, 0) - IFNULL(reserved_quantity, 0) >= {0}", count);
        }
        return update(null, updateWrapper);
    }

    /**
     * 增量更新库存在途量
     *
     * @param id    库存记录编号
     * @param count 变动数量（正数=增加在途，负数=减少在途）
     * @return 影响行数
     */
    default int updateInTransitQuantity(Long id, BigDecimal count) {
        LambdaUpdateWrapper<MesWmMaterialStockDO> updateWrapper = new LambdaUpdateWrapper<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getId, id)
                .setSql("in_transit_quantity = in_transit_quantity + " + count);
        return update(null, updateWrapper);
    }

    /**
     * 按组合键查询库存记录
     *
     * 唯一键：(itemId, warehouseId, locationId, areaId, batchId, vendorId)
     * 同一物料同一库位，不同供应商/批次的库存分开管理
     */
    default MesWmMaterialStockDO selectByCompositeKey(Long itemId, Long warehouseId, Long locationId,
                                                       Long areaId, Long batchId) {
                                                       Long areaId, Long batchId, Long vendorId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eqIfPresent(MesWmMaterialStockDO::getItemId, itemId)
                .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, warehouseId)
@@ -98,6 +137,35 @@
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getBatchId);
        }
        // vendorId=null 时不限制，匹配任意供应商的库存
        // （避免因供应商维度拆分，OUT 事务找不到真正有库存的记录而扣错到 vendor_id IS NULL 的记录）
        if (vendorId != null) {
            wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
        }
        // 多记录时优先取库存量最多的（避免扣到零库存或负库存的记录）
        wrapper.last("ORDER BY quantity DESC LIMIT 1");
        return selectOne(wrapper);
    }

    /**
     * 按组合键查询库存记录（忽略供应商维度）
     *
     * 用于移库场景：移库时将库存合并到目标库位已有库存，不区分供应商
     */
    default MesWmMaterialStockDO selectByCompositeKeyIgnoreVendor(Long itemId, Long warehouseId, Long locationId,
                                                                    Long areaId, Long batchId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId)
                .eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
                .eq(MesWmMaterialStockDO::getLocationId, locationId)
                .eq(MesWmMaterialStockDO::getAreaId, areaId);
        // batchId=null 时精确匹配 is null
        if (batchId != null) {
            wrapper.eq(MesWmMaterialStockDO::getBatchId, batchId);
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getBatchId);
        }
        wrapper.last("LIMIT 1");
        return selectOne(wrapper);
    }

@@ -108,6 +176,7 @@
                .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
                .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                .geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime())
                .leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime())
@@ -115,4 +184,16 @@
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
    }

    /**
     * 按物料编号批量查询库存记录（用于物料需求库存校验）
     */
    default List<MesWmMaterialStockDO> selectListByItemIds(Collection<Long> itemIds) {
        if (itemIds == null || itemIds.isEmpty()) {
            return java.util.Collections.emptyList();
        }
        return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .in(MesWmMaterialStockDO::getItemId, itemIds)
                .ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO));
    }

}