From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 05 八月 2026 08:34:26 +0800
Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java | 62 +++++++++++++++++++++----------
1 files changed, 42 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 cede782..9e6e16d 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;
/**
* 鍚堝悓鏍囩殑鐗╂槑缁嗗疄浣撶被
@@ -27,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 '鏍囩殑鐗╁悕绉�'")
@@ -52,7 +45,7 @@
private String materialCode;
@Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍐呴儴鍞竴鍚嶇О锛�")
- @Column(columnDefinition = "VARCHAR(64) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
+ @Column(columnDefinition = "VARCHAR(200) comment '鏍囩殑鐗╁悕绉�(鍐呴儴)'")
private String materialInternalName;
@Schema(description = "鏍囩殑鐗╄鏍�/鍨嬪彿")
@@ -99,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 '浜や粯鐘舵��'")
@@ -156,4 +149,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