feat(mes): 添加销售出库扫码拣货功能

云

12 小时以前 1b3fd46c7ccbf636208bcf098c5588441bb71f78

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

@@ -32,6 +32,7 @@
                .eqIfPresent(MesWmMaterialStockDO::getLocationId, reqVO.getLocationId())
                .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                .eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
                .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
        wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
@@ -137,12 +138,35 @@
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getBatchId);
        }
        // vendorId=null 时精确匹配 is null
        // vendorId=null 时不限制，匹配任意供应商的库存
        // （避免因供应商维度拆分，OUT 事务找不到真正有库存的记录而扣错到 vendor_id IS NULL 的记录）
        if (vendorId != null) {
            wrapper.eq(MesWmMaterialStockDO::getVendorId, vendorId);
        } else {
            wrapper.isNull(MesWmMaterialStockDO::getVendorId);
        }
        // 多记录时优先取库存量最多的（避免扣到零库存或负库存的记录）
        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);
    }

@@ -154,6 +178,7 @@
                .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getItemId())
                .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                .eqIfPresent(MesWmMaterialStockDO::getStockState, reqVO.getStockState())
                .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                .geIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getStartTime())
                .leIfPresent(MesWmMaterialStockDO::getUpdateTime, reqVO.getEndTime())
@@ -161,4 +186,24 @@
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime));
    }

    /**
     * 按物料编号批量查询库存记录（用于物料需求库存校验）
     */
    default List<MesWmMaterialStockDO> selectListByItemAndBatch(Long itemId, Long batchId) {
        return selectList(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getItemId, itemId)
                .eqIfPresent(MesWmMaterialStockDO::getBatchId, batchId)
                .gt(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                .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));
    }

}