|
@@ -215,6 +215,14 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService |
|
|
//currTaskDet |
|
|
//currTaskDet |
|
|
List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, currTask.getId())); |
|
|
List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, currTask.getId())); |
|
|
currTaskInfoVo.setCurrTaskDetVoList(com.mt.wms.core.utils.BeanUtils.copyList(currTaskDetList,CurrTaskDetVo.class)); |
|
|
currTaskInfoVo.setCurrTaskDetVoList(com.mt.wms.core.utils.BeanUtils.copyList(currTaskDetList,CurrTaskDetVo.class)); |
|
|
|
|
|
for (CurrTaskDetVo currTaskDetVo:currTaskInfoVo.getCurrTaskDetVoList() |
|
|
|
|
|
) { |
|
|
|
|
|
String idenCardNum = currTaskDetVo.getIdenCardNum(); |
|
|
|
|
|
OrderInfo orderInfo = orderInfoServiceBiz.getOne(new QueryWrapper<OrderInfo>().eq(OrderInfo.IDEN_CARD_NUM, idenCardNum)); |
|
|
|
|
|
currTaskDetVo.setCustomer(orderInfo.getCustomerName()); |
|
|
|
|
|
currTaskDetVo.setCraftIll(orderInfo.getCraftIll()); |
|
|
|
|
|
currTaskDetVo.setProductModel(orderInfo.getProductModel()); |
|
|
|
|
|
} |
|
|
list.add(currTaskInfoVo); |
|
|
list.add(currTaskInfoVo); |
|
|
} |
|
|
} |
|
|
list = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CurrTaskInfoVo :: getAutoExeTaskId))), ArrayList::new)); |
|
|
list = list.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(CurrTaskInfoVo :: getAutoExeTaskId))), ArrayList::new)); |
|
|