From a8785e8f5a8a34e1d5ac25c65fef4644a827db50 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 25 五月 2024 16:18:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..11608f6 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -1,9 +1,13 @@
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.common.utils.Synchro;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,6 +21,7 @@
private static final long serialVersionUID = 1L;
+ @TableId("zpallet")
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
@@ -27,12 +32,14 @@
@TableField("loc_no")
private String locNo;
+ @TableId("matnr")
@ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+ @TableId("batch")
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
@@ -49,7 +56,8 @@
@ApiModelProperty(value= "棰滆壊")
private String color;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "绫诲瀷")
+// @ApiModelProperty(value= "鍝佺墝")
private String brand;
@ApiModelProperty(value= "鍗曚綅")
@@ -216,6 +224,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ 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 void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1