b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 收款流水收款金额改取A301-1主单actrecamt字段

Browse Source
This commit is contained in:
刘泉佳
2026-10-29 15:37:54 +08:00
parent 216e61b1ed
commit d4666557bc
4 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java
+1 -1
View File
@@ -97,7 +97,7 @@ public class KingdeeReceiptFlow extends TenantEntity {
*/
private String payerName;
/**
* 收款金额（A301-1 主单入账金额 inneraccountamount）
* 收款金额（A301-1 actrecamt）
*/
private BigDecimal receiptAmount;
/**
blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/ReceiptFlowServiceImpl.java
+5 -6
View File
@@ -42,7 +42,6 @@ import org.springblade.thirdparty.bfi.pojo.dto.BfiRecBillQueryDTO;
import org.springblade.thirdparty.bfi.pojo.vo.BfiPageVO;
import org.springblade.thirdparty.bfi.pojo.vo.BfiRecBillVO;
import org.springblade.thirdparty.bfi.service.IBfiService;
import org.springblade.thirdparty.bfi.util.BfiUtil;
import org.springblade.transport.config.BfiProperties;
import org.springblade.transport.constant.KingdeeBfiConstant;
import org.springblade.transport.mapper.FormalSettlementMapper;
@@ -74,8 +73,8 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -499,10 +498,10 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
if (!batchSerials.add(detailSerialNo)) {
throw new ServiceException("收款单号" + detailSerialNo + "重复");
}
// 收款金额取主单入账金额 inneraccountamount（金蝶口径，非流水分录 bei_creditamount）
BigDecimal receiptAmount = money(recBill.getInneraccountAmount());
// 收款金额取主单 actrecamt（金蝶收款金额口径）
BigDecimal receiptAmount = money(recBill.getActrecamt());
if (receiptAmount.compareTo(BigDecimal.ZERO) <= 0) {
log.warn("收款流水同步跳过：收款单[{}]收款金额（inneraccountamount）为空或小于0", recBill.getBillno());
// log.warn("收款流水同步跳过：收款单[{}]收款金额（actrecamt）为空或小于0", recBill.getBillno());
skippedCount++;
continue;
}
@@ -823,7 +822,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
target.setOrgNumber(trimToNull(source.getOrgNumber()));
// 核算组织.编码
target.setOpenOrgNumber(trimToNull(source.getOpenorgNumber()));
// 收款金额（主单入账金额 inneraccountamount）
// 收款金额（主单 actrecamt）
target.setReceiptAmount(row.receiptAmount());
// 对方单位名称（取付款人名称）
target.setCounterpartyName(trimToEmpty(source.getPayername()));
blade-third-party-api/blade-bfi-api/src/main/java/org/springblade/thirdparty/bfi/pojo/vo/BfiRecBillVO.java
Vendored
-5
View File
@@ -135,11 +135,6 @@ public class BfiRecBillVO implements Serializable {
*/
@JsonProperty("txt_description")
private String txtDescription;
/**
* 收款金额（入账金额，收款流水收款金额取此字段）
*/
@JsonProperty("inneraccountamount")
private BigDecimal inneraccountAmount;
/**
* 收款金额
*/
doc/docs/业务流程/2026-10-29-收款流水菜单改造（数据源A301-2改A301-1-认领只登记本地并推送合规C107-1与C107-3作废同步）.md
+1 -1
View File
@@ -74,7 +74,7 @@ A301-1 收款单查询（业务日期窗口取 `thirdParty.bfi.recBillSync.days`
| receipt_notice_no / kingdee_bill_no | `billno` | 金蝶收款单号（两处同值） |
| kingdee_bill_status | `billstatus` 映射 | A/B已提交→pushed、C已审核→approved、D已收款→received、其余（含G退单）→failed |
| detail_serial_no | 主单 `billno` | 明细流水号=收款单号，**幂等键**；主单粒度，一张收款单一条流水，不展开流水分录 |
| receipt_amount | 主单 `inneraccountamount` | 收款金额（入账金额口径，非流水分录 bei_creditamount） |
| receipt_amount | 主单 `actrecamt` | 收款金额（金蝶收款金额口径） |
| unclaimed_amount | `unmatchamountrec` | 未匹配收款金额，**认领上限口径** |
| payer_name / counterparty_name | `payername` | 付款人名称 |
| payee_name | `org_name` | 收款人（收款公司名称） |