feat: 优化业务导入及工艺流程管理

云

2026-10-31 bf5f52656e128f578ed42c7979c31cf4b476ce46

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

@@ -124,6 +124,45 @@
     * 唯一键：(itemId, warehouseId, locationId, areaId, batchId, vendorId)
     * 同一物料同一库位，不同供应商/批次的库存分开管理
     */
    /** 查找导入基础维度的所有库存，用于检测供应商歧义。 */
    default List<MesWmMaterialStockDO> selectImportBaseStocksForUpdate(Long itemId, Long warehouseId,
            Long locationId, Long areaId, Long batchId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
                .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
        if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
        else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
        return selectList(query.last("FOR UPDATE"));
    }
    /** 库存导入使用当前读，供应商和批次为空时也精确匹配。 */
    default List<MesWmMaterialStockDO> selectAreaStocksForUpdate(Long areaId) {
        return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getAreaId, areaId).last("FOR UPDATE"));
    }

    /** 创建库存时的当前读；供应商为空时保留现有业务的任意供应商匹配规则。 */
    default MesWmMaterialStockDO selectByCompositeKeyForUpdate(Long itemId, Long warehouseId, Long locationId,
                                                               Long areaId, Long batchId, Long vendorId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
                .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
        if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
        else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
        if (vendorId != null) query.eq(MesWmMaterialStockDO::getVendorId, vendorId);
        return selectOne(query.last("ORDER BY quantity DESC LIMIT 1 FOR UPDATE"));
    }
    /** 库存导入精确匹配批次和供应商，空值按空值匹配。 */
    default List<MesWmMaterialStockDO> selectImportStocksForUpdate(Long itemId, Long warehouseId, Long locationId,
                                                                    Long areaId, Long batchId, Long vendorId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> query = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId).eq(MesWmMaterialStockDO::getWarehouseId, warehouseId)
                .eq(MesWmMaterialStockDO::getLocationId, locationId).eq(MesWmMaterialStockDO::getAreaId, areaId);
        if (batchId == null) query.isNull(MesWmMaterialStockDO::getBatchId);
        else query.eq(MesWmMaterialStockDO::getBatchId, batchId);
        if (vendorId == null) query.isNull(MesWmMaterialStockDO::getVendorId);
        else query.eq(MesWmMaterialStockDO::getVendorId, vendorId);
        return selectList(query.last("FOR UPDATE"));
    }
    default MesWmMaterialStockDO selectByCompositeKey(Long itemId, Long warehouseId, Long locationId,
                                                       Long areaId, Long batchId, Long vendorId) {
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()