From fca21683e1b5b906d2514082ddfbae8eb820c9ea Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 15 五月 2026 17:12:55 +0800
Subject: [PATCH] feat:合同模版、出库标的物、合同管理拆分
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index 5647387..de78174 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -13,6 +13,8 @@
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -53,8 +55,8 @@
private String partyB;
@Schema(description = "鍚堝悓閲戦")
- @Column(columnDefinition = "double comment '鍚堝悓閲戦'")
- private Double amount;
+ @Column(columnDefinition = "decimal(10,2) comment '鍚堝悓閲戦'")
+ private BigDecimal amount;
@Schema(description = "甯佺锛圕NY/USD绛夛級")
@Column(columnDefinition = "VARCHAR(10) default 'CNY' comment '甯佺'")
@@ -79,20 +81,24 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "绛剧讲鏃ユ湡")
- @Column(columnDefinition = "VARCHAR(64) comment '绛剧讲鏃ユ湡'")
- private String signDate;
+ @Column(columnDefinition = "date comment '绛剧讲鏃ユ湡'")
+ private Date signDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "鐢熸晥鏃ユ湡")
- @Column(columnDefinition = "VARCHAR(64) comment '鐢熸晥鏃ユ湡'")
- private String effectiveDate;
+ @Column(columnDefinition = "date comment '鐢熸晥鏃ユ湡'")
+ private Date effectiveDate;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ @Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡'")
+ private Integer deliveryCycle;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
- @Column(columnDefinition = "VARCHAR(64) comment '鍒版湡鏃ユ湡'")
- private String expirationDate;
+ @Column(columnDefinition = "date comment '鍒版湡鏃ユ湡'")
+ private Date expirationDate;
@Schema(description = "鍚堝悓闄勪欢URL")
@Column(columnDefinition = "VARCHAR(500) comment '鍚堝悓闄勪欢URL'")
@@ -111,7 +117,35 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹℃壒鏃堕棿")
@Column(columnDefinition = "datetime comment '瀹℃壒鏃堕棿'")
- private String approveTime;
+ private Date approveTime;
+
+ @Schema(description = "鍒拌揣鑺傜偣ID")
+ @Column(columnDefinition = "bigint comment '鍒拌揣鑺傜偣ID'")
+ private Long arrivalScheduleId;
+
+ @Schema(description = "楠屾敹鑺傜偣ID")
+ @Column(columnDefinition = "bigint comment '楠屾敹鑺傜偣ID'")
+ private Long acceptScheduleId;
+
+ @Schema(description = "erp鎺ㄩ�佹爣璇�")
+ @Column(columnDefinition = "char comment 'erp鎺ㄩ�佹爣璇� 0 鏈帹 1 宸叉帹'")
+ private String erpPushFlag;
+
+ @Schema(description = "寮�绁ㄧ姸鎬�")
+ @Column(columnDefinition = "char comment '寮�绁ㄧ姸鎬� 0 涓嶈兘寮�绁� 1 閮ㄥ垎鍙紑 2 寰呭紑 3 宸插紑'")
+ private String billingStatus;
+
+ @Schema(description = "宸插紑绁ㄩ噾棰�")
+ @Column(columnDefinition = "decimal(10,2) comment '宸插紑绁ㄩ噾棰�'")
+ private BigDecimal billingAmout;
+
+ @Schema(description = "涓嬩竴闃舵")
+ @Column(columnDefinition = "VARCHAR(128) comment '涓嬩竴闃舵'")
+ private String nextScheduleName;
+
+ @Schema(description = "妯＄増ID")
+ @Column(columnDefinition = "bigint comment '妯＄増ID'")
+ private Long templateId;
/**
* 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
--
Gitblit v1.9.1