diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java index fb512fdc..94ad3281 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/KingdeeReceiptFlow.java @@ -72,6 +72,26 @@ public class KingdeeReceiptFlow extends TenantEntity { * 未匹配收款金额(A301-1 unmatchamountrec,认领上限口径) */ private BigDecimal unclaimedAmount; + /** + * 已匹配收款金额(A301-1 matchamountrec) + */ + private BigDecimal matchAmountRec; + /** + * 已匹配付款金额(A301-1 matchamountpay) + */ + private BigDecimal matchAmountPay; + /** + * 未匹配付款金额(A301-1 unmatchamountpay) + */ + private BigDecimal unmatchAmountPay; + /** + * 已结算金额(A301-1 settleamount) + */ + private BigDecimal settleAmount; + /** + * 未结算金额(A301-1 unsettleamount) + */ + private BigDecimal unsettleAmount; /** * 手续费(A301-1 fee) */ 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 b0540b5a..0adb723d 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 @@ -69,6 +69,7 @@ import org.springframework.transaction.support.TransactionTemplate; import java.math.BigDecimal; import java.math.RoundingMode; +import java.time.Duration; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -838,6 +839,13 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl