From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 11 八月 2023 11:48:10 +0800
Subject: [PATCH] 调整Pressure的接口包位置到COre中，然后增加modBus-TCP协议通讯报道
---
igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
index 6a36aa5..b92102a 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutSettle.java
@@ -18,7 +18,7 @@
@Id
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "娴佹按鍙�")
+ @PropertyDef(label = "娴佹按鍙�",description = "缁撶畻鏃ユ湡锛坹yyyMMdd锛�+4浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@@ -34,13 +34,12 @@
private String inoutType;
@Column(name = "BIZ_TYPE_")
- @PropertyDef(label = "澶勭悊鏂瑰紡", description = "鍗曡溅缁撶畻/鍚堝悓缁撶畻")
+ @PropertyDef(label = "澶勭悊鏂瑰紡", description = "0=鍗曡溅缁撶畻/1=鍚堝悓缁撶畻")
private String bizType;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "鎵�灞炰粨搴�")
private String depotId;
-
@Column(name = "CONTRACT_ID_", length = 40)
@PropertyDef(label = "鍚堝悓缂栫爜", description = "閽堝杞崲绮蹇呭～")
@@ -55,9 +54,9 @@
@PropertyDef(label = "鍗曚环")
private Double payPrice = 0.0;
- @Column(name = "PAY_SUM_")
+ @Column(name = "PAY_MONEY_")
@PropertyDef(label = "缁撶畻鎬婚")
- private Double paySum = 0.0;
+ private Double payMoney = 0.0;
@Column(name = "SETTLE_WEIGHT_")
@PropertyDef(label = "缁撶畻閲嶉噺")
@@ -79,12 +78,20 @@
@PropertyDef(label = "鏀舵浜虹渷浠借瘉鍙�")
private String payeeId;
- @Column(name = "BANK_", length = 40)
- @PropertyDef(label = "寮�鎴疯")
+ @Column(name = "BANK_CATEGORY_", length = 10)
+ @PropertyDef(label = "閾惰琛屽埆浠ｇ爜")
+ private String bankCategory;
+
+ @Column(name = "BANK_CODE_", length = 20)
+ @PropertyDef(label = "寮�鎴疯鍙�")
+ private String bankCode;
+
+ @Column(name = "BANK_", length = 50)
+ @PropertyDef(label = "寮�鎴疯鍚嶇О")
private String bank;
@Column(name = "BANK_NUM_", length = 20)
- @PropertyDef(label = "閾惰鍗″彿")
+ @PropertyDef(label = "閾惰璐﹀彿")
private String bankNum;
@Column(name = "PAY_UNIT_", length = 50)
--
Gitblit v1.9.3