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