From 8bf2b91054c1e2fad3e3e32a177fa3ce482eb6bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Tue, 3 Nov 2026 10:17:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA=E9=87=91?= =?UTF-8?q?=E8=9D=B6=E5=86=85=E9=83=A8id=E8=80=8C=E9=9D=9E=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FormalSettlementController.java | 2 +- .../controller/InvoiceApplicationController.java | 2 +- .../controller/PaymentApplicationController.java | 2 +- .../controller/SettlementAdjustmentController.java | 2 +- .../listener/KingdeeApprovalSyncListener.java | 6 +++--- .../service/impl/PaymentApplicationServiceImpl.java | 10 ++++++---- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/FormalSettlementController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/FormalSettlementController.java index 1ab8deab..15118427 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/FormalSettlementController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/FormalSettlementController.java @@ -212,7 +212,7 @@ public class FormalSettlementController extends BladeController { return R.data(Boolean.FALSE, "审批通过，但自动同步金蝶失败：" + syncFailure); } if (syncResult != null) { - return R.success("审批通过，已同步金蝶：" + syncResult); + return R.success("审批通过，单据号[" + syncResult + "]已同步金蝶"); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceApplicationController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceApplicationController.java index 34c74ec3..c9c8e579 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceApplicationController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceApplicationController.java @@ -142,7 +142,7 @@ public class InvoiceApplicationController extends BladeController { return R.data(Boolean.FALSE, "审批通过，但自动同步金蝶失败：" + syncFailure); } if (syncResult != null) { - return R.success("审批通过，已同步金蝶：" + syncResult); + return R.success("审批通过，单据号[" + syncResult + "]已同步金蝶"); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java index 149f908e..6cd03d09 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/PaymentApplicationController.java @@ -126,7 +126,7 @@ public class PaymentApplicationController extends BladeController { return R.data(Boolean.FALSE, "审批通过，但自动同步金蝶失败：" + syncFailure); } if (syncResult != null) { - return R.success("审批通过，已同步金蝶：" + syncResult); + return R.success("审批通过，单据号[" + syncResult + "]已同步金蝶"); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/SettlementAdjustmentController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/SettlementAdjustmentController.java index 86772411..cb1e1388 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/SettlementAdjustmentController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/SettlementAdjustmentController.java @@ -47,7 +47,7 @@ public class SettlementAdjustmentController extends BladeController { return R.data(Boolean.TRUE, "审批通过；" + hint); } if (Func.isNotBlank(syncResult)) { - return R.success("审批通过，已同步金蝶：" + syncResult); + return R.success("审批通过，单据号[" + syncResult + "]已同步金蝶"); } return R.success("审批通过"); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java index fbecca86..6f36b95c 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/listener/KingdeeApprovalSyncListener.java @@ -150,9 +150,9 @@ public class KingdeeApprovalSyncListener { return; } log.info("付款申请[{}]审批通过自动同步金蝶开始", id); - String kingdeeBillId = paymentApplicationService.syncKingdee(id); - recordResult(kingdeeBillId); - log.info("付款申请[{}]审批通过自动同步金蝶完成：kingdeeBillId={}", id, kingdeeBillId); + String billNo = paymentApplicationService.syncKingdee(id); + recordResult(billNo); + log.info("付款申请[{}]审批通过自动同步金蝶完成：billNo={}", id, billNo); } private void pushInvoiceApply(Long id) { diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java index a9ff891b..1189a40d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/PaymentApplicationServiceImpl.java @@ -727,10 +727,11 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl