diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
index 113e5aa4..1531ad71 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java
@@ -233,8 +233,10 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         }
         // 通过母订单id查询母订单详情
         ProOrder proOrder = proOrderMapper.selectProOrderById(proOrderWorkorder.getOrderId());
-        // 递归查询子订单
-        recursiveQueryChildOrder(proOrder);
+        if(proOrder != null){
+            // 递归查询子订单
+            recursiveQueryChildOrder(proOrder);
+        }
         // 通过获取到的工单信息获取父工单
         formatProOrderWorkorder(proOrderWorkorder);
 
@@ -435,7 +437,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         // 通过班次id查询班次名称
         String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
         // 通过设备code查询出机型名称
-        String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorder.getProdLineCode());
+        String prodLineName = proOrderMapper.selectProdLineName(proOrderWorkorderMapper.selectProOrderWorkorderByWorkorderId(proOrderWorkorder.getWorkorderId()).getProdLineCode());
         // 通过工单id查询批次号
         List<String> batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorder.getWorkorderId());
         List<StringBuilder> batchCodes = new ArrayList<>();