提交 4c47e10b authored 作者: huyufan's avatar huyufan

已经完成的定向货单,编辑的时候不在创建

上级 00f7ca1c
...@@ -115,6 +115,9 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM ...@@ -115,6 +115,9 @@ public class OrderGoodsTruckBindDaoImpl extends BaseDaoImpl<OrderGoodsTruckBindM
.or() .or()
.eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo) .eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
.eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode()) .eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.GET.getCode())
.or()
.eq(OrderGoodsTruckBind::getOrderGoodsNo, orderGoodsNo)
.eq(OrderGoodsTruckBind::getStatus, OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
); );
} }
......
...@@ -386,9 +386,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService { ...@@ -386,9 +386,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo); List<OrderGoodsTruckBind> truckBindList = orderGoodsTruckBindDao.selectListByOrderGoodsNo(orderGoodsNo);
List<OrderGoodsTruckBind> getChildList = null; List<OrderGoodsTruckBind> getChildList = null;
if (CollectionUtils.isNotEmpty(truckBindList)) { if (CollectionUtils.isNotEmpty(truckBindList)) {
List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i -> !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList()); List<OrderGoodsTruckBind> deleteList = truckBindList.stream().filter(i ->
//已接单的记录 !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode()) &&
getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())).collect(Collectors.toList()); !i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
).collect(Collectors.toList());
//已接单的记录和完成的
getChildList = truckBindList.stream().filter(i -> i.getStatus().equals(OrderGoodsTruckBindEnum.Status.GET.getCode())
|| i.getStatus().equals(OrderGoodsTruckBindEnum.Status.SUCCESS.getCode())
)
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(deleteList)) { if (CollectionUtils.isNotEmpty(deleteList)) {
orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList())); orderGoodsTruckBindDao.deleteByIds(deleteList.stream().map(OrderGoodsTruckBind::getId).collect(Collectors.toList()));
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论