From dc3f9cc91759823ce59486f19b138be4b296a0f1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 28 四月 2026 09:43:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2a5d271..bec8eda 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -225,7 +225,7 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.locNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
@@ -234,11 +234,23 @@
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.getById(this.sourceLocNo);
if (!Cools.isEmpty(locMast)){
- return String.valueOf(locMast.getLocNo());
+ return formatMappedLocNo(String.valueOf(locMast.getLocNo()));
}
return null;
}
+ private String formatMappedLocNo(String locNo){
+ if (Cools.isEmpty(this.crnNo)){
+ return locNo;
+ }
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = basCrnpService.getById(this.crnNo);
+ if (Cools.isEmpty(basCrnp)){
+ return locNo;
+ }
+ return basCrnp.formatMappedLocNo(locNo);
+ }
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
--
Gitblit v1.9.1