From 6332b04bc7991a310b13aef044082621d618479a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 19 五月 2026 17:02:19 +0800
Subject: [PATCH] feat:新增赊销、抵抹账功能 合同新增销售模式字段，新增生成新合同接口 出库：出库多余配件处理
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 761d6ac..00cdc25 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
@@ -94,8 +94,8 @@
@Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡'")
private Integer deliveryCycle;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@Schema(description = "鍒版湡鏃ユ湡")
@Column(columnDefinition = "date comment '鍒版湡鏃ユ湡'")
private Date expirationDate;
@@ -139,6 +139,22 @@
@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;
+
+ @Schema(description = "閿�鍞ā寮�")
+ @Column(columnDefinition = "VARCHAR(16) comment '閿�鍞ā寮� 1 鎸夊崟鐢熶骇 2 鍏堜骇鍚庨攢 3 浠ｅ偍浠ｉ攢'")
+ private String salesModel;
+
+ @Schema(description = "宸蹭粯娆鹃噾棰�")
+ @Column(columnDefinition = "decimal(10,2) comment '宸蹭粯娆鹃噾棰�'")
+ private BigDecimal paidAmount;
+
/**
* 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
*/
--
Gitblit v1.9.1