XL 2013 Numéro de série avec conditions

Private Sub CommandButton1_Click()
    Dim s As String, lr As Long, x As Long
    With Worksheets("Feuil1")
        lr = .Range("D" & Rows.Count).End(xlUp).Row + 1
        .Cells(lr, 2).Value = TextBox1.Value
        .Cells(lr, 3).Value = TextBox2.Value
        .Cells(lr, 4).Value = CDate(TextBox3.Value)
        .Cells(lr, 5).Value = ComboBox1.Value
        If ComboBox2.Value <> "" Then
            Select Case ComboBox2.Value
                Case "A": s = "A"
                Case "B": s = "B"
            End Select
            x = Application.WorksheetFunction.CountIfs(.Columns(6), s, .Columns(5), "CC") + Application.WorksheetFunction.CountIfs(.Columns(6), s, .Columns(5), "DD") + 1
            .Cells(lr, 1).Value = CStr(x) & "/" & s
            MsgBox "Done. number  " & x & "/" & s & "  service  " & Cells(lr, 6).Value, 64
        End If
        .Cells(lr, 6).Value = ComboBox2.Value
        With .Range(.Cells(lr, 1), .Cells(lr, 6))
            .Borders.LineStyle = xlContinuous
        End With
    End With
    Call vide
    Call UserForm_Initialize
End Sub