diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml index 88c87ef3..a8584a33 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/ProcessSetMapper.xml @@ -5,10 +5,9 @@ - + - diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml index 763214f3..86102c30 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/WorkOrderMapper.xml @@ -133,9 +133,6 @@ and b.equip_name = #{equipName} - - and d.name = #{processName} - and a.part_code = #{partCode} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java index 7d310b8a..ccf892b1 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/WorkOrderServiceImpl.java @@ -188,6 +188,20 @@ public class WorkOrderServiceImpl extends BaseServiceImpl> woCodeGroup = list.stream().collect(Collectors.groupingBy(WorkOrderDto::getWoCode)); List resultList = new ArrayList<>(); for (Map.Entry> entry : woCodeGroup.entrySet()) { + if(StringUtils.isNotEmpty(workOrder.getProcessName())){ + List list1 = entry.getValue(); + List processNameList = list1.stream().map(WorkOrderDto::getProcessName).collect(Collectors.toList()); + if(processNameList.contains(workOrder.getProcessName())){ + WorkOrderDto workOrderDto = new WorkOrderDto(); + String woCode = entry.getKey(); + workOrderDto.setWoCode(woCode); + workOrderDto.setWorkOrderList(entry.getValue()); + resultList.add(workOrderDto); + continue; + }else{ + continue; + } + } WorkOrderDto workOrderDto = new WorkOrderDto(); String woCode = entry.getKey(); workOrderDto.setWoCode(woCode);