From 641f7bb8b2d2e23f1f5192fecf030a567151c7b5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e00a33a..b917411 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -378,21 +378,22 @@
}
public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectById(this.staNo);
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ return String.valueOf(this.staNo);
}
public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
+
+// BasDevpService service = SpringUtils.getBean(BasDevpService.class);
+// BasDevp basDevp = service.selectById(this.sourceStaNo);
+// if (!Cools.isEmpty(basDevp)){
+// return String.valueOf(basDevp.getDevNo());
+// }
+ return String.valueOf(this.sourceStaNo);
}
public String getSourceLocNo$(){
--
Gitblit v1.9.1