diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java index 673bd43..ec555a1 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java @@ -747,9 +747,10 @@ public class MesWorkOrderService implements IMesWorkOrderService { DdlPreparedPack.getIsNull("workOrderNo",ddlPackBean); String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER"); //String workCenterCodes ="B19CK01A"; - List centerList = Arrays.asList(workCenterCodes.split(",")); - DdlPreparedPack.getNotInPack(centerList, "workCenterCode",ddlPackBean); - + if (!StringUtils.isEmpty(workCenterCodes)) { + List centerList = Arrays.asList(workCenterCodes.split(",")); + DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean); + } DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean); List mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 100); List recordList = new ArrayList<>(); @@ -774,11 +775,10 @@ public class MesWorkOrderService implements IMesWorkOrderService { DdlPreparedPack.getIsNotNull("workOrderNo",ddlPackBean); String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER"); //String workCenterCodes ="B19CK01A"; - - List centerList = Arrays.asList(workCenterCodes.split(",")); - - DdlPreparedPack.getNotInPack(centerList, "workCenterCode",ddlPackBean); - + if (!StringUtils.isEmpty(workCenterCodes)) { + List centerList = Arrays.asList(workCenterCodes.split(",")); + DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean); + } DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean); List mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 10); List recordList = new ArrayList<>();