From 020f48adb61a0350924783c1b397bd381d20ddc8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 19 六月 2025 11:13:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs' into jxtlfwcs
---
src/main/java/com/zy/asrs/entity/LocMast.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 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..68917a5 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -174,6 +174,30 @@
@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;
+
+ /**
+ * 浜у搧鐘舵�亄0:绌洪棽,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;}
+ */
+ @ApiModelProperty(value= "浜у搧鐘舵�亄0:绌洪棽,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;}")
+ @TableField("pack_status")
+ private Integer packStatus;
+
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -269,4 +293,42 @@
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 "娴嬭瘯NG";
+ case 5:
+ return "闈欑疆涓�";
+ case 6:
+ return "闈欑疆瀹屾垚";
+ case 7:
+ return "鏆傚仠娴嬭瘯";
+ case 8:
+ return "绱ф�ュ嚭搴�";
+ default:
+ return String.valueOf(this.packStatus);
+ }
+ }
+
}
--
Gitblit v1.9.1