From 988188385694608e78ce921e570635b4446195f9 Mon Sep 17 00:00:00 2001 From: git_rabbit Date: Tue, 18 Nov 2025 14:00:15 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=89=93=E5=8D=B0=E5=8A=9F=E8=83=BD):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=E5=90=8E=E6=9C=AA=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8=E5=92=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在打印预览对话框确认后，添加异步加载产品列表功能 打印成功后更新产品状态为已打印并记录操作日志 --- .../Services/FinishedProductService.cs | 15 ++++++++++++++- .../ViewModels/MainControlViewModel.cs | 4 +++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/Services/FinishedProductService.cs b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/Services/FinishedProductService.cs index 8d6b603..7ba1176 100644 --- a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/Services/FinishedProductService.cs +++ b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/Services/FinishedProductService.cs @@ -14,6 +14,7 @@ using RIZO_Application.Models; using RIZO_Application.Models.Model; using RIZO_Application.Modules.ModuleName.Services.IServices; using RIZO_Application.Repository; +using SqlSugar; namespace RIZO_Application.Modules.ModuleName.Services { @@ -376,9 +377,21 @@ namespace RIZO_Application.Modules.ModuleName.Services bool success = await _printService.PrintLabelAsync(printDto); // 如果打印成功，更新状态为已打印 - if (success && _useMockData) + if (success) { product.LabelPrintStatus = "已打印"; + int recordUpdate = Context.Updateable(product).IgnoreColumns(ignoreAllNullColumns:true).ExecuteCommand(); + ProFinishedProductReceiptLog finishedProductReceiptLog = new ProFinishedProductReceiptLog + { + ReceiptNo = product.ReceiptNo, + OperatedBy = product.LabelFrom, + OperatedTime = DateTime.Now, + OperationType = "PRINT", + OperationContent = recordUpdate > 0 ? "入库单打印成功" : "入库单打印失败", + OperationResult = recordUpdate > 0 ? "SUCCESS" : "FAIL", + Remark = "" + }; + Context.Insertable(finishedProductReceiptLog).ExecuteCommand(); _eventAggregator .GetEvent() .Publish($"更新成品入库单状态为已打印: {product.ReceiptNo}"); diff --git a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/MainControlViewModel.cs b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/MainControlViewModel.cs index 1082dd7..b419a42 100644 --- a/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/MainControlViewModel.cs +++ b/RIZO_Application/Modules/RIZO_Application.Modules.ModuleName/ViewModels/MainControlViewModel.cs @@ -208,11 +208,13 @@ namespace RIZO_Application.Modules.ModuleName.ViewModels { var parameters = new DialogParameters(); parameters.Add("Product", SelectedProduct); - _dialogService.ShowDialog("PrintPreviewDialog", parameters, r => + _dialogService.ShowDialog("PrintPreviewDialog", parameters, async r => { if (r.Result == ButtonResult.OK) { // 打印逻辑已在弹窗中处理 + // 重新加载产品列表 + await LoadFinishedProductsAsync(); } }); }