From d3553d8dd6fc00634ac32228e5b8e4d0624eda11 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 11:10:51 +0800
Subject: [PATCH] 调整Modbus配置-解决轴流风机与轴流窗不在同一个分机配置的问题
---
igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
index 633b681..fdf340d 100644
--- a/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
+++ b/igds-recir/src/main/java/com/ld/igds/models/DrugLogDtl.java
@@ -19,11 +19,15 @@
@Entity
@Data
@Table(name = "D_DRUG_LOG_DTL")
-public class DrugLogDtl implements Serializable {
+ public class DrugLogDtl implements Serializable {
@Id
+ @Column(name = "DTL_ID_", length = 40)
+ @PropertyDef(label = "dtlId")
+ private String dtlId;
+
@Column(name = "ID_", length = 40)
- @PropertyDef(label = "id")
+ @PropertyDef(label = "id", description = "鐔忚捀缂栧彿+搴撳尯浠ｇ爜+濉姤鏃ユ湡")
private String id;
@Column(name = "DRUG_LOG_ID_", length = 4)
@@ -34,9 +38,10 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String deptId;
- @Column(name = "COMPANY_ID_", length = 10)
- @PropertyDef(label = "缁勭粐缂栫爜")
- private String companyId;
+ @Column(name = "tbrq")
+ @PropertyDef(label = "濉姤鏃ユ湡")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date tbrq;
@Column(name = "DEPOT_ID_", length = 50)
@PropertyDef(label = "浠撴埧/娌圭綈浠ｇ爜")
@@ -70,6 +75,10 @@
@PropertyDef(label = "绮俯")
private Double lw;
+ @Column(name = "cw", precision = 20, scale = 3)
+ @PropertyDef(label = "浠撴俯")
+ private Double cw;
+
@Column(name = "cnsd", precision = 20, scale = 3)
@PropertyDef(label = "浠撳唴婀垮害")
private Double cnsd;
--
Gitblit v1.9.3