From fb57e7836338304b16c09fec4fb5c68fb688c39e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 四月 2026 14:03:24 +0800
Subject: [PATCH] 1.新增分区查询 2.任务档新增分区字段
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index c58c883..319f60b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import com.zy.asrs.service.*;
+import com.zy.asrs.utils.LocAliasUtils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import com.core.common.Cools;
@@ -65,6 +66,13 @@
@ApiModelProperty(value= "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
+
+ /**
+ * 搴撳尯锛�1=A鍖猴紝2=B鍖猴紝3=C鍖�
+ */
+ @ApiModelProperty(value= "搴撳尯")
+ @TableField("area_id")
+ private Integer areaId;
@ApiModelProperty(value= "")
@TableField("sheet_no")
@@ -391,6 +399,10 @@
return null;
}
+ public String getAreaId$(){
+ return LocAliasUtils.areaName(this.areaId);
+ }
+
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
@@ -402,9 +414,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.locNo;
}
public String getStaNo$(){
@@ -429,9 +441,9 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return LocAliasUtils.displayLocNo(locMast);
}
- return null;
+ return this.sourceLocNo;
}
public String getIoTime$(){
--
Gitblit v1.9.1