add:增加子卷规格校验

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>
 
 

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)

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) {