From b72f05cc22990f5cd3435a82148ff0f8f7f26579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B3=89=E4=BD=B3?= <1107186916@qq.com> Date: Thu, 29 Oct 2026 14:37:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B5=81=E6=B0=B4=E5=88=86?= =?UTF-8?q?=E5=BD=95=E6=94=B6=E6=AC=BE=E5=8D=95=E4=BB=A5=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E5=85=9C=E5=BA=95=E4=BD=9C=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ReceiptFlowServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java index 6eef4fae..ab59ea54 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java @@ -516,7 +516,9 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl bei_bankdetailno > 收款单号 billno 兜底 + * （无流水分录的单如手工收款单也入库，但认领后 C104-2 将定位不到合规流水，C107-1 落失败标记）。 * * @return 跳过条数 */ @@ -524,14 +526,14 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl flowEntries = recBill.getInfoentry(); if (Func.isEmpty(flowEntries)) { - log.warn("收款流水同步跳过：收款单[{}]无流水分录", recBill.getBillno()); - return 1; + flowEntries = List.of(new BfiRecBillFlowVO()); } for (BfiRecBillFlowVO flowEntry : flowEntries) { - // 明细流水号优先级：bei_detailid > bei_bankdetailno - String detailSerialNo = firstNonBlank(flowEntry.getBeiDetailid(), flowEntry.getBeiBankdetailno()); + // 明细流水号优先级：bei_detailid > bei_bankdetailno > 收款单号兜底 + String detailSerialNo = firstNonBlank(flowEntry.getBeiDetailid(), flowEntry.getBeiBankdetailno(), + recBill.getBillno()); if (Func.isEmpty(detailSerialNo)) { - log.warn("收款流水同步跳过：收款单[{}]流水分录缺少明细流水号", recBill.getBillno()); + log.warn("收款流水同步跳过：收款单[{}]缺少明细流水号", recBill.getBillno()); skipped++; continue; }