From 05ae715bdf42258e096255cfdd53b90d1e97177f Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期一, 28 八月 2023 09:00:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 34963fb..1c3bb5f 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -15,6 +15,7 @@
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_mast")
@@ -418,6 +419,14 @@
}
return null;
}
+ public String getOrderNo$(){
+ WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(this.wrkNo);
+ if (!Cools.isEmpty(wrkDetls) && wrkDetls.size()!=0){
+ return String.valueOf(wrkDetls.get(0).getOrderNo());
+ }
+ return null;
+ }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
--
Gitblit v1.9.1