报工问题修改

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<String> centerList =  Arrays.asList(workCenterCodes.split(","));
+        if (!StringUtils.isEmpty(workCenterCodes)) {
-        DdlPreparedPack.getNotInPack(centerList, "workCenterCode",ddlPackBean);
+            List<String> 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<MesProductionRecord> mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 100);
         List<MesProductionRecord> 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";
-
+        if (!StringUtils.isEmpty(workCenterCodes)) {
-        List<String> centerList =  Arrays.asList(workCenterCodes.split(","));
+            List<String> centerList = Arrays.asList(workCenterCodes.split(","));
-
+            DdlPreparedPack.getNotInPack(centerList, "workCenterCode", ddlPackBean);
-        DdlPreparedPack.getNotInPack(centerList, "workCenterCode",ddlPackBean);
+        }
-
         DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"modifyDatetime"}, ddlPackBean);
         List<MesProductionRecord> mesProductionRecordList = productionRecordRao.findByHqlTopWhere(ddlPackBean, 10);
         List<MesProductionRecord> recordList = new ArrayList<>();