From 27c184d7af2775a4d647348ee508f4de335df8fb Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 11 三月 2026 15:28:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasDevp.java | 29 ++++++++++++++++++++++++++---
1 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 0e683f1..b4f54f2 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -14,6 +14,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.Locale;
@Data
@TableName("asr_bas_devp")
@@ -140,7 +141,7 @@
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "缁戝畾搴撳尯")
private String area;
@ApiModelProperty(value= "")
@@ -214,6 +215,10 @@
@TableField("cart_pos")
private Integer cartPos;
+ @ApiModelProperty(value = "1妤兼媶鍨涗笂浼犲彔鐩樺洖搴撴爣璁�")
+ @TableField("report_sign")
+ private Integer reportSign;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -222,15 +227,32 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getArea$() {
+ if (Cools.isEmpty(this.area)) {
+ return "";
+ }
+ String normalized = this.area.trim();
+ String upper = normalized.toUpperCase(Locale.ROOT);
+ if ("1".equals(normalized) || "A".equals(upper) || "A鍖�".equals(upper) || "A搴�".equals(upper) || "A搴撳尯".equals(upper)) {
+ return "A搴撳尯";
+ }
+ if ("2".equals(normalized) || "B".equals(upper) || "B鍖�".equals(upper) || "B搴�".equals(upper) || "B搴撳尯".equals(upper)) {
+ return "B搴撳尯";
+ }
+ if ("3".equals(normalized) || "C".equals(upper) || "C鍖�".equals(upper) || "C搴�".equals(upper) || "C搴撳尯".equals(upper)) {
+ return "C搴撳尯";
+ }
+ return normalized;
+ }
public String getLocType1$() {
if (null == this.locType1){ return null; }
switch (this.locType1){
case 0:
return "鏈煡";
case 1:
- return "灏忓簱浣�";
+ return "浣庡簱浣�";
case 2:
- return "澶у簱浣�";
+ return "楂樺簱浣�";
default:
return String.valueOf(this.locType1);
}
@@ -297,3 +319,4 @@
}
}
+
--
Gitblit v1.9.1