|
|
|
@ -161,10 +161,12 @@ public class MesQueueOrderPushService implements IMesQueueOrderPushService {
|
|
|
|
|
//搜集推送来源代码 去重; 根据生产线代码,推送来源代码集合查询创建状态的生产队列工位推送信息【工序顺序号正序,创建时间正序】
|
|
|
|
|
List<MesQueueOrderPush> queueOrderPushList = getQueueOrderPushListByStatus(organizeCode, queueOrderPushCellCfgList, CommonEnumUtil.ASC_OR_DESC.ASC.getValue(), MesExtEnumUtil.QUEUE_ORDER_STATUS.CREATE.getValue());
|
|
|
|
|
//条码去重
|
|
|
|
|
return CollectionUtils.isEmpty(queueOrderPushList) ? null :
|
|
|
|
|
queueOrderPushList = CollectionUtils.isEmpty(queueOrderPushList) ? null :
|
|
|
|
|
queueOrderPushList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getProductSn()))).distinct()
|
|
|
|
|
.collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(MesQueueOrderPush::getProductSn))), ArrayList::new));
|
|
|
|
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(queueOrderPushList)) queueOrderPushList = queueOrderPushList.stream().filter(o -> null != o)
|
|
|
|
|
.sorted(Comparator.comparing(MesQueueOrderPush::getProcessSeq).thenComparing(MesQueueOrderPush::getCreateDatetime)).collect(Collectors.toList());
|
|
|
|
|
return queueOrderPushList;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//根据配置查询生产队列工位推送信息
|
|
|
|
|