From 7ebe16b9abbee8e884db27d2ec360f17455b14f2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 24 八月 2021 09:03:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index c523cc6..584ce60 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -1,8 +1,12 @@
package com.zy.asrs.entity;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,48 +34,39 @@
@TableField("io_time")
private Date ioTime;
- /**
- * 鐗╂枡
- */
- @ApiModelProperty(value= "鐗╂枡")
- private String matnr;
+ @ApiModelProperty(value= "浜у搧缂栫爜")
+ @TableId(value = "mat_no")
+ private String matNo;
- /**
- * 鐗╂枡鎻忚堪
- */
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
- private String maktx;
+ @ApiModelProperty(value= "浜у搧鍚嶇О")
+ @TableId(value = "mat_name")
+ private String matName;
-
- /**
- * 浠撳簱鍙�
- */
@ApiModelProperty(value= "瑙勬牸")
- private String lgnum;
+ private String specs;
+
+ @ApiModelProperty(value= "灏哄")
+ private String size;
+
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ @ApiModelProperty(value= "鍗曢噸")
+ private Double weight;
/**
- * 浠撳簱鍙�
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
- private String type;
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("bill_no")
+ private String billNo;
/**
- * 浠撳簱鍙�
+ * 搴忓彿
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supplier;
-
- /**
- * 浠撳簱鍙�
- */
- @ApiModelProperty(value= "浠撳簱")
- private String warehouse;
+ @ApiModelProperty(value= "搴忓彿")
+ @TableField("seq_no")
+ private Integer seqNo;
/**
* 浠撳簱鍙�
@@ -83,13 +78,13 @@
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private Double qty;
/**
* 鍗曚綅
*/
@ApiModelProperty(value= "鍗曚綅")
- private String altme;
+ private String unit;
/**
* 鎵樼洏鏉＄爜
@@ -144,11 +139,29 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getModiUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.modiUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
+ }
+
+ public String getAppeUser$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.appeUser);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getUsername());
+ }
+ return null;
}
public String getAppeTime$(){
@@ -157,6 +170,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
--
Gitblit v1.9.1