From 6d5b1cf59e0e013ab740998ca50c9d9cf52e4375 Mon Sep 17 00:00:00 2001 From: mrzhssss <pro6@qq.com> Date: 星期六, 09 四月 2022 13:53:36 +0800 Subject: [PATCH] # --- src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java index 242255f..1e957f4 100644 --- a/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java +++ b/src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java @@ -1,5 +1,7 @@ package zy.cloud.wms.manager.entity; +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.enums.IdType; import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotations.TableField; @@ -24,6 +26,8 @@ import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty; import com.core.common.SpringUtils; +import zy.cloud.wms.manager.service.OrderService; +import zy.cloud.wms.manager.service.QualityService; import zy.cloud.wms.system.service.UserService; import zy.cloud.wms.system.entity.User; import java.text.SimpleDateFormat; @@ -50,6 +54,7 @@ * ID */ @ApiModelProperty(value= "ID") + @TableId(value = "id",type = IdType.AUTO) private Long id; @ApiModelProperty(value= "") @@ -193,7 +198,7 @@ */ @ApiModelProperty(value= "璐ㄦ浜哄憳") @TableField("qua_user") - private String quaUser; + private Long quaUser; /** * 璐ㄦ鏃堕棿 @@ -205,7 +210,7 @@ public QualityDetl() {} - public QualityDetl(Long hostId,Long qualityId,String billNo,Integer seqNo,String orderNo,Double anfme,String matnr,String maktx,String specs,String model,String batch,String unit,Date prodDate,Double rejectQty,String rejectReason,Integer quaStatus,Long updateBy,Date updateTime,Long createBy,Date createTime,String quaUser,Date quaDate) { + public QualityDetl(Long hostId,Long qualityId,String billNo,Integer seqNo,String orderNo,Double anfme,String matnr,String maktx,String specs,String model,String batch,String unit,Date prodDate,Double rejectQty,String rejectReason,Integer quaStatus,Long updateBy,Date updateTime,Long createBy,Date createTime,Long quaUser,Date quaDate) { this.hostId = hostId; this.qualityId = qualityId; this.billNo = billNo; @@ -271,6 +276,15 @@ public Long getQualityId() { return qualityId; + } + + public String getQualityId$(){ + QualityService service = SpringUtils.getBean(QualityService.class); + Quality quality = service.selectById(this.qualityId); + if (!Cools.isEmpty(quality)){ + return String.valueOf(quality.getId()); + } + return null; } public void setQualityId(Long qualityId) { @@ -482,6 +496,15 @@ this.createTime = createTime; } + public String getQuaUser$(){ + UserService service = SpringUtils.getBean(UserService.class); + User user = service.selectById(this.quaUser); + if (!Cools.isEmpty(user)){ + return String.valueOf(user.getNickname()); + } + return null; + } + public Date getQuaDate() { return quaDate; } -- Gitblit v1.9.1