From c7ee9e7a9a0cb96d1c48bf8a8dff061f16e8a29b Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 14 八月 2023 16:06:23 +0800
Subject: [PATCH] #补丁
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 86354b0..eb75b73 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MatService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -158,26 +159,6 @@
@ApiModelProperty(value = "澶囨敞")
private String memo;
- /**
- * 搴撳瓨棰勮鏁伴噺涓婇檺
- */
- private Double storeMax;
-
- /**
- * 搴撳瓨棰勮鏁伴噺涓嬮檺
- */
- private Double storeMin;
-
- /**
- * 搴撻緞棰勮涓婇檺
- */
- private Integer storeMaxDate;
-
- /**
- * 瀹為檯鍦ㄥ簱澶╂暟
- */
- private Integer nowTime;
-
public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -278,6 +259,42 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public String getLocType2$() {
+ if (Cools.isEmpty(this.locNo)) {
+ return "";
+ }
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ LocMast locMast = locMastService.selectById(this.locNo);
+ if (locMast == null) {
+ return "";
+ }
+ return locMast.getLocType2$();
+ }
+
+ public Integer getMatType() {
+ if (Cools.isEmpty(this.matnr)) {
+ return null;
+ }
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (mat == null) {
+ return null;
+ }
+ return mat.getMatType();
+ }
+
+ public String getMatType$() {
+ if (Cools.isEmpty(this.matnr)) {
+ return "";
+ }
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (mat == null) {
+ return "";
+ }
+ return mat.getMatType$();
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1