From ca301e64c071ecbdf9e7442070fa7b9b80ca56e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:42 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index b6e98e6..0b847d5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -816,7 +816,16 @@
     @Override
     @Transactional
     public List<LocMast> packTestBasicInformation() {
-        return locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+        List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+        for (LocMast locMast:locMasts) {
+            LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
+            if(Cools.isEmpty(locDetl)){
+                locMast.setMk("鏃犱俊鎭�");
+            }else{
+                locMast.setMk(locDetl.getMatnr());
+            }
+        }
+        return locMasts;
     }
     /*
      * 娴嬭瘯搴撲娇鐢ㄦ儏鍐�

--
Gitblit v1.9.1