From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Loc.java | 88 ++++++++++++++++++--------------------------
1 files changed, 36 insertions(+), 52 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 478733c..a70200f 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;
@@ -59,9 +57,9 @@
private Long code;
/**
- * 姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬
+ * 姣旂爜鏂瑰悜闃�
*/
- @ApiModelProperty(value= "姣旂爜鏂瑰悜闃� 1: 澶т簬 0 灏忎簬")
+ @ApiModelProperty(value= "姣旂爜鏂瑰悜闃�")
private Integer compDirect;
/**
@@ -80,19 +78,19 @@
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer row;
+ private Integer rowNo;
/**
* 鍒�
*/
@ApiModelProperty(value= "鍒�")
- private Integer bay;
+ private Integer bayNo;
/**
* 灞�
*/
@ApiModelProperty(value= "灞�")
- private Integer lev;
+ private Integer levNo;
/**
* 搴撲綅鐮�
@@ -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,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public Loc(String uuid,Long zoneId,String locNo,String name,Long code,Long locSts,Double offset,Integer rowNo,Integer bayNo,Integer levNo,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;
@@ -170,9 +168,9 @@
this.code = code;
this.locSts = locSts;
this.offset = offset;
- this.row = row;
- this.bay = bay;
- this.lev = lev;
+ this.rowNo = rowNo;
+ this.bayNo = bayNo;
+ this.levNo = levNo;
this.zpallet = zpallet;
this.locType = locType;
this.status = status;
@@ -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.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,36 +242,22 @@
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 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);
}
--
Gitblit v1.9.1