Merge remote-tracking branch 'origin/dev_business' into dev_business

liyong

10 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/materialstock/MesWmMaterialStockServiceImpl.java

@@ -148,9 +148,9 @@
    @Override
    public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
                                                         Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
        // 1. 查找已有库存记录
        // 1. 查找已有库存记录（vendorId 参与唯一键）
        MesWmMaterialStockDO stock = materialStockMapper.selectByCompositeKey(
                itemId, warehouseId, locationId, areaId, batchId);
                itemId, warehouseId, locationId, areaId, batchId, vendorId);
        if (stock != null) {
            return stock;
        }