From 09c46e67c54d9ea538e2041565f57e995c60ccb8 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期日, 25 五月 2025 12:58:52 +0800
Subject: [PATCH] 外置输送线修改
---
src/main/java/com/zy/asrs/entity/StaDesc.java | 122 ++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/StaDesc.java b/src/main/java/com/zy/asrs/entity/StaDesc.java
index 9c61158..dfe703c 100644
--- a/src/main/java/com/zy/asrs/entity/StaDesc.java
+++ b/src/main/java/com/zy/asrs/entity/StaDesc.java
@@ -8,6 +8,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.BasWrkIotypeService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +25,7 @@
/**
* 璺緞ID
*/
- @ApiModelProperty(value= "璺緞ID")
+ @ApiModelProperty(value = "璺緞ID")
@TableId(value = "type_id", type = IdType.AUTO)
@TableField("type_id")
private Long typeId;
@@ -32,7 +33,7 @@
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableId(value = "type_no", type = IdType.INPUT)
@TableField("type_no")
private Integer typeNo;
@@ -40,14 +41,14 @@
/**
* 浣滀笟绫诲瀷
*/
- @ApiModelProperty(value= "浣滀笟绫诲瀷")
+ @ApiModelProperty(value = "浣滀笟绫诲瀷")
@TableField("type_desc")
private String typeDesc;
/**
* 浣滀笟绔欑偣
*/
- @ApiModelProperty(value= "浣滀笟绔欑偣")
+ @ApiModelProperty(value = "浣滀笟绔欑偣")
@TableId(value = "stn_no", type = IdType.INPUT)
@TableField("stn_no")
private Integer stnNo;
@@ -55,14 +56,14 @@
/**
* 绔欑偣鍚嶇О
*/
- @ApiModelProperty(value= "绔欑偣鍚嶇О")
+ @ApiModelProperty(value = "绔欑偣鍚嶇О")
@TableField("stn_desc")
private String stnDesc;
/**
* 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄彿")
@TableId(value = "crn_no", type = IdType.INPUT)
@TableField("crn_no")
private Integer crnNo;
@@ -70,47 +71,48 @@
/**
* 鍫嗗灈鏈虹珯鐐�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈虹珯鐐�")
+ @ApiModelProperty(value = "鍫嗗灈鏈虹珯鐐�")
@TableField("crn_stn")
private Integer crnStn;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @ApiModelProperty(value = "淇敼浜哄憳")
@TableField("modi_user")
private Long modiUser;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @ApiModelProperty(value = "淇敼鏃堕棿")
@TableField("modi_time")
private Date modiTime;
/**
* 鍒涘缓鑰�
*/
- @ApiModelProperty(value= "鍒涘缓鑰�")
+ @ApiModelProperty(value = "鍒涘缓鑰�")
@TableField("appe_user")
private Long appeUser;
/**
* 娣诲姞鏃堕棿
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @ApiModelProperty(value = "娣诲姞鏃堕棿")
@TableField("appe_time")
private Date appeTime;
- public StaDesc() {}
+ public StaDesc() {
+ }
- public StaDesc(String typeDesc,String stnDesc,Integer crnStn,String memo,Long modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ public StaDesc(String typeDesc, String stnDesc, Integer crnStn, String memo, Long modiUser, Date modiTime, Long appeUser, Date appeTime) {
this.typeDesc = typeDesc;
this.stnDesc = stnDesc;
this.crnStn = crnStn;
@@ -160,17 +162,17 @@
return stnNo;
}
- public String getStnNo$(){
+ public void setStnNo(Integer stnNo) {
+ this.stnNo = stnNo;
+ }
+
+ public String getStnNo$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.stnNo);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setStnNo(Integer stnNo) {
- this.stnNo = stnNo;
}
public String getStnDesc() {
@@ -185,34 +187,34 @@
return crnNo;
}
- public String getCrnNo$(){
+ public void setCrnNo(Integer crnNo) {
+ this.crnNo = crnNo;
+ }
+
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
- }
-
- public void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
}
public Integer getCrnStn() {
return crnStn;
}
- public String getCrnStn$(){
+ public void setCrnStn(Integer crnStn) {
+ this.crnStn = crnStn;
+ }
+
+ public String getCrnStn$() {
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.crnStn);
- if (!Cools.isEmpty(basDevp)){
+ if (!Cools.isEmpty(basDevp)) {
return String.valueOf(basDevp.getDevNo());
}
return null;
- }
-
- public void setCrnStn(Integer crnStn) {
- this.crnStn = crnStn;
}
public String getMemo() {
@@ -227,64 +229,76 @@
return modiUser;
}
- public String getModiUser$(){
+ public void setModiUser(Long modiUser) {
+ this.modiUser = modiUser;
+ }
+
+ public String getModiUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
}
public Date getModiTime() {
return modiTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public void setModiTime(Date modiTime) {
+ this.modiTime = modiTime;
+ }
+
+ public String getModiTime$() {
+ if (Cools.isEmpty(this.modiTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
}
public Long getAppeUser() {
return appeUser;
}
- public String getAppeUser$(){
+ public void setAppeUser(Long appeUser) {
+ this.appeUser = appeUser;
+ }
+
+ public String getAppeUser$() {
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appeUser);
- if (!Cools.isEmpty(user)){
+ if (!Cools.isEmpty(user)) {
return String.valueOf(user.getUsername());
}
return null;
- }
-
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
return appeTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public void setAppeTime(Date appeTime) {
+ this.appeTime = appeTime;
+ }
+
+ public String getAppeTime$() {
+ if (Cools.isEmpty(this.appeTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
+ public String getTypeNo$() {
+ if (Cools.isEmpty(this.typeNo)) {
+ return "";
+ }
+ BasWrkIotypeService basWrkIotypeService = SpringUtils.getBean(BasWrkIotypeService.class);
+ BasWrkIotype basWrkIotype = basWrkIotypeService.selectById(this.typeNo);
+ if (basWrkIotype == null) {
+ return "";
+ }
+ return basWrkIotype.getIoDesc();
}
--
Gitblit v1.9.1