diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/InvoiceReceiptSaveRequest.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/InvoiceReceiptSaveRequest.java index e0f12d09..f7b4c29b 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/InvoiceReceiptSaveRequest.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/dto/InvoiceReceiptSaveRequest.java @@ -53,8 +53,6 @@ public class InvoiceReceiptSaveRequest implements Serializable { private String bankName; private String bankAccount; private String issuingBank; - private String kingdeeBillNo; - private String kingdeeStatus; private String phone; private String customerEmails; private String departmentEmails; diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceipt.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceipt.java index 7c9546bc..0843525b 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceipt.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/entity/InvoiceReceipt.java @@ -148,18 +148,10 @@ public class InvoiceReceipt extends TenantEntity { * 当前处理人 */ private String currentProcessor; - /** - * 金蝶单据号(绑定票池后取发票流水号 serialNo) - */ - private String kingdeeBillNo; /** * 金蝶收票单单据编号(A303-2 批量保存生成/幂等预检命中回填) */ private String kingdeeReceivedInvoiceNo; - /** - * 金蝶同步状态(unsynced 未同步 / synced 已同步 / failed 同步失败) - */ - private String kingdeeStatus; /** * 收票单推送状态(unsynced 未推送 / pushed 已保存收票单 / assigned 已指定应付 / failed 推送失败) */ diff --git a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceReceiptVO.java b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceReceiptVO.java index eec9c0ad..d2380266 100644 --- a/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceReceiptVO.java +++ b/blade-service-api/blade-transport-api/src/main/java/org/springblade/transport/pojo/vo/InvoiceReceiptVO.java @@ -48,7 +48,6 @@ public class InvoiceReceiptVO extends InvoiceReceipt { @Serial private static final long serialVersionUID = 1L; @TableField(exist = false) private String settlementNos; @TableField(exist = false) private String approvalStatusName; - @TableField(exist = false) private String kingdeeStatusName; @TableField(exist = false) private String kingdeePushStatusName; @TableField(exist = false) private String createUserName; @TableField(exist = false) private String updateUserName; diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceReceiptController.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceReceiptController.java index 1ffc914b..b481275d 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceReceiptController.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/controller/InvoiceReceiptController.java @@ -149,13 +149,6 @@ public class InvoiceReceiptController extends BladeController { return R.success("作废成功"); } - @PostMapping("/sync-kingdee") - @ApiOperationSupport(order = 12) - @Operation(summary = "同步金蝶发票状态") - public R syncKingdee(@RequestParam Long id) { - return R.data(invoiceReceiptService.syncKingdee(id)); - } - @PostMapping("/push-kingdee") @ApiOperationSupport(order = 15) @Operation(summary = "批量推送金蝶收票单(A303-2 收票单保存 + A302-6 收票指定应付)") diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IInvoiceReceiptService.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IInvoiceReceiptService.java index b1d2045a..7931fde2 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IInvoiceReceiptService.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/IInvoiceReceiptService.java @@ -31,7 +31,6 @@ import org.springblade.transport.pojo.dto.InvoiceReceiptSaveRequest; import org.springblade.transport.pojo.dto.InvoiceReceiptStatusRequest; import org.springblade.transport.pojo.dto.KingdeeInvoicePoolQueryDTO; import org.springblade.transport.pojo.entity.InvoiceReceipt; -import org.springblade.transport.pojo.entity.KingdeeInvoicePool; import org.springblade.transport.pojo.vo.InvoiceReceiptVO; import org.springblade.transport.pojo.vo.KingdeeInvoicePoolPageVO; @@ -75,8 +74,6 @@ public interface IInvoiceReceiptService extends BaseService { void voidBill(InvoiceReceiptStatusRequest request); - String syncKingdee(Long id); - /** * 批量推送金蝶收票单(图05 环节②③:A303-2 收票单批量保存 + A302-6 收票指定应付)。 *

逐单独立成败:前置校验(审批通过、已绑定镜像、查验通过、恰好分摊一张应付结算单)→ @@ -95,16 +92,4 @@ public interface IInvoiceReceiptService extends BaseService { * @return 执行摘要 */ String syncKingdeeReceivedInvoiceResult(); - - /** - * 应用金蝶票池同步结果:回填收票登记绑定关系与同步状态(独立事务,仅手动单条同步使用) - * - * @param receipt 收票登记实体 - * @param invoice upsert 后的票据池镜像记录,null 表示金蝶票池未查询到 - * @param missReason 未命中原因,命中时可为空 - * @param rebind 是否强制重新绑定镜像(定时绑定链路退役后唯一调用方手动同步恒传 true,形参保守保留) - * @return 金蝶流水号(serialNo),未命中返回 null - */ - String applyInvoicePoolSyncResult(InvoiceReceipt receipt, KingdeeInvoicePool invoice, String missReason, - boolean rebind); } diff --git a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java index 477266a1..86579349 100644 --- a/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java +++ b/blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/InvoiceReceiptServiceImpl.java @@ -35,7 +35,6 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.Func; -import org.springblade.core.tool.utils.SpringUtil; import org.springblade.core.tool.utils.StringUtil; import org.springblade.thirdparty.bfi.constant.BfiConstant; import org.springblade.thirdparty.bfi.pojo.dto.BfiInvoicePoolQueryDTO; @@ -144,8 +143,6 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl poolInvoices = queryPoolByInvoiceNo(entity.getInvoiceNo()); - log.info("收票登记[{}]同步金蝶票池查询完成:命中 {} 条", entity.getInvoiceNo(), poolInvoices.size()); - if (poolInvoices.size() > 1) { - log.warn("收票登记[{}]同步金蝶票池命中 {} 条,取第一条", entity.getInvoiceNo(), poolInvoices.size()); - } - String missReason = null; - KingdeeInvoicePool mirror = null; - if (poolInvoices.isEmpty()) { - missReason = "金蝶票池未查询到发票"; - log.warn("收票登记[{}]同步金蝶未命中票池:{}", entity.getInvoiceNo(), missReason); - } else { - mirror = upsertInvoicePool(mirrorByInvoiceNo(poolInvoices.get(0).getInvoiceNo().trim()), - poolInvoices.get(0)); - log.info("收票登记[{}]同步金蝶镜像 upsert 完成:镜像id={},kingdeeBillNo={},镜像状态={}", entity.getInvoiceNo(), - mirror.getId(), mirror.getKingdeeBillNo(), mirror.getKingdeeStatus()); - } - // 经自代理独立事务:绑定回填 + 同步流水 - String billNo = self().applyInvoicePoolSyncResult(entity, mirror, missReason, true); - log.info("收票登记[{}]同步金蝶结束:回填kingdeeBillNo={}", entity.getInvoiceNo(), billNo); - return billNo; - } - // ==================== 图05 环节②③:A303-2 收票单批量保存 + A302-6 收票指定应付 ==================== @Override @@ -752,7 +717,7 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpllambdaQuery() .eq(KingdeeInvoicePool::getInvoiceNo, invoiceNo) @@ -1160,11 +1090,6 @@ public class InvoiceReceiptServiceImpl extends BaseServiceImpl "已作废"; default -> entity.getApprovalStatus(); }); - vo.setKingdeeStatusName(switch (entity.getKingdeeStatus() == null ? "" : entity.getKingdeeStatus()) { - case "synced" -> "已同步"; - case "failed" -> "同步失败"; - default -> "未同步"; - }); vo.setKingdeePushStatusName(switch (entity.getKingdeePushStatus() == null ? "" : entity.getKingdeePushStatus()) { case "pushed" -> "收票单已保存"; case "assigned" -> "已指定应付";