From bbfb525c87ab208f123f8f5a4c7c6a87df4a3a23 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 26 九月 2023 15:08:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ce3a628..8521370 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -159,6 +159,9 @@
@ApiModelProperty(value = "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "瀹㈡埛淇℃伅ID")
+ private Long owner;
+
public String getLocNo$() {
LocMastService service = SpringUtils.getBean(LocMastService.class);
@@ -271,6 +274,18 @@
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 "";
--
Gitblit v1.9.1