From 921ed67368431c332b68450a0407b0bd151052c5 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 26 五月 2023 12:20:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/models/InoutRecord.java | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
index d7ffef0..ee1179e 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutRecord.java
@@ -10,7 +10,11 @@
import lombok.Data;
/**
- * 鍑哄叆搴撴暟鎹褰曪紝褰撳墠璁板綍鍖呮嫭 鍏ュ簱淇℃伅鍜屽嚭鍏ュ簱淇℃伅锛�
+ * @Desc: 鍑哄叆搴撴祦姘磋〃锛屾牴鎹柊鍥界伯瑙勮皟鏁翠紭鍖栧瓧娈�
+ *
+ * @author: Andy
+ * @update-time: 2023/5/26
+ *
*/
@Data
@Entity
@@ -27,7 +31,7 @@
private String companyId;
@Column(name = "DEPT_ID_", length = 50)
- @PropertyDef(label = "閮ㄩ棬ID", description = "鐢ㄤ簬鍖哄垎閮ㄩ棬")
+ @PropertyDef(label = "搴撳尯缂栫爜")
private String deptId;
@Column(name = "NOTICE_ID_", length = 40)
@@ -92,16 +96,12 @@
private String intelCard;
@Column(name = "PLATE_NUM_", length = 20)
- @PropertyDef(label = "杞︾墝鍙�")
+ @PropertyDef(label = "杞﹁埞鍙�", description = "杞︾墝鍙�+鏍囪瘑绗�")
private String plateNum;
- @Column(name = "TRANS_TYPE_", length = 10)
- @PropertyDef(label = "杩愯緭鏂瑰紡", description = "姹借溅锛岀伀杞︺�佽疆鑸广�佸叾浠�")
+ @Column(name = "TRANS_TYPE_", length = 6)
+ @PropertyDef(label = "杩愯緭宸ュ叿")
private String transType = TransType.TYPE_1.getCode();
-
- @Column(name = "SPEC_TYPE_", length = 10)
- @PropertyDef(label = "瑙勬牸", description = "鏁ｇ伯锛�25kg, 50kg")
- private String specType = "鏁ｇ伯";
@Column(name = "CUSTOMER_ID_", length = 40)
@PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
@@ -123,7 +123,6 @@
@Column(name = "FOOD_LEVEL_", length = 40)
@PropertyDef(label = "绮绛夌骇")
private String foodLevel;
-
@Column(name = "FOOD_LOCATION_", length = 40)
@PropertyDef(label = "浜у湴鍚嶇О")
@@ -147,13 +146,13 @@
private String checkId;
// 绉伴噸鍜屾墸閲嶄俊鎭�
- @Column(name = "IMPURITY_")
- @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
- private Double impurity = 0.0;
-
- @Column(name = "WET_")
- @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
- private Double wet = 0.0;
+// @Column(name = "IMPURITY_")
+// @PropertyDef(label = "鏉傝川", description = "鐧惧垎姣�")
+// private Double impurity = 0.0;
+//
+// @Column(name = "WET_")
+// @PropertyDef(label = "姘村垎", description = "鐧惧垎姣�")
+// private Double wet = 0.0;
@Column(name = "DE_IMPURITY_")
@PropertyDef(label = "鏉傝川鎵ｉ噸", description = "鍗曚綅KG")
@@ -255,6 +254,10 @@
private String settleTag = Constant.YN_N;
+ @Column(name = "SPEC_TYPE_", length = 10)
+ @PropertyDef(label = "瑙勬牸", description = "鏁ｇ伯锛�25kg, 50kg")
+ private String specType = "鏁ｇ伯";
+
//--------鐗堟湰4.0璋冩暣瀛楁 --------------//
// @Column(name = "jsdh", length = 42)
// @PropertyDef(label = "缁撶畻鍗曞彿")
@@ -279,8 +282,6 @@
// @Column(name = "bzbjs", length = 2)
// @PropertyDef(label = "鍖呬欢鏁�", description = "鍗曚綅锛氫欢")
// private int bzbjs;
-
-
@Override
--
Gitblit v1.9.3