From 0ee46d33cc339f3fd17593e6bfe2f033afe6019a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 17 六月 2026 15:14:13 +0800
Subject: [PATCH] feat:合同新增时显示供应属性 出库新增根据合同出库 资金账目新增时间条件检索 新增延期出货菜单
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 cede782..b6007cf 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
@@ -14,6 +14,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 鍚堝悓鏍囩殑鐗╂槑缁嗗疄浣撶被
@@ -52,7 +53,7 @@
private String materialCode;
@Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍐呴儴鍞竴鍚嶇О锛�")
- @Column(columnDefinition = "VARCHAR(64) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
+ @Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
private String materialInternalName;
@Schema(description = "鏍囩殑鐗╄鏍�/鍨嬪彿")
@@ -99,17 +100,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 '浜や粯鐘舵��'")
@@ -156,4 +157,33 @@
@Schema(description = "鏈�杩戜竴娆′氦浠樻暟閲�")
@Column(columnDefinition = "decimal(10,2) comment '鏈�杩戜竴娆′氦浠樻暟閲�'")
private BigDecimal lastDeliveredQuantity;
+
+ @Schema(description = "鎶勮〃缂栧彿")
+ @Column(columnDefinition="VARCHAR(64) comment '鎶勮〃琛ㄥ彿'")
+ private String meterReadCode;
+
+ @Schema(description = "鎶勮〃鏁板瓧")
+ @Column(columnDefinition="decimal(10,0) comment '鎶勮〃鏁板瓧'")
+ private BigDecimal meterReadNum;
+
+ @Schema(description = "鎶勮〃鍗曟嵁鍚嶇О")
+ @Column(columnDefinition="text comment '鍗曟嵁鍚嶇О'")
+ private String meterReadAttNames;
+
+ @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="text comment '澶囨敞'")
+ private String remarks;
+
}
\ No newline at end of file
--
Gitblit v1.9.1