查询货单

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1676,10 +1676,13 @@ public class OrderChildServiceImpl implements OrderChildService {
         //查询运单
         OrderChild orderChild = orderChildDao.getGoingLatestOrderChild(loginUserInfo.getUserNo());
         GoingOrderChildVO orderChildVO = orderChildStruct.convertGoingOrder(orderChild);
-        //查询货单
-        OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
-                PerformanceResultEnum.ORDER_INVALID);
-        orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        if(orderChildVO != null){
+            //查询货单
+            OrderGoods orderGoods = orderGoodsDao.getByOrderGoodsNo(orderChild.getOrderGoodsNo()).orElseThrow(
+                    PerformanceResultEnum.ORDER_INVALID);
+            orderChildVO.setLastArriveSendTime(LocalDateTimeUtils.convertLocalDateTimeToDefaultString(orderGoods.getLastArriveSendTime()));
+        }
+
         return orderChildVO;
     }