From 4e02590562894bf6614bc3066f6689f1b00ea2ce Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 14 八月 2024 16:39:33 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
index 2a6332f..452d347 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/ViewWorkInBean.java
@@ -1,7 +1,9 @@
package com.zy.asrs.common.wms.entity;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.common.sys.entity.User;
import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.wms.service.MatService;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
@@ -153,6 +155,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.getById(this.modiUser);
@@ -178,13 +183,23 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setQueryDate(String queryDate) {
- this.queryDate = queryDate;
- if (queryDate.contains(" - ")) {
- String[] dates = queryDate.split(" - ");
- this.beginDate = dates[0];
- this.endDate = dates[1];
+ public Mat getMat$(){
+ MatService service = SpringUtils.getBean(MatService.class);
+ Mat mat = service.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr));
+ if (!Cools.isEmpty(mat)){
+ return mat;
+ }
+ return null;
+ }
+ public void setQueryDate(String queryDate) {
+ if(!Cools.isEmpty(queryDate)){
+ this.queryDate = queryDate;
+ if (queryDate.contains(" - ")) {
+ String[] dates = queryDate.split(" - ");
+ this.beginDate = dates[0];
+ this.endDate = dates[1];
+ }
}
}
--
Gitblit v1.9.1