From 96119ca3973d5ea643db6a87b6a23fe404ddb8cc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期一, 29 六月 2026 15:35:40 +0800
Subject: [PATCH] feat:合同编号规则调整 出库编号规则调整
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 39 +++++++++++----------------------------
1 files changed, 11 insertions(+), 28 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index 5d792d9..5502bcc 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -67,8 +67,8 @@
private Integer contractType;
@Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
- @Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
- private Integer supplyAttribute;
+ @Column(columnDefinition = "varchar(16) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
+ private String supplyAttribute;
@Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
@Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'")
@@ -247,32 +247,15 @@
@Column(columnDefinition = "decimal(10,0) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
private BigDecimal invoiceNotice;
- /**
- * 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
- */
- @Transient
- @TableField(exist = false)
- private String approverName;
- /**
- * 鏍囩殑鐗�
- */
- @Transient
- @TableField(exist = false)
- private List<ContractSubjectMatter> contractSubjectMatterList;
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ @Column(columnDefinition = "decimal(10,2) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ private BigDecimal contractTax;
+ @Schema(description = "缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤")
+ @Column(columnDefinition = "VARCHAR(32) comment '缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤'")
+ private String economicMatters;
- /**
- * 鏀舵闃舵
- */
- @Transient
- @TableField(exist = false)
- private List<ContractPaymentSchedule> contractPaymentScheduleList;
-
- /**
- * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
- */
- @Transient
- @TableField(exist = false)
- private Long remainingDays;
-
+ @Schema(description = "erp鍚堝悓缂栧彿")
+ @Column(columnDefinition = "VARCHAR(64) comment 'erp鍚堝悓缂栧彿'")
+ private String erpContractNo;
}
--
Gitblit v1.9.1