From f4f3c04ba37cec6739370c4aa0b9622493de8a23 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 25 三月 2022 20:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.97.1.152:5880/r/wms_saas
---
src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
index 79d3e56..e0d259d 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/PickoutDetl.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.enums.IdType;
-import com.core.common.Cools;import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
@@ -43,6 +46,11 @@
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotations.TableName;
+import zy.cloud.wms.manager.service.PickoutService;
+import zy.cloud.wms.manager.service.impl.PickoutServiceImpl;
+import zy.cloud.wms.system.entity.User;
+import zy.cloud.wms.system.service.UserService;
+
import java.io.Serializable;
@Data
@@ -228,6 +236,7 @@
@TableField("wrk_no")
private String wrkNo;
+
public PickoutDetl() {}
@@ -402,6 +411,21 @@
return pickStaff;
}
+ public String getPickStaff$(){
+ PickoutService pickoutService = SpringUtils.getBean(PickoutService.class);
+ Pickout pickout = pickoutService.selectOne(new EntityWrapper<Pickout>()
+ .eq("id", this.headId));
+ if (!Cools.isEmpty(pickout)) {
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectOne(new EntityWrapper<User>()
+ .eq("id", pickout.getPickStaff()));
+ if (!Cools.isEmpty(user)) {
+ return user.getNickname();
+ }
+ }
+ return "";
+ }
+
public void setPickStaff(Long pickStaff) {
this.pickStaff = pickStaff;
}
@@ -411,11 +435,16 @@
}
public String getPickStart$(){
- if (Cools.isEmpty(this.pickStart)){
- return "";
+ PickoutService service = SpringUtils.getBean(PickoutService.class);
+ Pickout pickout = service.selectOne(new EntityWrapper<Pickout>()
+ .eq("id", this.headId));
+ if (!Cools.isEmpty(pickout)) {
+ return pickout.getPickStart$();
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickStart);
+ return "";
}
+
+
public void setPickStart(Date pickStart) {
this.pickStart = pickStart;
@@ -426,10 +455,13 @@
}
public String getPickEnd$(){
- if (Cools.isEmpty(this.pickEnd)){
- return "";
+ PickoutService service = SpringUtils.getBean(PickoutService.class);
+ Pickout pickout = service.selectOne(new EntityWrapper<Pickout>()
+ .eq("id", this.headId));
+ if (!Cools.isEmpty(pickout)) {
+ return pickout.getPickEnd$();
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.pickEnd);
+ return "";
}
public void setPickEnd(Date pickEnd) {
--
Gitblit v1.9.1