From e128bbc4a9df1491257320884169ba813d461f63 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 20 十二月 2025 10:33:20 +0800
Subject: [PATCH] #1

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 4f46724..0915c9f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -742,7 +742,15 @@
         LocTypeDto locTypeDto = new LocTypeDto();
         locTypeDto.setLocType1((short)1);
 
-        StartupDto dto = commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
+        StartupDto dto = null;
+        try{
+            commonService.getLocNo(1, 1, 1901, matnr,null,null, locTypeDto);
+        } catch (Exception e){
+            throw new CoolException(e.getMessage());
+        }
+        if (dto == null) {
+            throw new CoolException("鏈壘鍒板簱浣�");
+        }
 
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
@@ -1365,4 +1373,19 @@
         }
         return result;
     }
+
+    @Override
+    @Transactional
+    public List<Map<String, Object>> boxTypeComb2() {
+        EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",999));
+        for (BasBoxType basBoxType : basBoxTypes){
+            Map<String, Object> map = new HashMap<>();
+            map.put("boxType", basBoxType.getBoxType());
+            map.put("boxSpecs", basBoxType.getBoxSpecs());
+            result.add(map);
+        }
+        return result;
+    }
 }

--
Gitblit v1.9.1