From d2adac4e369165ec523c23e7ffd19fc5775d43b5 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 11 四月 2022 08:14:14 +0800
Subject: [PATCH] Changes
---
src/main/java/zy/cloud/wms/manager/entity/QualityDetl.java | 130 ++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 39 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 14dd164..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= "")
@@ -162,35 +167,50 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("modi_user")
- private Long modiUser;
+ @TableField("update_by")
+ private Long updateBy;
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("modi_time")
+ @TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date modiTime;
+ private Date updateTime;
/**
* 鍒涘缓鑰�
*/
@ApiModelProperty(value= "鍒涘缓鑰�")
- @TableField("appe_user")
- private Long appeUser;
+ @TableField("create_by")
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("appe_time")
+ @TableField("create_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date appeTime;
+ private Date createTime;
+
+ /**
+ * 璐ㄦ浜哄憳
+ */
+ @ApiModelProperty(value= "璐ㄦ浜哄憳")
+ @TableField("qua_user")
+ private Long quaUser;
+
+ /**
+ * 璐ㄦ鏃堕棿
+ */
+ @ApiModelProperty(value= "璐ㄦ鏃堕棿")
+ @TableField("qua_date")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date quaDate;
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 modiUser,Date modiTime,Long appeUser,Date appeTime) {
+ 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;
@@ -207,10 +227,12 @@
this.rejectQty = rejectQty;
this.rejectReason = rejectReason;
this.quaStatus = quaStatus;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.quaUser = quaUser;
+ this.quaDate = quaDate;
}
// QualityDetl qualityDetl = new QualityDetl(
@@ -254,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) {
@@ -401,69 +432,90 @@
this.memo = memo;
}
- public Long getModiUser() {
- return modiUser;
+ public Long getUpdateBy() {
+ return updateBy;
}
- public String getModiUser$(){
+ public String getUpdateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.modiUser);
+ User user = service.selectById(this.updateBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
}
- public Date getModiTime() {
- return modiTime;
+ public Date getUpdateTime() {
+ return updateTime;
}
- public String getModiTime$(){
- if (Cools.isEmpty(this.modiTime)){
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
}
- public Long getAppeUser() {
- return appeUser;
+ public Long getCreateBy() {
+ return createBy;
}
- public String getAppeUser$(){
+ public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.appeUser);
+ User user = service.selectById(this.createBy);
if (!Cools.isEmpty(user)){
return String.valueOf(user.getNickname());
}
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
+ public void setCreateBy(Long createBy) {
+ this.createBy = createBy;
}
- public Date getAppeTime() {
- return appeTime;
+ public Date getCreateTime() {
+ return createTime;
}
- public String getAppeTime$(){
- if (Cools.isEmpty(this.appeTime)){
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
+ public void setCreateTime(Date createTime) {
+ 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;
+ }
+ public String getQuaDate$(){
+ if (Cools.isEmpty(this.quaDate)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.quaDate);
+ }
+
+ public void setQuaDate(Date quaDate) {
+ this.quaDate = quaDate;
+ }
}
--
Gitblit v1.9.1