From 780012a4b70c87c81c5c9222db82196303eeebdb Mon Sep 17 00:00:00 2001 From: cpT <1@123> Date: 星期四, 26 六月 2025 17:19:19 +0800 Subject: [PATCH] #改造 --- src/main/java/com/zy/asrs/entity/BasErrLog.java | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/BasErrLog.java b/src/main/java/com/zy/asrs/entity/BasErrLog.java index e0c2d43..218fd43 100644 --- a/src/main/java/com/zy/asrs/entity/BasErrLog.java +++ b/src/main/java/com/zy/asrs/entity/BasErrLog.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools; import com.core.common.SpringUtils; +import com.zy.asrs.service.BasWrkIotypeService; +import com.zy.asrs.service.BasWrkStatusService; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -175,7 +177,8 @@ public BasErrLog() {} - public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { + public BasErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo, + String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) { this.uuid = uuid; this.wrkNo = wrkNo; this.startTime = startTime; @@ -285,6 +288,15 @@ this.wrkSts = wrkSts; } + public String getWrkSts$(){ + BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class); + BasWrkStatus basWrkStatus = service.selectById(this.wrkSts); + if (!Cools.isEmpty(basWrkStatus)){ + return String.valueOf(basWrkStatus.getWrkDesc()); + } + return null; + } + public Integer getIoType() { return ioType; } @@ -293,6 +305,15 @@ this.ioType = ioType; } + public String getIoType$(){ + BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class); + BasWrkIotype basWrkIotype = service.selectById(this.ioType); + if (!Cools.isEmpty(basWrkIotype)){ + return String.valueOf(basWrkIotype.getIoDesc()); + } + return null; + } + public Integer getCrnNo() { return crnNo; } -- Gitblit v1.9.1