From a45c4fb6232faf2f23b7b2ba45416f11a5390d77 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 21 三月 2026 16:50:15 +0800
Subject: [PATCH] feat(purchase): 完善采购退货模块及关联退货数量统计
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 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 c2004c3..5ff997f 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseReturnOrders.java
@@ -6,11 +6,17 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Getter;
import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* <p>
@@ -47,13 +53,20 @@
private Integer projectPhase;
@ApiModelProperty("鍒跺崟鏃ユ湡")
- private LocalDateTime preparedAt;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private LocalDate preparedAt;
@ApiModelProperty("鍒跺崟浜篿d")
private Long preparedUserId;
+ @ApiModelProperty("鍒跺崟浜哄悕绉�")
+ private String preparedUserName;
+
@ApiModelProperty("閫�鏂欎汉id")
private Long returnUserId;
+
+ @ApiModelProperty("閫�鏂欎汉鍚嶇О")
+ private String returnUserName;
@ApiModelProperty("閲囪喘璁㈠崟id")
private Long purchaseLedgerId;
@@ -61,11 +74,44 @@
@ApiModelProperty("澶囨敞")
private String remark;
+ @ApiModelProperty("'鏁村崟鎶樻墸棰�'")
+ private BigDecimal totalDiscountAmount;
+
+ @ApiModelProperty("'鏁村崟鎶樻墸鐜�'")
+ private BigDecimal totalDiscountRate;
+
+ @ApiModelProperty("'鎴愪氦閲戦'")
+ private BigDecimal totalAmount;
+
@ApiModelProperty("褰曞叆鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ @ApiModelProperty("鏀跺叆绫诲瀷")
+ @TableField(value = "income_type")
+ private Integer incomeType;
+
+
+ /**
+ *
+ */
+ @TableField(value = "create_user",fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(value = "update_user",fill = FieldFill.INSERT_UPDATE)
+ private Integer updateUser;
+
+ @TableField(value = "create_user_name", fill = FieldFill.INSERT)
+ private String createUserName;
+
+ @TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
+ private String updateUserName;
}
--
Gitblit v1.9.3