From b51eadaa66a5c0ee6da0e418a3ba193dfc878fca Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 03 七月 2025 13:21:56 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/RowLastno.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/RowLastno.java b/src/main/java/com/zy/asrs/entity/RowLastno.java
index 06d1e23..5160dbd 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,8 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.service.BasWhsService;
 import com.zy.asrs.service.RowLastnoTypeService;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
@@ -382,8 +384,10 @@
     public String getTypeId$() {
         RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class);
         RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue());
+        BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class);
+        BasWhs basWhs = basWhsService.selectOne(new EntityWrapper<BasWhs>().eq("identifying",rowLastnoType.getType().longValue()) );
         if (!Cools.isEmpty(rowLastnoType)){
-            return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo();
+            return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc();
         }
         return typeId.toString();
     }

--
Gitblit v1.9.1