From f41fcabf8a737ffccb77d4c522a1166ab2b36a74 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Tue, 8 Aug 2023 11:52:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97(=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9-=E7=99=BD?= =?UTF-8?q?=E5=9D=AF=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A7=A3=E5=86=B3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/service/impl/ProOrderWorkorderServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 113e5aa43..1531ad711 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 batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorder.getWorkorderId()); List batchCodes = new ArrayList<>();