From 7979226b829e6df76b66b25a6d709832af338e2e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 15:39:15 +0800
Subject: [PATCH] 新增采购退货后，如果对应的采购退货审批也通过，采购退货记录不能删除，删除按钮置灰
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
index a89317b..abe0b8a 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -44,6 +44,18 @@
@Schema(description = "渚涘簲鍟唅d")
private Long supplierId;
+ @Schema(description = "鍙戣揣绫诲瀷 1璐ц溅 2蹇��")
+ private Integer shippingType;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
+ private String truckPlateNo;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ private String expressNo;
+
@Schema(description = "椤圭洰id")
private Long projectId;
@@ -82,7 +94,6 @@
private BigDecimal totalAmount;
@Schema(description = "褰曞叆鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
--
Gitblit v1.9.3