From 96868c07fba2beda4a33d4789abe43e01bafc61b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 26 九月 2022 14:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd931b9..2a220ef 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -174,6 +174,27 @@
@TableField("ctn_no")
private String ctnNo;
+ /**
+ * 娑堥槻鐐圭紪鍙�
+ */
+ @ApiModelProperty(value= "")
+ @TableField("fire_no")
+ private String fireNo;
+
+ /**
+ * 娑堥槻鐘舵��
+ */
+ @ApiModelProperty(value= "娑堥槻鐘舵�亄0:姝ｅ父,1:鎶ヨ}")
+ @TableField("fire_status")
+ private Integer fireStatus;
+
+ /**
+ * 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}
+ */
+ @ApiModelProperty(value= "浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.闈欑疆涓�;4:闈欑疆瀹屾垚}")
+ @TableField("pack_status")
+ private Integer packStatus;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -269,4 +290,36 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFireStatus$() {
+ if (null == this.fireStatus){ return null; }
+ switch (this.fireStatus){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "鎶ヨ";
+ default:
+ return String.valueOf(this.fireStatus);
+ }
+ }
+
+ public String getPackStatus$() {
+ if (null == this.packStatus){ return null; }
+ switch (this.packStatus){
+ case 0:
+ return "鏃�";
+ case 1:
+ return "寰呮祴";
+ case 2:
+ return "娴嬭瘯涓�";
+ case 3:
+ return "娴嬭瘯瀹屾垚";
+ case 4:
+ return "闈欑疆涓�";
+ case 5:
+ return "闈欑疆瀹屾垚";
+ default:
+ return String.valueOf(this.packStatus);
+ }
+ }
+
}
--
Gitblit v1.9.1