From 9cb6940d9ea0ce0dc31c21090e839c226145c099 Mon Sep 17 00:00:00 2001
From: zhouz <>
Date: Wed, 12 Nov 2025 19:31:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9E=E4=B8=80=E6=A5=BC?=
 =?UTF-8?q?=E5=BE=85=E6=A3=80=E5=8C=BA=E7=9C=8B=E6=9D=BF=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=A3=85=E7=AE=B1=EF=BC=9B=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/pdm/screen/store/InMemoryStore.java     | 3 +--
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java | 7 +++----
 .../nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java   | 2 ++
 .../service/impl/BstIvtPackageinfoivtServiceImpl.java    | 9 +++++++++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/screen/store/InMemoryStore.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/screen/store/InMemoryStore.java
index bfdaaeda0..b0929c705 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/screen/store/InMemoryStore.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/screen/store/InMemoryStore.java
@@ -56,7 +56,6 @@ public class InMemoryStore {
             blkList.add(row.getString("device_code"));
         }
 
-
         WmsToAcsServiceImpl bean = SpringContextHolder.getBean(WmsToAcsServiceImpl.class);
         JSONObject result2;
         try {
@@ -67,7 +66,7 @@ public class InMemoryStore {
         }
         // 调用acs接口获取设备
         JSONArray blk_data = result2.getJSONArray("data");
-        return ObjectUtil.isEmpty(blk_data) ? blk_data : new JSONArray();
+        return ObjectUtil.isNotEmpty(blk_data) ? blk_data : new JSONArray();
     }
 }
 
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
index d533d4dd4..51252c02d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/service/impl/PdmBiSubpackagerelationServiceImpl.java
@@ -454,16 +454,15 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
                 if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("未锁定"))) {
                     // 判断浅货位木箱和深货位木箱是否相同规格
                     task_group_id = outBoxManageService.createBoxMove(浅Attr);
-                } else if (浅Attr.getString("lock_type").equals(IOSEnum.LOCK_TYPE.code("验箱出库锁"))) {
+                } else {
                     List<SchBaseTask> list = taskService.list(new QueryWrapper<SchBaseTask>()
                             .eq("is_delete", "0")
                             .eq("point_code1", 浅Attr.getString("struct_code"))
                             .lt("task_status", TaskStatusEnum.FINISHED.getCode()));
                     if (!CollectionUtils.isEmpty(list)) {
-                        throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
+                        throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位【存在任务】" + 浅Attr.getString("task_code"));
                     }
-                } else {
-                    throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】或【存在任务】" + 浅Attr.getString("task_code"));
+                    throw new BadRequestException("当前木箱所在货位" + boxAttr.getString("struct_code") + "对应浅货位被【锁定】" + 浅Attr.getString("task_code"));
                 }
             }
         }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
index 2c81ebfba..4a580117d 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/BstIvtPackageinfoivtVO.java
@@ -31,4 +31,6 @@ public class BstIvtPackageinfoivtVO extends BstIvtPackageinfoivt {
 
     /** 子卷理论长度 */
     private Integer split_height;
+
+    private String box_no;
 }
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
index 873e7e95c..92d56d015 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java
@@ -125,11 +125,16 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         List<BstIvtPackageinfoivt> records = selectPage.getRecords();
         Set<String> containers = records.stream().map(BstIvtPackageinfoivt::getContainer_name).filter(a -> StringUtils.isNotEmpty(a)).collect(Collectors.toSet());
         Map<String, PdmBiSlittingproductionplan> listMap = new HashMap();
+        Map<String, PdmBiSubpackagerelation> subMap = new HashMap();
         if (!CollectionUtils.isEmpty(containers)) {
             List<PdmBiSlittingproductionplan> containerInfo = iPdmBiSlittingproductionplanService.list(new QueryWrapper<PdmBiSlittingproductionplan>()
                     .in("container_name", containers)
                     .select("container_name", "weight", "paper_weight", "split_breadth", "split_height"));
             listMap = containerInfo.stream().collect(HashMap::new, (m, o) -> m.put(o.getContainer_name(), o), HashMap::putAll);
+            List<PdmBiSubpackagerelation> subInfo = subpackagerelationService.list(new QueryWrapper<PdmBiSubpackagerelation>()
+                    .in("container_name", containers)
+                    .select("container_name", "package_box_sn"));
+            subMap = subInfo.stream().collect(HashMap::new, (m, o) -> m.put(o.getContainer_name(), o), HashMap::putAll);
         }
         List<BstIvtPackageinfoivtVO> voRecords = new ArrayList<>();
         for (BstIvtPackageinfoivt record : records) {
@@ -142,6 +147,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 vo.setSplit_breadth(planInfo.getSplit_breadth().intValue());
                 vo.setSplit_height(planInfo.getSplit_height().intValue());
             }
+            PdmBiSubpackagerelation subInfo = subMap.get(record.getContainer_name());
+            if (subInfo != null) {
+                vo.setBox_no(subInfo.getPackage_box_sn());
+            }
             voRecords.add(vo);
         }
         selectPage.setRecords(voRecords);