From 39a1a9fa95708be564dbade4df36cb3b81ceae92 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 19 二月 2021 10:54:50 +0800
Subject: [PATCH] #出库（二期）
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 36 ++++++++++++++++++++++++++++--------
1 files changed, 28 insertions(+), 8 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..1514568 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -3,6 +3,9 @@
import com.baomidou.mybatisplus.annotations.TableField;
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;
@@ -31,15 +34,15 @@
private Date ioTime;
/**
- * 鐗╂枡
+ * 浜у搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "浜у搧")
private String matnr;
/**
- * 鐗╂枡鎻忚堪
+ * 浜у搧鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "浜у搧鎻忚堪")
private String maktx;
@@ -52,14 +55,14 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "浜у搧绫诲埆")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
/**
* 浠撳簱鍙�
@@ -144,11 +147,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 +178,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
--
Gitblit v1.9.1