From 2d9665253e34da384fde299e2bc152a99f0c8ece Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:59:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 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..ca72362 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;
@@ -33,15 +36,27 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ /**
+ * 鎵瑰彿
+ */
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
+
+ /**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ @TableField("order_no")
+ private String orderNo;
/**
* 浠撳簱鍙�
@@ -52,31 +67,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
- * 浠撳簱鍙�
+ * 鏉＄爜
*/
- @ApiModelProperty(value= "鍔╄鐮�")
- private String mnemonic;
+ @ApiModelProperty(value= "鏉＄爜")
+ private String color;
/**
- * 浠撳簱鍙�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
- * 浠撳簱鍙�
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
- * 浠撳簱鍙�
+ * 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -98,9 +113,9 @@
private String zpallet;
/**
- * 鐢ㄦ埛ID
+ * 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
/**
@@ -144,11 +159,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 +190,5 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
-
}
--
Gitblit v1.9.1