From 38bddc5b4aef1a0d1ac6c46268d6dfe1db1f0ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Mon, 15 Jul 2024 18:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/busi/MesWorkOrderService.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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<>();