From ac013c265b424108baa3e6e7503fb7157663720c Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Fri, 30 Oct 2026 13:48:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../procurement/entity/OverseasProcurementOrder.java | 6 ++++-- .../service/ProcurementWorkflowPersistenceTest.java | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/entity/OverseasProcurementOrder.java b/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/entity/OverseasProcurementOrder.java index 02cdee57f..344c5bba7 100644 --- a/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/entity/OverseasProcurementOrder.java +++ b/lastleg-service/src/main/java/com/baiyue/lastleg/procurement/entity/OverseasProcurementOrder.java @@ -33,8 +33,10 @@ public class OverseasProcurementOrder { private Long inboundQuantity; @TableField(updateStrategy = FieldStrategy.ALWAYS) private LocalDateTime estimatedArrivalAt; private String status; - private String customerRejectionReason; - private String rejectedPhotoIds; + /** 重新提交采购完成时必须显式清空上一轮客户驳回原因。 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private String customerRejectionReason; + /** 驳回照片快照随新一轮提交一并清理，避免继续提示旧批次。 */ + @TableField(updateStrategy = FieldStrategy.ALWAYS) private String rejectedPhotoIds; @TableField(updateStrategy = FieldStrategy.ALWAYS) private String remark; private String idempotencyKey; private String requestHash; diff --git a/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/ProcurementWorkflowPersistenceTest.java b/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/ProcurementWorkflowPersistenceTest.java index 2a99a6e0d..d8f7c754a 100644 --- a/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/ProcurementWorkflowPersistenceTest.java +++ b/lastleg-service/src/test/java/com/baiyue/lastleg/procurement/service/ProcurementWorkflowPersistenceTest.java @@ -133,6 +133,11 @@ class ProcurementWorkflowPersistenceTest { assertThat(resubmitted.receipts().get(0).fileIds()).containsExactly(101L); assertThat(resubmitted.receipts().get(1).fileIds()).containsExactly(104L); assertThat(resubmitted.stockQuantity()).isEqualTo(10); + // 重新查询数据库及详情，避免仅内存对象清空而刷新后旧原因又出现。 + var persisted = orders.findNo("9", "CG-1"); + assertThat(persisted.getCustomerRejectionReason()).isNull(); + assertThat(persisted.getRejectedPhotoIds()).isNull(); + assertThat(tx.execute(s -> service.read("9", "CG-1")).rejectionReason()).isNull(); assertThat(tx.execute(s -> service.requestConfirmation("9", "CG-1", "7", command)).version()).isEqualTo(5); }