From 3ad65283c54059e0c61110589fb19398ac3525fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 08 七月 2025 08:32:32 +0800
Subject: [PATCH] 完善拣料转全板
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 69 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 19 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..a683bf5 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -7,6 +7,8 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.LocOwnerService;
+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,25 +160,8 @@
@ApiModelProperty(value = "澶囨敞")
private String memo;
- /**
- * 搴撳瓨棰勮鏁伴噺涓婇檺
- */
- private Double storeMax;
-
- /**
- * 搴撳瓨棰勮鏁伴噺涓嬮檺
- */
- private Double storeMin;
-
- /**
- * 搴撻緞棰勮涓婇檺
- */
- private Integer storeMaxDate;
-
- /**
- * 瀹為檯鍦ㄥ簱澶╂暟
- */
- private Integer nowTime;
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
+ private Long owner;
public String getLocNo$() {
@@ -187,6 +172,16 @@
}
return null;
}
+
+ public String getOwner$(){
+ LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
+ LocOwner locOwner = service.selectById(this.owner);
+ if (!Cools.isEmpty(locOwner)){
+ return String.valueOf(locOwner.getOwner());
+ }
+ return null;
+ }
+
public String getBeBatch$() {
if (null == this.beBatch) {
@@ -278,6 +273,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