|
|
@ -77,8 +77,7 @@ public class WorkOrderAssemblyPrintQueueStrategyService implements IPrintQueueSt
|
|
|
|
List<MesWorkOrder> workOrderList = getMesWorkOrders(model, workOrderNoList);
|
|
|
|
List<MesWorkOrder> workOrderList = getMesWorkOrders(model, workOrderNoList);
|
|
|
|
// 根据工单号对工单分组
|
|
|
|
// 根据工单号对工单分组
|
|
|
|
Map<String, List<MesWorkOrder>> workOrderMap = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getWorkOrderNo));
|
|
|
|
Map<String, List<MesWorkOrder>> workOrderMap = CollectionUtils.isEmpty(workOrderList) ? null : workOrderList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesWorkOrder::getWorkOrderNo));
|
|
|
|
if (CollectionUtils.isEmpty(workOrderMap)) log.info("打印队列查询 --- {} --- 工单信息不存在 --- {} ---", MesExtEnumUtil.PRINT_QUEUE_TYPE.valueOfDescription(model.getPrintQueueType()),
|
|
|
|
if (CollectionUtils.isEmpty(workOrderMap)) log.info("打印队列查询 --- {} --- 工单信息不存在 --- {} ---", MesExtEnumUtil.PRINT_QUEUE_TYPE.valueOfDescription(model.getPrintQueueType()), workOrderNoList.toString());
|
|
|
|
CollectionUtils.isEmpty(workOrderList) ? "[]" : workOrderList.toString());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 产线代码集合
|
|
|
|
// 产线代码集合
|
|
|
|
List<String> workCenterCodeList = CollectionUtils.isEmpty(workOrderMap) ? null :
|
|
|
|
List<String> workCenterCodeList = CollectionUtils.isEmpty(workOrderMap) ? null :
|
|
|
|