From 86d30e57d1e5378c447b07eee2b297253b9beaa1 Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Mon, 21 Sep 2026 09:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=BC=80=E7=A5=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=81=9C=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml   |  8 +++++++-
 .../PDDInvoice/ViewModels/PDDInvoiceViewModel.cs    | 13 +++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
index 3ea78da..0760a49 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
@@ -232,7 +232,13 @@
 					<Button
 						Padding="10,0"
 						Command="{Binding BatchInvoiceCommand}"
-						Content="批量开票" />
+						Content="批量开票"
+						Visibility="{Binding IsBatchInvoicing, Converter={StaticResource Boolean2VisibilityReConverter}}" />
+					<Button
+						Padding="10,0"
+						Command="{Binding StopBatchInvoiceCommand}"
+						Content="停止开票"
+						Visibility="{Binding IsBatchInvoicing, Converter={StaticResource Boolean2VisibilityConverter}}" />
 					<Button
 						Padding="10,0"
 						Command="{Binding ShowSettingDialogCommand}"
diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
index ce0adcb..42550a5 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
@@ -464,6 +464,13 @@ public partial class PDDInvoiceViewModel : BindableBaseEx
 		await BatchInvoiceAsync(targets);
 	}
 
+	public ICommand StopBatchInvoiceCommand => new AsyncDelegateCommand(StopBatchInvoice);
+
+	private async Task StopBatchInvoice()
+	{
+		IsBatchInvoicing = false;
+	}
+
 	public ICommand ShowSettingDialogCommand => new DelegateCommand(ShowSettingDialog);
 
 	private void ShowSettingDialog()
@@ -494,6 +501,12 @@ public partial class PDDInvoiceViewModel : BindableBaseEx
 
 			for (int i = 0; i < targets.Count; i++)
 			{
+				if (IsBatchInvoicing == false)
+				{
+					BottomMsg = "已取消批量开票";
+					return;
+				}
+				
 				if (AmountTotal >= Config.MaxAmount)
 				{
 					return;