Compare commits
No commits in common. "5e54011371f73aae941fff38de36e92456da9e11" and "5711a2acf6a20fe1ac73d12023c0b109013c8a6a" have entirely different histories.
5e54011371
...
5711a2acf6
@ -218,14 +218,6 @@ 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));
|
||||||
|
@ -325,9 +325,6 @@ public class AsynRunTaskService extends BaseService {
|
|||||||
runTaskServiceBiz.updateById(runTask);
|
runTaskServiceBiz.updateById(runTask);
|
||||||
//更新currTask表
|
//更新currTask表
|
||||||
currTask.setCacheSatatus(2);
|
currTask.setCacheSatatus(2);
|
||||||
currTask.setIsCache(1);
|
|
||||||
currTask.setLocationId(location.getId());
|
|
||||||
currTask.setLocationName(location.getLocationName());
|
|
||||||
currTask.setUpdateTime(LocalDateTime.now());
|
currTask.setUpdateTime(LocalDateTime.now());
|
||||||
currTaskServiceBiz.updateById(currTask);
|
currTaskServiceBiz.updateById(currTask);
|
||||||
//更新in_stock_info表
|
//更新in_stock_info表
|
||||||
|
Loading…
Reference in New Issue
Block a user