@@ -148,6 +148,7 @@ public class CancelHandler extends AbstractWaybillOrderHandler<WaybillOrderCance
protected void getStatus(KwtWaybillOrder waybillOrder) {
// 1. 修改运单状态
waybillOrder.setStatus(CarWaybillV1Enum.CANCELLED.getCode());
+ waybillOrder.setOpened(1);
waybillOrderRepository.updateById(waybillOrder);
// 2. 修改子运单状态
@@ -1259,7 +1259,7 @@ public class GatekeeperOrderService {
//不考虑司机还在榜上未抬杆,铲车司机就接单情况
KwtForkliftWaybillOrder forklift = forkliftWaybillOrderRepository.queryForkliftWaybillOrderByWOrderId(waybillOrder.getId());
- if (forklift != null && !Objects.equals(forklift.getStatus(), ForkliftStatusEnum.COMPLETED.getCode())) {
+ if (Objects.equals(forklift.getStatus(), ForkliftStatusEnum.ORDER_TAKING.getCode())) {
return Boolean.FALSE;
}