From 550b14e27b9bba40e80f1141d0943d1dc62acbbc Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期一, 22 五月 2023 15:26:55 +0800
Subject: [PATCH] 优化广东粮食购销接口
---
src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
index c8b34da..7e1d9bf 100644
--- a/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
+++ b/src/main/java/com/fzzy/async/fzzy35/entity/Fz35InoutRecord.java
@@ -31,7 +31,7 @@
private String deptId;
@Column(name = "NOTICE_ID_", length = 40)
- @PropertyDef(label = "閫氱煡鍗旾d")
+ @PropertyDef(label = "閫氱煡鍗曠紪鐮�")
private String noticeId;
@Column(name = "DEPOT_ID_", length = 50)
@@ -86,10 +86,6 @@
@PropertyDef(label = "鎵胯繍浜哄湴鍧�")
private String userAddress;
- @Column(name = "CUR_STORAGE_")
- @PropertyDef(label = "褰撳墠搴撳瓨")
- private double curStorage = 0.0;
-
// 鍩烘湰淇℃伅
@Column(name = "INTEL_CARD_", length = 20)
@PropertyDef(label = "鏅烘収鍗″彿")
@@ -104,7 +100,7 @@
private String transType; //TransType.TYPE_1.getCode();
@Column(name = "CUSTOMER_ID_", length = 40)
- @PropertyDef(label = "寰�鏉ュ崟浣岻D", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
+ @PropertyDef(label = "寰�鏉ュ崟浣�", description = "鍏ュ簱鏃讹紝琛ㄧず鍙戣揣鍗曚綅锛屽嚭搴撴椂鍊欒〃绀烘敹璐у崟浣�")
private String customerId;
@Column(name = "CUSTOMER_NAME_", length = 50)
@@ -124,8 +120,9 @@
@PropertyDef(label = "绮绛夌骇")
private String foodLevel;
+
@Column(name = "FOOD_LOCATION_", length = 40)
- @PropertyDef(label = "绮浜у湴")
+ @PropertyDef(label = "浜у湴鍚嶇О")
private String foodLocation;
@Column(name = "FOOD_YEAR_", length = 20)
@@ -161,7 +158,6 @@
@Column(name = "DE_WET_")
@PropertyDef(label = "姘村垎鎵ｉ噸", description = "鍗曚綅KG")
private Double deWet = 0.0;
-
@Column(name = "DE_HANDLE_")
@PropertyDef(label = "鍊间粨鎵ｉ噸", description = "鍗曚綅KG")
@@ -204,8 +200,12 @@
private Double netWeight = 0.0;
@Column(name = "SETTLE_WEIGHT_")
- @PropertyDef(label = "缁撶畻鍑�閲�", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
+ @PropertyDef(label = "缁撶畻閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝鍗曚綅KG")
private Double settleWeight = 0.0;
+
+ @Column(name = "RECORD_WEIGHT_")
+ @PropertyDef(label = "鍏ュ簱閲嶉噺", description = "鎵ｉ噸鍚庡噣閲嶏紝缁撶畻鍑�閲嶏紝琛ュ寘鎷閲嶏紝鍗曚綅KG")
+ private Double recordWeight = 0.0;
@Column(name = "PRICE_")
@PropertyDef(label = "鍗曚环", description = "鍗曚綅锛氬厓/鍏枻")
@@ -240,13 +240,6 @@
@Column(name = "SETTLE_TAG_", length = 2)
@PropertyDef(label = "鏄惁缁撶畻", description = "Y:琛ㄧず宸茬粨绠楋紱N:琛ㄧず鏈粨绠�")
- private String settleTag ;
-
- @Override
- public String toString() {
- return "InoutRecord [id=" + id + ", depotId=" + depotId + ", type="
- + type + ", settleWeight=" + settleWeight + ", completeTime="
- + completeTime + "]";
- }
+ private String settleTag;
}
--
Gitblit v1.9.3