From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java | 98 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 82 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
index 3f80dc0..d485cb9 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfo.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,51 +18,117 @@
@TableName("shipping_info")
public class ShippingInfo {
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @ApiModelProperty(value = "閿�鍞彴璐d")
- private Long salesLedgerId;
-
@TableField(exist = false)
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
+ @Schema(description = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
@TableField(exist = false)
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty(value = "鍙戣揣鏃ユ湡")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @Schema(description = "閿�鍞彴璐d")
+ private Long salesLedgerId;
+
+ @Schema(description = "閿�鍞姤浠蜂骇鍝佽〃id")
+ private Long salesLedgerProductId;
+
+ @Schema(description = "鐘舵�� 寰呭鏍� 瀹℃牳涓� 锛屽鏍告嫆缁� 瀹℃牳閫氳繃 宸插彂璐�")
+ @Excel(name = "鐘舵��")
+ private String status;
+
+ @Schema(description = "鍙戣揣鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date shippingDate;
- @ApiModelProperty(value = "鍙戣揣杞︾墝鍙�")
+ @Schema(description = "鍙戣揣缂栧彿")
+ @Excel(name = "鍙戣揣缂栧彿")
+ private String shippingNo;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ @Excel(name = "蹇�掑崟鍙�")
+ private String expressNumber;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ @Excel(name = "蹇�掑叕鍙�")
+ private String expressCompany;
+
+ @Schema(description = "鍙戣揣绫诲瀷")
+ @Excel(name = "鍙戣揣绫诲瀷")
+ private String type;
+
+ @Schema(description = "鍙戣揣杞︾墝鍙�")
@Excel(name = "鍙戣揣杞︾墝鍙�")
private String shippingCarNumber;
- @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;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "鍙戣揣鍗曟嵁锛堟枃鏈級")
+ @Excel(name = "鍙戣揣鍗曟嵁")
+ private String shippingDocument;
+
+ @Schema(description = "鏄惁瀵硅处锛堝嬀閫夋锛�0鍚� 1鏄級")
+ @Excel(name = "鏄惁瀵硅处")
+ private Integer isReconciled;
+
+ @Schema(description = "瀵硅处鍗曞綊妗ｆ儏鍐碉紙鏂囨湰鍩燂級")
+ @Excel(name = "瀵硅处鍗曞綊妗ｆ儏鍐�")
+ private String statementArchivingStatus;
+
+ @Schema(description = "鏄惁缁撶畻锛堝嬀閫夋锛�0鍚� 1鏄級")
+ @Excel(name = "鏄惁缁撶畻")
+ private Integer isSettled;
+
+ @Schema(description = "缁撶畻鍗曞綊妗ｆ儏鍐碉紙鏂囨湰鍩燂級")
+ @Excel(name = "缁撶畻鍗曞綊妗ｆ儏鍐�")
+ private String settlementArchivingStatus;
+
+ @Schema(description = "鏄惁宸插紑绁紙鍕鹃�夋锛�0鍚� 1鏄級")
+ @Excel(name = "鏄惁宸插紑绁�")
+ private Integer isInvoiced;
+
+ @Schema(description = "椤圭洰ID")
+ private Long projectId;
+
+ @TableField(exist = false)
+ @Schema(description = "椤圭洰鍚嶇О")
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
+
+ @TableField(exist = false)
+ @Schema(description = "寮�濮嬪彂璐ф棩鏈�")
+ private String beginShippingDate;
+
+ @TableField(exist = false)
+ @Schema(description = "缁撴潫鍙戣揣鏃ユ湡")
+ private String endShippingDate;
}
--
Gitblit v1.9.3