|
|
@ -1246,13 +1246,11 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
List<MesProductionRecord> recordNoReportHasOrderNoList = mesProductionRecordDao.findMesProductionRecordNoReport(organizeCode, MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue(), pageSize, !StringUtils.isEmpty(workCenterCodes) ? Arrays.asList(workCenterCodes.split(",")) : null, true);
|
|
|
|
List<MesProductionRecord> recordNoReportHasOrderNoList = mesProductionRecordDao.findMesProductionRecordNoReport(organizeCode, MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue(), pageSize, !StringUtils.isEmpty(workCenterCodes) ? Arrays.asList(workCenterCodes.split(",")) : null, true);
|
|
|
|
if (CollectionUtils.isEmpty(recordNoReportHasOrderNoList)) {
|
|
|
|
if (CollectionUtils.isEmpty(recordNoReportHasOrderNoList)) {
|
|
|
|
LOGGER.error("非排序有加工单加工记录中没有数据,无需处理");
|
|
|
|
LOGGER.error("非排序有加工单加工记录中没有数据,无需处理");
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//查询非排序工单 有工单
|
|
|
|
//查询非排序工单 有工单
|
|
|
|
List<MesProductionRecord> recordNoReportNotHasOrderNoList = mesProductionRecordDao.findMesProductionRecordNoReport(organizeCode, MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue(), pageSize, !StringUtils.isEmpty(workCenterCodes) ? Arrays.asList(workCenterCodes.split(",")) : null, false);
|
|
|
|
List<MesProductionRecord> recordNoReportNotHasOrderNoList = mesProductionRecordDao.findMesProductionRecordNoReport(organizeCode, MesExtEnumUtil.WORK_CENTER_TYPE.NOSORT.getValue(), pageSize, !StringUtils.isEmpty(workCenterCodes) ? Arrays.asList(workCenterCodes.split(",")) : null, false);
|
|
|
|
if (CollectionUtils.isEmpty(recordNoReportNotHasOrderNoList)) {
|
|
|
|
if (CollectionUtils.isEmpty(recordNoReportNotHasOrderNoList)) {
|
|
|
|
LOGGER.error("非排序无加工单加工记录中没有数据,无需处理");
|
|
|
|
LOGGER.error("非排序无加工单加工记录中没有数据,无需处理");
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//处理无工单加工记录
|
|
|
|
//处理无工单加工记录
|
|
|
|