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

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 6b4f80e..d590316 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{
+            dto = 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();
         // 鐢熸垚宸ヤ綔妗�
@@ -1356,7 +1364,7 @@
     public List<Map<String, Object>> boxTypeComb() {
         EntityWrapper<BasBoxType> wrapper = new EntityWrapper<>();
         List<Map<String, Object>> result = new ArrayList<>();
-        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true));
+        List<BasBoxType> basBoxTypes = basBoxTypeService.selectList(wrapper.orderBy("id",true).eq("arm_type",1));
         for (BasBoxType basBoxType : basBoxTypes){
             Map<String, Object> map = new HashMap<>();
             map.put("boxType", basBoxType.getBoxType());

--
Gitblit v1.9.1