From 0bedfead3ffe6d2251d7428d772de0a4df6b5201 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 21 七月 2025 15:52:49 +0800
Subject: [PATCH] 1.向mes查询物料 2.入库上报mes

---
 src/main/java/com/zy/asrs/entity/RowLastno.java |    5 ++++-
 1 files changed, 4 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..e4dedf1 100644
--- a/src/main/java/com/zy/asrs/entity/RowLastno.java
+++ b/src/main/java/com/zy/asrs/entity/RowLastno.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+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 +383,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.selectById(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