|
|
@ -312,9 +312,11 @@ public class MesAssemblyShowNosortStepService extends BaseStepService {
|
|
|
|
private List<MesAssemblyShowContext> getAssemblyShowContextList(MesCellEquipContext cellEquipContext, List<MesProductionAssemblyContext> productionAssemblyContextList, MesProdRuleContext prodRuleContext, String workOrderNo) {
|
|
|
|
private List<MesAssemblyShowContext> getAssemblyShowContextList(MesCellEquipContext cellEquipContext, List<MesProductionAssemblyContext> productionAssemblyContextList, MesProdRuleContext prodRuleContext, String workOrderNo) {
|
|
|
|
if (CollectionUtils.isEmpty(productionAssemblyContextList)) return null;
|
|
|
|
if (CollectionUtils.isEmpty(productionAssemblyContextList)) return null;
|
|
|
|
List<MesAssemblyShowContext> assemblyShowContextList = new ArrayList<>();
|
|
|
|
List<MesAssemblyShowContext> assemblyShowContextList = new ArrayList<>();
|
|
|
|
|
|
|
|
int index = 0;
|
|
|
|
for (MesProductionAssemblyContext item : productionAssemblyContextList) {
|
|
|
|
for (MesProductionAssemblyContext item : productionAssemblyContextList) {
|
|
|
|
if (null == item) continue;
|
|
|
|
if (null == item) continue;
|
|
|
|
assemblyShowContextList.add(assemblyShowContext(item, prodRuleContext, workOrderNo));
|
|
|
|
index ++ ;
|
|
|
|
|
|
|
|
assemblyShowContextList.add(assemblyShowContext(item, prodRuleContext, workOrderNo).index(index));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assemblyShowContextList = assemblyShowContextList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesAssemblyShowContext::getRouteSeq)).collect(Collectors.toList());
|
|
|
|
assemblyShowContextList = assemblyShowContextList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesAssemblyShowContext::getRouteSeq)).collect(Collectors.toList());
|
|
|
|
return assemblyShowContextList;
|
|
|
|
return assemblyShowContextList;
|
|
|
|