From c3a8cd70bdec24d584557e0c825e2dfebc8ed3f3 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 2 Jul 2024 17:13:27 +0800
Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E5=AD=90=E5=8D=B7?=
 =?UTF-8?q?=E8=A7=84=E6=A0=BC=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/mapper/PdmBiSubpackagerelationMapper.xml             | 2 +-
 .../service/impl/PdmBiSubpackagerelationServiceImpl.java     | 5 ++++-
 lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue           | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
index 3149a4777..1b25e5058 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
@@ -84,7 +84,7 @@
             WHERE b.point_status = '3'
               AND b.ivt_status = '3'
               AND a.sale_order_name = #{sale_order_name}
-            ORDER BY paper_tube_description
+            ORDER BY box_group
     </select>
 
 
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 7991d78c9..7306f0f6f 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
@@ -295,8 +295,11 @@ public class PdmBiSubpackagerelationServiceImpl extends ServiceImpl<PdmBiSubpack
             Set<String> containerNameList = packagerelationList.stream()
                     .map(PdmBiSubpackagerelation::getContainer_name)
                     .collect(Collectors.toSet());
-            BigDecimal totalWeight;
             List<PdmBiSlittingproductionplan> planList = iPdmBiSlittingproductionplanService.list(new LambdaQueryWrapper<PdmBiSlittingproductionplan>().in(PdmBiSlittingproductionplan::getContainer_name, containerNameList));
+            if (CollectionUtils.isEmpty(planList)) {
+                throw new BadRequestException("该箱号不存在分切计划");
+            }
+            BigDecimal totalWeight;
             totalWeight = planList.stream()
                     .map(PdmBiSlittingproductionplan::getWeight)
                     .filter(Objects::nonNull)
diff --git a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
index 75fcde62e..43420a03e 100644
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/DivDialog.vue
@@ -380,6 +380,9 @@ export default {
       if (this.currentSelection.length > 0 && this.$refs.dis_table.selection.length > 0) {
         debugger
         const descriptionList = this.currentSelection.filter(item => item.paper_tube_description !== null && item.paper_tube_description !== '')
+        if (descriptionList.length === 0) {
+          this.crud.notify('未查询到该子卷的规格信息，请检查子卷的分切计划信息！', CRUD.NOTIFICATION_TYPE.WARNING)
+        }
         const paper_tube_description = descriptionList[0].paper_tube_description
         const descriptionsAreSame = this.currentSelection.every(item => item.paper_tube_description === paper_tube_description)
         if (descriptionsAreSame) {