From 2db76f2066701cbe292f206ad49a7f8523b8aa9f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 14 八月 2026 16:30:25 +0800
Subject: [PATCH] feat:银行流水关联多个合同，新增预收款开票，所有List校验调整为ColUtil
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
index 12ac3db..5101ab4 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
@@ -28,21 +28,13 @@
@EqualsAndHashCode(callSuper = true)
public class ContractSubjectMatter extends BaseModel<ContractSubjectMatter> {
- @Schema(description = "鎺掍骇璁″垝ID")
- @Column(columnDefinition = "bigint comment '鎺掍骇璁″垝ID'")
- private Long productionPlanId;
-
- @Schema(description = "鎺掍骇璁″垝鍚嶇О")
- @Column(columnDefinition = "VARCHAR(200) comment '鎺掍骇璁″垝鍚嶇О'")
- private String productionPlanName;
-
@Schema(description = "鍏宠仈鍚堝悓ID")
@Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
private Long contractId;
- @Schema(description = "鍚堝悓鍚嶇О")
- @Column(columnDefinition = "VARCHAR(200) comment '鍚堝悓鍚嶇О'")
- private String contractName;
+ @Schema(description = "鏍囩殑鐗╄鍙�")
+ @Column(columnDefinition = "VARCHAR(10) comment '鏍囩殑鐗╄鍙�'")
+ private String lineNo;
@Schema(description = "鏍囩殑鐗╁悕绉�")
@Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╁悕绉�'")
@@ -53,7 +45,7 @@
private String materialCode;
@Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍐呴儴鍞竴鍚嶇О锛�")
- @Column(columnDefinition = "VARCHAR(64) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
+ @Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
private String materialInternalName;
@Schema(description = "鏍囩殑鐗╄鏍�/鍨嬪彿")
@@ -100,17 +92,17 @@
@Column(columnDefinition = "VARCHAR(500) comment '浜よ揣/浜や粯鍦扮偣'")
private String deliveryPlace;
- @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 = "VARCHAR(64) comment '璁″垝浜や粯鏃ユ湡'")
- private String plannedDeliveryDate;
+ @Column(columnDefinition = "date comment '璁″垝浜や粯鏃ユ湡'")
+ private Date plannedDeliveryDate;
- @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 = "VARCHAR(64) comment '瀹為檯浜や粯鏃ユ湡'")
- private String actualDeliveryDate;
+ @Column(columnDefinition = "date comment '瀹為檯浜や粯鏃ユ湡'")
+ private Date actualDeliveryDate;
@Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠橈級")
@Column(columnDefinition = "tinyint(2) default 0 comment '浜や粯鐘舵��'")
@@ -173,4 +165,21 @@
@Schema(description = "鎶勮〃鍗曟嵁璺緞")
@Column(columnDefinition="text comment '鍗曟嵁璺緞'")
private String meterReadAttPaths;
+
+ @Schema(description = "鍗曢噸")
+ @Column(columnDefinition = "decimal(10,2) comment '鍗曢噸 /kg'")
+ private BigDecimal singleWight;
+
+ @Schema(description = "鎬婚噸")
+ @Column(columnDefinition = "decimal(10,2) comment '鎬婚噸 /kg'")
+ private BigDecimal totalWight;
+
+ @Schema(description = "棰勫紑绁ㄦ暟閲�")
+ @Column(columnDefinition="decimal(10,2) DEFAULT 0.00 comment '棰勫紑绁ㄦ暟閲�'")
+ private BigDecimal advanceNum;
+
+ @Schema(description = "澶囨敞")
+ @Column(columnDefinition="text comment '澶囨敞'")
+ private String remarks;
+
}
\ No newline at end of file
--
Gitblit v1.9.1