From 066d47dd62f249cf80d4f212fc4f3be56d2b0276 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期六, 09 五月 2026 15:37:13 +0800
Subject: [PATCH] 标的物加入排产计划信息，产品加入型号
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 a9ef21c..314f6d9 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
@@ -6,13 +6,12 @@
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
import jakarta.persistence.Transient;
import lombok.Data;
-import org.hibernate.annotations.Table;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.util.Date;
/**
* 鍚堝悓鏍囩殑鐗╂槑缁嗗疄浣撶被
@@ -21,8 +20,18 @@
*/
@Data
@Entity
-@Table(appliesTo = "contract_subject_matter", comment = "鍚堝悓鏍囩殑鐗╂槑缁嗚〃")
+@Table(name = "contract_subject_matter")
+@ToString(callSuper = true)
+@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'")
@@ -91,14 +100,14 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "璁″垝浜や粯鏃ユ湡")
- @Column(columnDefinition = "datetime comment '璁″垝浜や粯鏃ユ湡'")
- private Date plannedDeliveryDate;
+ @Column(columnDefinition = "VARCHAR(64) comment '璁″垝浜や粯鏃ユ湡'")
+ private String plannedDeliveryDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹為檯浜や粯鏃ユ湡")
- @Column(columnDefinition = "datetime comment '瀹為檯浜や粯鏃ユ湡'")
- private Date actualDeliveryDate;
+ @Column(columnDefinition = "VARCHAR(64) comment '瀹為檯浜や粯鏃ユ湡'")
+ private String actualDeliveryDate;
@Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠� 3-閫炬湡锛�")
@Column(columnDefinition = "tinyint(2) default 0 comment '浜や粯鐘舵��'")
@@ -127,8 +136,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "楠屾敹鏃堕棿")
- @Column(columnDefinition = "datetime comment '楠屾敹鏃堕棿'")
- private Date acceptTime;
+ @Column(columnDefinition = "VARCHAR(64) comment '楠屾敹鏃堕棿'")
+ private String acceptTime;
/**
@@ -137,5 +146,5 @@
@Transient
@TableField(exist = false)
@Schema(description = "宸蹭氦浠樻暟閲忥紙涓存椂瀛楁锛�")
- private BigDecimal deliveredQuantity;
+ private Double deliveredQuantity;
}
\ No newline at end of file
--
Gitblit v1.9.1