From 3c65b4169a1bf08c94a58eef551d4c8466d21aab Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 05 二月 2026 10:56:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Sta.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 ff9e23a..720cd74 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
@@ -6,6 +6,7 @@
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;
@@ -55,8 +56,23 @@
@ApiModelProperty(value= "鍋忕Щ閲�")
private Double offset;
+ @ApiModelProperty(value= "浣滀笟楂樺害")
+ private Double height;
+
+ @ApiModelProperty(value= "浣滀笟娣卞害")
+ private Double depth;
+
@ApiModelProperty(value= "浣滀笟瑙掑害")
private String angle;
+
+ @ApiModelProperty(value= "璐у弶鏂瑰悜")
+ private Integer actDir;
+
+ @ApiModelProperty(value= "杩炵画鍏ュ簱绛夊緟(ms)")
+ private Integer inboundWait;
+
+ @ApiModelProperty(value= "杩炵画鍑哄簱绛夊緟(ms)")
+ private Integer outboundWait;
@ApiModelProperty(value= "鑷姩")
private String autoing;
@@ -109,14 +125,14 @@
// 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);
--
Gitblit v1.9.1