diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java index dddcf54..b287ed9 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/WorkOrderExtService.java @@ -1096,9 +1096,9 @@ public class WorkOrderExtService implements IWorkOrderExtService { MesWorkCenterExt workCenterExt = workCenterCodeMap.get(workOrderPageVo.getWorkCenterCode()); - workOrderPageVo.setWorkCenterName(workCenterExt.getWorkCenterName()); + workOrderPageVo.setWorkCenterName(workCenterExt == null ? "" :workCenterExt.getWorkCenterName()); - workOrderPageVo.setIsNoumenon(workCenterExt.getLineType().equals(String.valueOf(MesExtEnumUtil.LINE_TYPE.ONTOLOGY_LINE.getValue())) ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : MesExtEnumUtil.YES_OR_NO.NO.getValue()); + workOrderPageVo.setIsNoumenon(workCenterExt == null ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : workCenterExt.getLineType().equals(String.valueOf(MesExtEnumUtil.LINE_TYPE.ONTOLOGY_LINE.getValue())) ? MesExtEnumUtil.YES_OR_NO.YES.getValue() : MesExtEnumUtil.YES_OR_NO.NO.getValue()); }