From 84e12ecd3923f28b62b8659b138a554b0f6e084d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 30 一月 2026 15:16:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rcs_master' into rcs_master
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
index 8347a1f..3b1b259 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java
@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.common.SpringUtils;
+import com.zy.acs.manager.manager.service.CodeService;
+import com.zy.acs.manager.manager.service.StaTypeService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -53,8 +56,20 @@
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
+ @ApiModelProperty(value= "浣滀笟楂樺害")
+ private Double height;
+
+ @ApiModelProperty(value= "浣滀笟娣卞害")
+ private Double depth;
+
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
+
+ @ApiModelProperty(value= "杩炵画鍏ュ簱绛夊緟(ms)")
+ private Integer inboundWait;
+
+ @ApiModelProperty(value= "杩炵画鍑哄簱绛夊緟(ms)")
+ private Integer outboundWait;
@ApiModelProperty(value= "鑷姩")
private String autoing;
@@ -107,23 +122,23 @@
// return null;
// }
//
-// public String getStaType$(){
-// StaTypeService service = SpringUtils.getBean(StaTypeService.class);
-// StaType staType = service.getById(this.staType);
-// if (!Cools.isEmpty(staType)){
-// return String.valueOf(staType.getName());
-// }
-// return null;
-// }
+ public String getStaType$(){
+ StaTypeService service = SpringUtils.getBean(StaTypeService.class);
+ StaType staType = service.getById(this.staType);
+ if (!Cools.isEmpty(staType)){
+ return String.valueOf(staType.getUuid());
+ }
+ return null;
+ }
//
-// public String getCode$(){
-// CodeService service = SpringUtils.getBean(CodeService.class);
-// Code code = service.getById(this.code);
-// if (!Cools.isEmpty(code)){
-// return String.valueOf(code.getUuid());
-// }
-// return null;
-// }
+ public String getCode$(){
+ CodeService service = SpringUtils.getBean(CodeService.class);
+ Code code = service.getCacheById(this.code);
+ if (!Cools.isEmpty(code)){
+ return String.valueOf(code.getData());
+ }
+ return null;
+ }
//
// public String getStaSts$(){
// StaStsService service = SpringUtils.getBean(StaStsService.class);
--
Gitblit v1.9.1