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 b598c762..b2740638 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 @@ -41,7 +41,6 @@ import org.springblade.system.pojo.entity.DictBiz; import org.springblade.thirdparty.bfi.pojo.dto.BfiApBillQueryDTO; import org.springblade.thirdparty.bfi.pojo.dto.BfiApBillSaveDTO; import org.springblade.thirdparty.bfi.pojo.dto.BfiApBillSaveEntryDTO; -import org.springblade.thirdparty.bfi.pojo.dto.BfiApBillSavePlanDTO; import org.springblade.thirdparty.bfi.pojo.dto.BfiPayApplyPushDTO; import org.springblade.thirdparty.bfi.pojo.dto.BfiPayApplyPushEntryDTO; import org.springblade.thirdparty.bfi.pojo.dto.BfiPayApplyQueryDTO; @@ -112,7 +111,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; @@ -825,7 +823,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl approvedPayments = approvedSettlementPayments(entity, context); + // 付款计划 planentity 暂不传(联调待确认后启用):启用后送正式结算单下绑定、单据状态为审核通过(approved) + // 的付款信息,每条付款信息一行,awrp_entry_code_p 取付款单号(A103-1 下推 awrp_finapbill_entryid 勾稽此值, + // 取数见 approvedSettlementPayments);当前不传由金蝶按明细自动汇总生成,A103-1 推送前经 A102-4 反查 awrp_entry_code_p + // List approvedPayments = approvedSettlementPayments(entity, context); + // if (Func.isNotEmpty(approvedPayments)) { + // List planentity = new ArrayList<>(); + // for (FormalSettlementPayment payment : approvedPayments) { + // BfiApBillSavePlanDTO plan = new BfiApBillSavePlanDTO(); + // // 外部系统来源分录标识(候选键):付款单号 + // plan.setAwrpEntryCodeP(payment.getPaymentNo()); + // // 应付金额:付款信息申请付款金额 + // plan.setPlanpricetax(money(payment.getAppliedAmount())); + // // 【必填】项目.项目编码(联调期临时传金蝶测试档案值) + // plan.setPlanprojectNumber(KingdeeBfiConstant.BFI_AP_BILL_PROJECT_NUMBER_TEST); + // // 到期日:付款信息创建日期(yyyy-MM-dd) + // plan.setPlanduedate(payment.getCreateTime() == null ? null + // : payment.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString()); + // planentity.add(plan); + // planEntryCodes.add(payment.getPaymentNo()); + // } + // param.setPlanentity(planentity); + // } + // 付款计划未传时勾稽标识集合保持为空,A103-1 推送前经 A102-4 反查金蝶生成的 awrp_entry_code_p List planEntryCodes = new ArrayList<>(); - if (Func.isNotEmpty(approvedPayments)) { - List planentity = new ArrayList<>(); - for (FormalSettlementPayment payment : approvedPayments) { - BfiApBillSavePlanDTO plan = new BfiApBillSavePlanDTO(); - // 外部系统来源分录标识(候选键):付款单号 - plan.setAwrpEntryCodeP(payment.getPaymentNo()); - // 应付金额:付款信息申请付款金额 - plan.setPlanpricetax(money(payment.getAppliedAmount())); - // 【必填】项目.项目编码(联调期临时传金蝶测试档案值) - plan.setPlanprojectNumber(KingdeeBfiConstant.BFI_AP_BILL_PROJECT_NUMBER_TEST); - // 到期日:付款信息创建日期(yyyy-MM-dd) - plan.setPlanduedate(payment.getCreateTime() == null ? null - : payment.getCreateTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate().toString()); - planentity.add(plan); - planEntryCodes.add(payment.getPaymentNo()); - } - param.setPlanentity(planentity); - } // TODO 待业务确认:存在预付款抵扣时是否需传预付信息 preentry(y_billtype/y_billid/y_settleamt),本期不传、后续迭代 BfiBillSaveResultVO saveResult = bfiService.saveApBill(param); @@ -1185,8 +1185,8 @@ public class PaymentApplicationServiceImpl extends BaseServiceImpl