From 43412c20ac444392471ea8ea8bc4a93af39efe87 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 19 一月 2026 13:17:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 101 +++++++++++++++++++++-----------------------------
1 files changed, 43 insertions(+), 58 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
index b287147..d34dc3b 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java
@@ -7,8 +7,6 @@
import com.zy.acs.framework.common.SpringUtils;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.LocStsService;
-import com.zy.acs.manager.manager.service.LocTypeService;
-import com.zy.acs.manager.manager.service.ZoneService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -128,13 +126,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -146,7 +144,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -162,7 +160,7 @@
public Loc() {}
- public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer row,Integer bay,Integer lev,String zpallet,Long locType,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.zoneId = zoneId;
this.locNo = locNo;
@@ -208,32 +206,32 @@
// null // 澶囨敞
// );
- public String getZoneId$(){
- ZoneService service = SpringUtils.getBean(ZoneService.class);
- Zone zone = service.getById(this.zoneId);
- if (!Cools.isEmpty(zone)){
- return String.valueOf(zone.getName());
- }
- return null;
- }
+// public String getZoneId$(){
+// ZoneService service = SpringUtils.getBean(ZoneService.class);
+// Zone zone = service.getById(this.zoneId);
+// if (!Cools.isEmpty(zone)){
+// return String.valueOf(zone.getName());
+// }
+// return null;
+// }
public String getCode$(){
CodeService service = SpringUtils.getBean(CodeService.class);
- Code code = service.getById(this.code);
+ Code code = service.getCacheById(this.code);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
- public String getLocSts$(){
- LocStsService service = SpringUtils.getBean(LocStsService.class);
- LocSts locSts = service.getById(this.locSts);
- if (!Cools.isEmpty(locSts)){
- return String.valueOf(locSts.getName());
- }
- return null;
- }
+// public String getLocSts$(){
+// LocStsService service = SpringUtils.getBean(LocStsService.class);
+// LocSts locSts = service.getById(this.locSts);
+// if (!Cools.isEmpty(locSts)){
+// return String.valueOf(locSts.getName());
+// }
+// return null;
+// }
public String getLocStsEl(){
LocStsService service = SpringUtils.getBean(LocStsService.class);
@@ -244,50 +242,37 @@
return null;
}
- public String getLocType$(){
- LocTypeService service = SpringUtils.getBean(LocTypeService.class);
- LocType locType = service.getById(this.locType);
- if (!Cools.isEmpty(locType)){
- return String.valueOf(locType.getName());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "姝ｅ父";
- case 0:
- return "鍐荤粨";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
- }
- }
+// public String getLocType$(){
+// LocTypeService service = SpringUtils.getBean(LocTypeService.class);
+// LocType locType = service.getById(this.locType);
+// if (!Cools.isEmpty(locType)){
+// return String.valueOf(locType.getName());
+// }
+// return null;
+// }
public String getCompDirect$(){
if (null == this.compDirect){ return null; }
switch (this.compDirect){
case 1:
- return "澶т簬";
+ return "RIGHT";
case 0:
- return "灏忎簬";
+ return "LEFT";
default:
return String.valueOf(this.deleted);
}
}
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1