From 61b40ca50044c8b20b6ea21028398e068ca103a0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:16:14 +0800
Subject: [PATCH] 调整DEVICE的字段和缓存，增加支持根据ID直接获取设备信息，优化MODBUS-TCP协议 实现
---
igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
index 2a744c0..37f168b 100644
--- a/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
+++ b/igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -23,13 +23,17 @@
private static final long serialVersionUID = 1L;
@Id
- @Column(name = "ID_", length = 40)
- @PropertyDef(label = "涓婚敭")
+ @Column(name = "ID_", length = 41)
+ @PropertyDef(label = "绮鎬ц川杞彉鍗曞彿", description = "鐢辫揣浣嶄唬鐮�+鍒掕浆鏃ユ湡锛坹yyyMMdd锛�+3浣嶉『搴忓彿缁勬垚")
private String id;
@Column(name = "COMPANY_ID_", length = 10)
@PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
+
+ @Column(name = "hwdm", length = 30)
+ @PropertyDef(label = "璐т綅浠ｇ爜", description = "鍏宠仈璐т綅淇℃伅鎺ュ彛璐т綅浠ｇ爜")
+ private String hwdm;
@Column(name = "DEPT_ID_", length = 40)
@PropertyDef(label = "鍒嗗簱缂栫爜")
@@ -40,11 +44,11 @@
private String depotId;
@Column(name = "NUMBER_")
- @PropertyDef(label = "绮鏁伴噺")
+ @PropertyDef(label = "绮鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double number = 0.0;
@Column(name = "CHANGE_NUMBER_")
- @PropertyDef(label = "鍒掕浆鏁伴噺")
+ @PropertyDef(label = "鍒掕浆鏁伴噺", description = "鍗曚綅锛氬叕鏂�")
private Double changeNumber = 0.0;
@Column(name = "APPROVAL_ID_", length = 40)
@@ -52,19 +56,29 @@
private String approvalId;
@Column(name = "FOOD_VARIETY_", length = 10)
- @PropertyDef(label = "绮鍝佺")
+ @PropertyDef(label = "绮鍝佺", description = "浠ｇ爜涓嶈冻7浣嶉渶鍦ㄦ湯浣嶈ˉ0")
private String foodVariety;
+ /**
+ * 100銆佸偍澶囩伯 110銆佷腑澶偍澶囩伯 120銆佸湴鏂瑰偍澶囩伯
+ * 121銆佺渷(鑷不鍖恒�佺洿杈栧競)绾у湴鏂瑰偍澶囩伯
+ * 122銆佸競(鍦板尯銆佽嚜娌诲窞銆佺洘)绾у湴鏂瑰偍澶囩伯
+ * 123銆佸幙(鑷不鍘裤�佸幙绾у競銆佹棗銆佽嚜娌绘棗銆佸競杈栧尯銆佹灄鍖恒�佺壒鍖�)绾у湴鏂瑰偍澶囩伯
+ * 129銆佸叾浠栧偍澶囩伯 200銆佸晢鍝佺伯 270銆佷腑鍌ㄧ伯绯荤粺鍟嗗搧绮�
+ * 280銆佽繘鍙ｅ晢鍝佺伯 290銆佸叾浠栧晢鍝佺伯 300銆佹斂绛栨�х伯椋�
+ * 310銆佹渶浣庢敹璐环绮� 320銆佸浗瀹朵复鏃跺瓨鍌ㄧ伯 330銆佸浗瀹朵复鍌ㄨ繘鍙ｇ伯
+ * 340銆佸湴鏂逛复鏃跺瓨鍌ㄧ伯
+ */
@Column(name = "FOOD_TYPE_", length = 10)
- @PropertyDef(label = "鍘熺伯椋熸�ц川")
+ @PropertyDef(label = "鍒掕浆鍓嶇伯椋熸�ц川浠ｇ爜")
private String foodType;
@Column(name = "NEW_FOOD_TYPE_", length = 10)
- @PropertyDef(label = "鍙樻洿鍚庢�ц川")
+ @PropertyDef(label = "鍒掕浆鍚庣伯椋熸�ц川浠ｇ爜")
private String newFoodType;
@Column(name = "CHANGE_TIME_")
- @PropertyDef(label = "鍙樻洿鏃堕棿")
+ @PropertyDef(label = "鍒掕浆鏃ユ湡")
private Date changeTime;
@PropertyDef(label = "浠撳偍瀹℃牳浜�")
@@ -89,7 +103,7 @@
@Column(name = "INFO_ZJSH_", length = 200)
@PropertyDef(label = "瀹℃牳璇存槑")
- private String InfoZjsh;
+ private String infoZjsh;
@PropertyDef(label = "缁熻瀹℃牳浜�")
@Column(name = "tjshr", length = 64)
@@ -101,7 +115,7 @@
@Column(name = "INFO_TJSH_", length = 200)
@PropertyDef(label = "瀹℃牳璇存槑")
- private String InfoTjsh;
+ private String infoTjsh;
@PropertyDef(label = "浼氳瀹℃牳浜�")
@Column(name = "kjshr", length = 64)
@@ -113,7 +127,7 @@
@Column(name = "INFO_KJSH_", length = 200)
@PropertyDef(label = "瀹℃牳璇存槑")
- private String InfoKjsh;
+ private String infoKjsh;
@PropertyDef(label = "棰嗗瀹℃牳浜�")
@Column(name = "ldshr", length = 64)
@@ -125,10 +139,15 @@
@Column(name = "INFO_LDSH_", length = 200)
@PropertyDef(label = "瀹℃牳璇存槑")
- private String InfoLdsh;
+ private String infoLdsh;
+
+ @Column(name = "czbz", length = 1)
+ @PropertyDef(label = "鎿嶄綔鏍囧織", description = "i:鏂板鏁版嵁锛堥粯璁わ級u:鏇存柊鏁版嵁 d:鍒犻櫎鏁版嵁")
+ private String czbz;
+
@Column(name = "UPDATE_TIME_")
- @PropertyDef(label = "鏇存柊鏃堕棿")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date updateTime;
@Column(name = "REMARK_", length = 200)
--
Gitblit v1.9.3