提交

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;

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);
     }