From 3284076d954004eed648633eed9b8abed4f0b277 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 16:16:04 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocMast.java | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..c9ab2f0 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -176,6 +176,24 @@
@TableField("ctn_no")
private String ctnNo;
+// 娑堥槻鐐圭紪鍙�
+ @ApiModelProperty(value= "")
+ @TableField("fire_no")
+ private String fireNo;
+
+// 娑堥槻鐘舵�亄0:姝ｅ父,1:鎶ヨ}
+ @ApiModelProperty(value= "")
+ @TableField("fire_status")
+ private Integer fireStatus;
+
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
+ @ApiModelProperty(value= "")
+ @TableField("pack_status")
+ private Integer packStatus;
+
+ @ApiModelProperty(value= "閫氶亾")
+ private Integer channel;
+
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
@@ -215,9 +233,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "娴嬭瘯搴撲綅";
case 2:
- return "楂樺簱浣�";
+ return "闈欑疆搴撲綅";
default:
return String.valueOf(this.locType1);
}
@@ -227,11 +245,19 @@
if (null == this.locType2){ return null; }
switch (this.locType2){
case 0:
- return "鏈煡";
+ return "";
case 1:
- return "绐勫簱浣�";
+ return "1鍙�";
case 2:
- return "瀹藉簱浣�";
+ return "2鍙�";
+ case 3:
+ return "3鍙�";
+ case 4:
+ return "4鍙�";
+ case 5:
+ return "5鍙�";
+ case 6:
+ return "6鍙�";
default:
return String.valueOf(this.locType2);
}
@@ -290,4 +316,43 @@
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);
+ }
+ }
+
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
+ 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