提交 c9b9f182 authored 作者: 刘海泉's avatar 刘海泉

Merge remote-tracking branch 'origin/v17.3_youhua_20240615' into test

Former-commit-id: a67a4ce6
...@@ -1050,7 +1050,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea ...@@ -1050,7 +1050,9 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
} }
//取消货单下未接单的车辆绑定关系 //取消货单下未接单的车辆绑定关系
if(CollectionUtils.isNotEmpty(cancelTruckBindOrderGoodsNoList)){ if(CollectionUtils.isNotEmpty(cancelTruckBindOrderGoodsNoList)){
//查询定向货单下未接单的车辆
cancelTruckBindOrderGoodsNoList.forEach(item->goodsOrderTruckRecordComponent.deleteTruckRecord(item));
/* //查询定向货单下未接单的车辆
List<OrderGoodsTruckBind> notOrderBindTruckList = orderGoodsTruckBindDao. List<OrderGoodsTruckBind> notOrderBindTruckList = orderGoodsTruckBindDao.
queryNotOrderTruck(cancelTruckBindOrderGoodsNoList); queryNotOrderTruck(cancelTruckBindOrderGoodsNoList);
//删除缓存中未接单的车辆绑定 //删除缓存中未接单的车辆绑定
...@@ -1058,7 +1060,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea ...@@ -1058,7 +1060,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService, InitializingBea
for (OrderGoodsTruckBind bind : notOrderBindTruckList) { for (OrderGoodsTruckBind bind : notOrderBindTruckList) {
goodsOrderTruckRecordComponent.deleteTruckRecord(bind.getOrderGoodsNo(), bind.getTruckNo()); goodsOrderTruckRecordComponent.deleteTruckRecord(bind.getOrderGoodsNo(), bind.getTruckNo());
} }
} }*/
orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList, orderGoodsTruckBindDao.updateOrderGoodsBindStatus(cancelTruckBindOrderGoodsNoList,
OrderGoodsTruckBindEnum.Status.CANCEL.getCode()); OrderGoodsTruckBindEnum.Status.CANCEL.getCode());
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论