From e045a93166bcf696012770856c1ac36cf92740b5 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 22 一月 2026 17:51:50 +0800
Subject: [PATCH] 增加单价配置
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
index d205fea..7385857 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java
@@ -18,7 +18,6 @@
@Entity
@Table(name = "d_quantity")
@TableName("d_quantity")
-@IdClass(QuantityKey.class)
@EqualsAndHashCode(callSuper = false)
public class Quantity extends BizBaseEntity implements Serializable {
@@ -30,16 +29,14 @@
public static String SORT_PROP = "receiveDate";
@Id
- @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鎵规缂栧彿'")
+ @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鎵规缂栧彿:浠撳簱缂栫爜_yyyyMMddHHmmss'")
@TableField("batch_id")
private String batchId;
- @Id
@Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
@TableField("dept_id")
private String deptId;
- @Id
@Column(name = "depot_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炰粨搴�'")
@TableField("depot_id")
private String depotId;
@@ -47,6 +44,10 @@
@Column(name = "diameter", columnDefinition = "decimal(20,2) COMMENT '绛掍粨鐩村緞(鍗曚綅锛氱背)'")
@TableField("diameter")
private Double diameter = 0.0;
+
+ @Column(name = "height_per", columnDefinition = "decimal(20,2) COMMENT '妫�娴嬮珮搴︾櫨鍒嗘瘮(鍗曚綅锛�%)'")
+ @TableField("height_per")
+ private Double heightPer = 0.0;
@Column(name = "height", columnDefinition = "decimal(20,2) COMMENT '妫�娴嬮珮搴�(鍗曚綅锛氱背)'")
@TableField("height")
@@ -64,7 +65,7 @@
@TableField("points")
private String points;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
@Column(name = "receive_date", columnDefinition = "datetime COMMENT '妫�娴嬫椂闂�'")
@TableField("receive_date")
private Date receiveDate;
@@ -78,5 +79,7 @@
private String remark;
@Transient
+ @TableField(exist = false)
private Depot depotData;
+
}
--
Gitblit v1.9.3