From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
index 41a0d34..6399728 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShipmentApproval.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,49 +18,49 @@
public class ShipmentApproval {
@TableId(type = IdType.AUTO)
private Long id;
- @ApiModelProperty(value = "鍙戣揣淇℃伅id")
+ @Schema(description = "鍙戣揣淇℃伅id")
private Long shippingInfoId;
- @ApiModelProperty(value = "閿�鍞彴璐d")
+ @Schema(description = "閿�鍞彴璐d")
private Long salesLedgerId;
- @ApiModelProperty(value = "閿�鍞姤浠蜂骇鍝佽〃id")
+ @Schema(description = "閿�鍞姤浠蜂骇鍝佽〃id")
private Long salesLedgerProductId;
- @ApiModelProperty(value = "鐢宠閮ㄩ棬id")
+ @Schema(description = "鐢宠閮ㄩ棬id")
private Long approveDeptId;
- @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
+ @Schema(description = "鐢宠閮ㄩ棬鍚嶇О")
@Excel(name = "鐢宠閮ㄩ棬")
private String approveDeptName;
- @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛id")
+ @Schema(description = "瀹℃壒鐢ㄦ埛id")
private Integer approveUserId;
- @ApiModelProperty(value = "瀹℃壒鐢ㄦ埛鍚嶇О")
+ @Schema(description = "瀹℃壒鐢ㄦ埛鍚嶇О")
@Excel(name = "瀹℃壒鐢ㄦ埛")
private String approveUserNames;
/**
* 瀹℃壒鐘舵��
*/
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈嚭搴�,1宸插嚭搴�,2寰呭鏍�,3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+ @Schema(description = "瀹℃壒鐘舵�侊細0鏈嚭搴�,1宸插嚭搴�,2寰呭鏍�,3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
@Excel(name = "瀹℃壒鐘舵��", readConverterExp = "0=鏈嚭搴�,1=宸插嚭搴�,2=寰呭鏍�,3=瀹℃牳瀹屾垚,4=瀹℃牳澶辫触")
private Integer approveStatus;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Integer createUser;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@@ -176,28 +176,28 @@
@TableField(exist = false)
private BigDecimal futureTicketsAmount;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
+ @Schema(description = "寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal invoiceNum;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ @Schema(description = "鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal noInvoiceNum;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+ @Schema(description = "寮�绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal invoiceAmount;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal noInvoiceAmount;
- @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
+ @Schema(description = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal currentInvoiceNum;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
+ @Schema(description = "鏈寮�绁ㄩ噾棰�")
private BigDecimal currentInvoiceAmount;
/**
@@ -212,31 +212,31 @@
@TableField(exist = false)
private Long productModelId;
- @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+ @Schema(description = "鍒濆鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal originalNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @Schema(description = "涓存椂鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempnoInvoiceAmount;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @Schema(description = "涓存椂鏈潵绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempFutureTickets;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempFutureTicketsAmount;
- @ApiModelProperty("鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
@TableField(exist = false)
private String register;
- @ApiModelProperty("鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false)
@@ -295,7 +295,7 @@
private String entryPerson;
@TableField(exist = false)
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String entryPersonName;
@@ -321,32 +321,35 @@
private BigDecimal contractAmount;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
@TableField(exist = false)
private LocalDate executionDate;
@TableField(exist = false)
- @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
@Excel(name = "宸插紑绁ㄩ噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "鍥炴閲戦")
+ @Schema(description = "鍥炴閲戦")
private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
@TableField(exist = false)
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ @Schema(description = "寰呭洖娆鹃噾棰�")
private BigDecimal noReceiptAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
@TableField(exist = false)
private String paymentMethod;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ @Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3