From a0a32468bd6f5e887938674d3c2cf70cc2f555b8 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期五, 15 五月 2026 08:33:27 +0800
Subject: [PATCH] 开会后对客商排产计划，销售人员的整体修改1
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
index 4259cf4..083b595 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ProductionPlan.java
@@ -8,9 +8,10 @@
import jakarta.persistence.Entity;
import jakarta.persistence.Transient;
import lombok.Data;
-import org.hibernate.annotations.Table;
-import org.springframework.format.annotation.DateTimeFormat;
+import org.hibernate.annotations.Comment;
+import org.springframework.format.annotation.DateTimeFormat;
+import jakarta.persistence.Table;
import java.util.List;
/**
@@ -20,16 +21,21 @@
**/
@Data
@Entity
-@Table(appliesTo = "production_plan", comment = "鎺掍骇璁″垝")
+@Table(name = "production_plan")
+@Comment("鎺掍骇璁″垝")
public class ProductionPlan extends BaseModel<BusinessCustomer> {
- @Schema(description = "鎵�灞炲悎鍚岀紪鍙�")
+ /*@Schema(description = "鎵�灞炲悎鍚岀紪鍙�")
@Column(columnDefinition = "VARCHAR(64) comment '鍚堝悓缂栧彿'")
private String contractNo;
@Schema(description = "鎵�灞炲悎鍚屽悕绉�")
@Column(columnDefinition = "VARCHAR(200) comment '鍚堝悓鍚嶇О'")
- private String contractName;
+ private String contractName;*/
+
+ @Schema(description = "鍚堝悓id")
+ @Column(columnDefinition = "bigint comment '鍚堝悓id'")
+ private Long contractId;
@Schema(description = "鎺掍骇璁″垝缂栧彿")
@Column(columnDefinition = "VARCHAR(64) comment '鎺掍骇璁″垝缂栧彿'")
@@ -41,21 +47,21 @@
@Schema(description = "鐢叉柟id")
@Column(columnDefinition = "bigint comment '鐢叉柟id'")
- private Long partyAId;
+ private Long partyaid;
@Schema(description = "鐢叉柟鍚嶇О")
@Column(columnDefinition = "VARCHAR(100) comment '鐢叉柟鍚嶇О'")
- private String partyA;
+ private String partya;
@Schema(description = "涔欐柟id")
@Column(columnDefinition = "bigint comment '涔欐柟id'")
- private Long partyBId;
+ private Long partybid;
@Schema(description = "涔欐柟鍚嶇О")
@Column(columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
- private String partyB;
+ private String partyb;
- @Schema(description = "閲戦")
+/* @Schema(description = "閲戦")
@Column(columnDefinition = "double comment '閲戦'")
private Double amount;
@@ -65,21 +71,25 @@
@Schema(description = "绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
@Column(columnDefinition = "tinyint(2) default 0 comment '绫诲瀷'")
- private Integer contractType;
+ private Integer contractType;*/
- @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+ /*@Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
@Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
- private Integer supplyAttribute;
+ private Integer supplyAttribute;*/
@Schema(description = "璁″垝鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
@Column(columnDefinition = "tinyint(2) default 0 comment '璁″垝鐘舵��'")
private Integer status;
- @Schema(description = "鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
- @Column(columnDefinition = "tinyint(2) default 0 comment '鏈嶅姟灞炴��'")
- private Integer attribute;
+ @Schema(description = "鏄惁鎺ㄩ�乪rp锛�0-娌℃湁 1-鎺ㄩ�侊級")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '鏄惁鎺ㄩ�乪rp锛�0-娌℃湁 1-鎺ㄩ�侊級'")
+ private Integer sendErp;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ /*@Schema(description = "鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '鏈嶅姟灞炴��'")
+ private Integer attribute;*/
+
+ /* @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "绛剧讲鏃ユ湡")
@Column(columnDefinition = "VARCHAR(64) comment '绛剧讲鏃ユ湡'")
@@ -95,23 +105,29 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "鍒版湡鏃ユ湡")
@Column(columnDefinition = "VARCHAR(64) comment '鍒版湡鏃ユ湡'")
- private String expirationDate;
+ private String expirationDate;*/
@Schema(description = "澶囨敞")
@Column(columnDefinition = "TEXT comment '澶囨敞'")
private String remark;
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹℃壒鏃堕棿")
@Column(columnDefinition = "datetime comment '瀹℃壒鏃堕棿'")
- private String approveTime;
+ private String approveTime;*/
+
+ /*@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Schema(description = "杞垚鍚堝悓鏃堕棿")
+ @Column(columnDefinition = "datetime comment '杞垚鍚堝悓鏃堕棿'")
+ private String contractTime;*/
/**
* 鏍囩殑鐗�
*/
@Transient
@TableField(exist = false)
- private List<ContractSubjectMatter> contractSubjectMatterList;
+ private List<PlanSubjectMatter> planSubjectMatterList;
}
--
Gitblit v1.9.1