From 51603d9354ddef5d8960fe0e6b3e21059da5ff66 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 08 一月 2026 15:53:00 +0800
Subject: [PATCH] 数量检测提交1-页面数据交互

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Quantity.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 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 90c2f30..0657e7c 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;
@@ -60,11 +57,11 @@
     @TableField("weight")
     private Double weight = 0.00;
 
-    @Column(name = "points", columnDefinition = "longtext(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
+    @Column(name = "points", columnDefinition = "varchar(2000) COMMENT '閲囬泦鐐逛俊鎭�'")
     @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 +75,7 @@
     private String remark;
 
     @Transient
+    @TableField(exist = false)
     private Depot depotData;
+
 }

--
Gitblit v1.9.3