Merge remote-tracking branch 'origin/jd_dev' into jd_dev

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/boxPkgOrder/BoxPkgOrderServiceImpl.java

@@ -112,6 +112,9 @@ public class BoxPkgOrderServiceImpl extends AbstractService<BoxPkgOrderMapper, B
             BoxMergePkgDO boxMergePkgDO = boxMergePkgService.selectOne(new LambdaQueryWrapper<BoxMergePkgDO>()
                     .eq(BoxMergePkgDO::getShipmentId, createReqVO.getShipmentId())
                     .eq(BoxMergePkgDO::getPkgNum, orderNumCode));
+            if (Objects.isNull(boxMergePkgDO)){
+                throw  exception(BOX_MERGE_PKG_NOT_EXISTS);
+            }
             OrderDO  orderDO = orderService.getOne(new LambdaQueryWrapperX<OrderDO>().eq(OrderDO::getOrderNo,createReqVO.getOrderNo())) ;
               if(Objects.isNull(orderDO)){
                   throw  exception(ORDER_NOT_IN_BOX);